Merge master into staging-next

doc/hooks/tauri.section.md

@@ -52,12 +52,12 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs =
     [ openssl ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       glib-networking # Most Tauri apps need networking
       libsoup
       webkitgtk_4_0
     ]
-    ++ lib.optionals stdenv.isDarwin (
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk.frameworks;
       [
         AppKit

maintainers/maintainer-list.nix

@@ -2832,6 +2832,12 @@
     githubId = 24254289;
     name = "Payas Relekar";
   };
+  bhasherbel = {
+    email = "[email protected]";
+    github = "bhasherbel";
+    githubId = 45831883;
+    name = "Brieuc Dubois";
+  };
   bhipple = {
     email = "[email protected]";
     github = "bhipple";
@@ -5841,7 +5847,7 @@
     name = "Sebastian Krohn";
   };
   drawbu = {
-    email = "clement21[email protected]";
+    email = "clement2104[email protected]";
     github = "drawbu";
     githubId = 69208565;
     name = "Clément Boillot";
@@ -10941,6 +10947,12 @@
     githubId = 54635632;
     keys = [ { fingerprint = "4C68 56EE DFDA 20FB 77E8  9169 1964 2151 C218 F6F5"; } ];
   };
+  jthulhu = {
+    name = "Adrien Mathieu";
+    email = "[email protected]";
+    github = "jthulhu";
+    githubId = 23179762;
+  };
   jtobin = {
     email = "[email protected]";
     github = "jtobin";

nixos/modules/hardware/graphics.nix

@@ -101,7 +101,7 @@ in
     assertions = [
       {
         assertion = cfg.enable32Bit -> pkgs.stdenv.hostPlatform.isx86_64;
-        message = "`hardware.graphics.enable32Bit` only makes sense on a 64-bit system.";
+        message = "`hardware.graphics.enable32Bit` is only supported on an x86_64 system.";
       }
       {
         assertion = cfg.enable32Bit -> (config.boot.kernelPackages.kernel.features.ia32Emulation or false);

pkgs/applications/version-management/gitoxide/default.nix

@@ -4,9 +4,7 @@
 , cmake
 , pkg-config
 , stdenv
-, libiconv
-, Security
-, SystemConfiguration
+, apple-sdk_11
 , curl
 , openssl
 , buildPackages
@@ -33,7 +31,7 @@ in rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ cmake pkg-config installShellFiles ];
 
   buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin
-    then [ libiconv Security SystemConfiguration ]
+    then [ apple-sdk_11 ]
     else [ openssl ]);
 
   preFixup = lib.optionalString canRunCmd ''

pkgs/applications/window-managers/i3/lock-fancy-rapid.nix

@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, xorg, i3lock }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  xorg,
+  i3lock,
+}:
 
 stdenv.mkDerivation {
   pname = "i3lock-fancy-rapid";
@@ -33,6 +39,7 @@ stdenv.mkDerivation {
     description = "Faster implementation of i3lock-fancy";
     homepage = "https://github.com/yvbbrjdr/i3lock-fancy-rapid";
     maintainers = with maintainers; [ nickhu ];
+    mainProgram = "i3lock-fancy-rapid";
     license = licenses.bsd3;
     platforms = platforms.linux;
   };

pkgs/by-name/br/bruno-cli/package.nix

@@ -0,0 +1,99 @@
+{
+  lib,
+  stdenv,
+  buildNpmPackage,
+  bruno,
+  pkg-config,
+  pango,
+  apple-sdk_11,
+  testers,
+  bruno-cli,
+}:
+
+let
+  pname = "bruno-cli";
+in
+buildNpmPackage {
+  inherit pname;
+
+  # since they only make releases and git tags for bruno,
+  # we lie about bruno-cli's version and say it's the same as bruno's
+  # to keep them in sync with easier maintenance
+  inherit (bruno) version src npmDepsHash;
+
+  npmWorkspace = "packages/bruno-cli";
+  npmFlags = [ "--legacy-peer-deps" ];
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs =
+    [
+      pango
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # fix for: https://github.com/NixOS/nixpkgs/issues/272156
+      apple-sdk_11
+    ];
+
+  ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+
+  buildPhase = ''
+    runHook preBuild
+
+    npm run build --workspace=packages/bruno-common
+    npm run build --workspace=packages/bruno-graphql-docs
+    npm run build --workspace=packages/bruno-query
+
+    npm run sandbox:bundle-libraries --workspace=packages/bruno-js
+
+    runHook postBuild
+  '';
+
+  npmPackFlags = [ "--ignore-scripts" ];
+
+  postInstall = ''
+    cp -r packages $out/lib/node_modules/usebruno
+
+    echo "Removing unnecessary files"
+    pushd $out/lib/node_modules/usebruno
+    rm -rfv packages/bruno-{app,electron,tests,toml,schema,docs}
+    rm -rfv packages/*/node_modules/typescript
+    rm -rfv node_modules/{next,@next,@tabler,pdfjs-dist,*redux*,*babel*,prettier,@types*,*react*,*graphiql*}
+    for pattern in '*.map' '*.map.js' '*.ts'; do
+      find . -type f -name "$pattern" -exec rm -v {} +
+    done
+    popd
+    echo "Removed unnecessary files"
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/bru \
+      --prefix NODE_PATH : $out/lib/node_modules/usebruno/packages/bruno-cli/node_modules \
+      --prefix NODE_PATH : $out/lib/node_modules
+  '';
+
+  passthru.tests.help = testers.runCommand {
+    name = "${pname}-help-test";
+    nativeBuildInputs = [ bruno-cli ];
+    script = ''
+      bru --help && touch $out
+    '';
+  };
+
+  meta = {
+    description = "CLI of the open-source IDE For exploring and testing APIs";
+    homepage = "https://www.usebruno.com";
+    license = lib.licenses.mit;
+    mainProgram = "bru";
+    maintainers = with lib.maintainers; [
+      gepbird
+      kashw2
+      lucasew
+      mattpolzin
+      water-sucks
+    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+}

pkgs/by-name/bu/buildkite-agent/package.nix

@@ -13,16 +13,16 @@
 }:
 buildGoModule rec {
   pname = "buildkite-agent";
-  version = "3.82.1";
+  version = "3.85.1";
 
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "agent";
     rev = "v${version}";
-    hash = "sha256-xTF8zmpwEFHkLwDYBICXJZ4gjJYpcH5i76kPQM6qt5o=";
+    hash = "sha256-aRgjXzwTC1wCWZ7n0MJpNHcHZgvendFPr4vCrBnCJCk=";
   };
 
-  vendorHash = "sha256-xKAQ2yvFYl9ld3H6IGafYgCdA8jn9xig/AAej56ACns=";
+  vendorHash = "sha256-UMnDVxZgqI4430IlA8fSygKEOT86RjCwuzGsvkQ8XIo=";
 
   postPatch = ''
     substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash

pkgs/by-name/de/deno/package.nix

@@ -19,16 +19,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "deno";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JTNLxUT1C9Q8XiP3BYn6NhytbvilQ20DzWwLjNXjlCI=";
+    hash = "sha256-dJ1SHWPgQtr7BdBW63A+/RocHAx1MRnyeRj1Q/Qmcgk=";
   };
 
-  cargoHash = "sha256-EDphp03j6HpTxgBgsaGHuO+hQX57QXkTz6fHN0+or48=";
+  cargoHash = "sha256-6sAu8RbC6CcPABUZ2KEmcf2bn0UGiWacHJg4Eso+ozo=";
 
   postPatch = ''
     # upstream uses lld on aarch64-darwin for faster builds

pkgs/by-name/du/dust/package.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit, installShellFiles }:
+{ stdenv, lib, fetchFromGitHub, rustPlatform, apple-sdk_11, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   # Originally, this package was under the attribute `du-dust`, since `dust` was taken.
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
 
   doCheck = false;
 

pkgs/by-name/hy/hyprsome/package.nix

@@ -0,0 +1,28 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "hyprsome";
+  version = "0.1.12-unstable-2024-05-20";
+
+  src = fetchFromGitHub {
+    owner = "sopa0";
+    repo = "hyprsome";
+    rev = "985e1a3b03b5118c98c03983f60ea9f74775858c";
+    hash = "sha256-JiOV9c23yOhaVW2NHgs8rjM8l9qt181Tigf5sCnPep8=";
+  };
+
+  cargoHash = "sha256-Jqx77/PDWEJ+NPJN2R6n4w9nVPXQoHeuVfYKUB3i9Lg=";
+
+  meta = {
+    description = "Awesome-like workspaces for Hyprland";
+    homepage = "https://github.com/sopa0/hyprsome";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ bhasherbel ];
+    platforms = lib.platforms.linux;
+    mainProgram = "hyprsome";
+  };
+}

pkgs/by-name/le/lean4/package.nix

@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/leanprover/lean4/blob/${finalAttrs.src.rev}/RELEASES.md";
     license = licenses.asl20;
     platforms = platforms.all;
-    maintainers = with maintainers; [ danielbritten ];
+    maintainers = with maintainers; [ danielbritten jthulhu ];
     mainProgram = "lean";
   };
 })

pkgs/by-name/lo/localsend/package.nix

@@ -15,17 +15,16 @@
 
 let
   pname = "localsend";
-  version = "1.15.4";
+  version = "1.16.1";
 
   linux = flutter324.buildFlutterApplication rec {
-    inherit pname;
-    version = "1.15.4-unstable-2024-10-26";
+    inherit pname version;
 
     src = fetchFromGitHub {
       owner = pname;
       repo = pname;
-      rev = "d0e864ddf6ebe1c55188b33f8fdccd534d203c75";
-      hash = "sha256-qaW9LoRQge4K/CAQwbjNxmlUkQmxvaZyBJdAjXbbTw4=";
+      rev = "v${version}";
+      hash = "sha256-9nW1cynvRgX565ZupR+ogfDH9Qem+LQH4XZupVsrEWo=";
     };
 
     sourceRoot = "${src.name}/app";
@@ -52,6 +51,10 @@ let
       done
     '';
 
+    extraWrapProgramArgs = ''
+      --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
+    '';
+
     desktopItems = [
       (makeDesktopItem {
         name = "LocalSend";
@@ -79,7 +82,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
-      hash = "sha256-ZU2aXZNKo01TnXNH0e+r0l4J5HIILmGam3T4+6GaeA4=";
+      hash = "sha256-kgq3AoypDdRwk9bKa1zjUJo4tHHUbDZIg0G0Rk9S3n4=";
     };
 
     nativeBuildInputs = [