Merge remote-tracking branch 'origin/master' into staging-next

NixOS · Dec 19, 2024 · e048768 · e048768
2 parents 5ad9d6d + 5e0d4f3
commit e048768
Show file tree

Hide file tree

Showing 56 changed files with 1,009 additions and 137 deletions.
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5202,6 +5202,22 @@ let
         };
       };
 
+      visualstudiotoolsforunity.vstuc = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vstuc";
+          publisher = "VisualStudioToolsForUnity";
+          version = "1.0.4";
+          hash = "sha256-LkLdXbXW91wMmaXpnRxSpff/zHCOE74nPP3aS0Ig3Gc=";
+        };
+        meta = {
+          description = "Integrates Visual Studio Code for Unity";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=visualstudiotoolsforunity.vstuc";
+          homepage = "https://github.com/MicrosoftDocs/vscode-dotnettools";
+          license = lib.licenses.unfree;
+          maintainers = [ lib.maintainers.mib ];
+        };
+      };
+
       vitaliymaz.vscode-svg-previewer = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "vscode-svg-previewer";

diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "mongodb-vscode";
     publisher = "mongodb";
-    version = "1.10.0";
-    hash = "sha256-5U1wHrcDqN5gJEFGvRDlBm7fu4LoP0/u0ykcqYhD1nQ=";
+    version = "1.11.0";
+    hash = "sha256-JlAfoYLFja60zNmNS0T8YK6WUrw/oOq/uurP48ad9bY=";
   };
 
   meta = {

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -128,8 +128,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
+    # Q16HDRI = 16 bit quantum depth with HDRI support, and is the default ImageMagick configuration
+    # If the default is changed, or the derivation is modified to use a different configuration
+    # this will need to be changed below.
     moveToOutput "bin/*-config" "$dev"
     moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
+    configDestination=($out/share/ImageMagick-*)
+    grep -v '/nix/store' $dev/lib/ImageMagick-*/config-Q16HDRI/configure.xml > $configDestination/configure.xml
     for file in "$dev"/bin/*-config; do
       substituteInPlace "$file" --replace pkg-config \
         "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'"

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
@@ -43,7 +43,7 @@ buildFHSEnv {
   unsharePid = false;
 
   targetPkgs = pkgs: with pkgs; with xorg; [
-    libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender
+    libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXmu
     libXxf86vm libGL libxcb xkeyboardconfig
     curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt
     procps zlib libgbm libxshmfence libpthreadstubs libappindicator

diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix
@@ -97,7 +97,10 @@ rec {
     src = "${sources}/aw-qt";
 
     pyproject = true;
-    build-system = [ python3Packages.poetry-core ];
+    build-system = [
+      python3Packages.poetry-core
+      python3Packages.setuptools
+    ];
 
     dependencies = with python3Packages; [
       aw-core

diff --git a/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix b/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix
@@ -5,18 +5,20 @@
 # The wrapper has to be static so LD_* environment variables
 # cannot affect the execution of the wrapper itself.
 
-{ lib, stdenv, pkgsStatic, enableDebug ? false }:
+{ lib, stdenv, enableDebug ? false }:
 
 name: emulator:
 
-pkgsStatic.stdenv.mkDerivation {
+stdenv.mkDerivation {
   inherit name;
 
   src = ./binfmt-p-wrapper.c;
 
   dontUnpack = true;
   dontInstall = true;
 
+  buildInputs = [ stdenv.cc.libc.static or null ];
+
   buildPhase = ''
     runHook preBuild
 

diff --git a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "aws-codeartifact-proxy";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "sktan";
+    repo = "aws-codeartifact-proxy";
+    rev = "v${version}";
+    hash = "sha256-289iYPI8J64nRa0PTf47/FQAEqA+rTzalz6S71vFLzs=";
+  };
+  sourceRoot = "${src.name}/src";
+
+  vendorHash = "sha256-3MO+mRCstXw0FfySiyMSs1vaao7kUYIyJB2gAp1IE48=";
+
+  meta = {
+    description = "AWS CodeArtifact proxy to allow unauthenticated read access";
+    homepage = "https://github.com/sktan/aws-codeartifact-proxy";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lafrenierejm ];
+    mainProgram = "aws-codeartifact-proxy";
+  };
+}
diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
@@ -11,18 +11,18 @@
 buildNpmPackage rec {
   pname = "clever-tools";
 
-  version = "3.10.1";
+  version = "3.11.0";
 
   nodejs = nodejs_18;
 
   src = fetchFromGitHub {
     owner = "CleverCloud";
     repo = "clever-tools";
     rev = version;
-    hash = "sha256-dMSVw3buj0m2Ixir8rVeCg0PAVqXFBsBEohKfLsYhaI=";
+    hash = "sha256-3u96bPdXGArvNZPs12uF48zR/15AQNNHXyUWnMgxMmI=";
   };
 
-  npmDepsHash = "sha256-v0nCYRfmcGbePI838Yhb+XvpN4JItQn2D+AHyNoeZLw=";
+  npmDepsHash = "sha256-zmhGpsRoMHgsq/XKOMGNIgxxsiMju9bG//Qd72HrMSE=";
 
   nativeBuildInputs = [
     installShellFiles

diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildGraalvmNativeImage,
-  graalvmCEPackages,
+  graalvmPackages,
   fetchurl,
 }:
 
@@ -14,7 +14,7 @@ buildGraalvmNativeImage rec {
     sha256 = "sha256-/pzRKx6fqcbVwp+Eif3a1mh/awmwhhLVtFldRYibp/g=";
   };
 
-  graalvmDrv = graalvmCEPackages.graalvm-ce;
+  graalvmDrv = graalvmPackages.graalvm-ce;
 
   extraNativeImageBuildArgs = [
     "-H:+ReportExceptionStackTraces"

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cosmic-launcher";
-  version = "1.0.0-alpha.1";
+  version = "1.0.0-alpha.4";
 
   src = fetchFromGitHub {
     owner = "pop-os";
-    repo = pname;
+    repo = "cosmic-launcher";
     rev = "epoch-${version}";
-    hash = "sha256-LzTVtXyNgaVKyARmrmb6YUi4dWa20EwM1SYMlnawtzk=";
+    hash = "sha256-rx2FrRSiW5UQLEUtNbQ5JEoTR9djQEtY3eOxR2IqkU4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-bHJUsXHnPH6aV2vTQv1Cdx+p4/Pplg6HMguw5BK9qJ8=";
+  cargoHash = "sha256-gvrqomChaMv3u1pVUoGUkXw66Gr2wjkxNQIbrcbJrdY=";
 
   nativeBuildInputs = [
     just
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   postPatch = ''
-    substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
+    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
   '';
 
   postInstall = ''

diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cppcheck";
-  version = "2.16.0";
+  version = "2.16.1";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "danmar";
     repo = "cppcheck";
     rev = finalAttrs.version;
-    hash = "sha256-u+/rlQksCyNjLOkLHiRfLKWfVSEU+LerYuT6lAp/Wrs=";
+    hash = "sha256-rx/JtpNPo8uDr4MR6h0ANK0erK8oMhlJp+4BQtc/poc=";
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/by-name/cq/cq/package.nix b/pkgs/by-name/cq/cq/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   fetchurl,
   buildGraalvmNativeImage,
-  graalvmCEPackages,
+  graalvmPackages,
 }:
 
 buildGraalvmNativeImage rec {
@@ -24,7 +24,7 @@ buildGraalvmNativeImage rec {
     hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8=";
   };
 
-  graalvmDrv = graalvmCEPackages.graalvm-ce;
+  graalvmDrv = graalvmPackages.graalvm-ce;
 
   executable = "cq";
 

diff --git a/pkgs/by-name/di/discordchatexporter-desktop/deps.nix b/pkgs/by-name/di/discordchatexporter-desktop/deps.nix
diff --git a/pkgs/by-name/di/discordchatexporter-desktop/package.nix b/pkgs/by-name/di/discordchatexporter-desktop/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  testers,
+  discordchatexporter-desktop,
+}:
+
+buildDotnetModule rec {
+  pname = "discordchatexporter-desktop";
+  version = "2.44";
+
+  src = fetchFromGitHub {
+    owner = "tyrrrz";
+    repo = "discordchatexporter";
+    rev = version;
+    hash = "sha256-eLwSodbEux8pYXNZZg8c2rCYowTEkvPzYbxANYe0O7w=";
+  };
+
+  env.XDG_CONFIG_HOME = "$HOME/.config";
+
+  projectFile = "DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj";
+  nugetDeps = ./deps.nix;
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.runtime_9_0;
+
+  patches = [ ./settings-path.patch ];
+
+  postFixup = ''
+    ln -s $out/bin/DiscordChatExporter $out/bin/discordchatexporter
+  '';
+
+  passthru = {
+    updateScript = ./updater.sh;
+  };
+
+  meta = with lib; {
+    description = "Tool to export Discord chat logs to a file (GUI version)";
+    homepage = "https://github.com/Tyrrrz/DiscordChatExporter";
+    license = licenses.gpl3Plus;
+    changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md";
+    maintainers = with maintainers; [ kekschen ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "discordchatexporter";
+  };
+}
diff --git a/pkgs/by-name/di/discordchatexporter-desktop/settings-path.patch b/pkgs/by-name/di/discordchatexporter-desktop/settings-path.patch
@@ -0,0 +1,19 @@
+diff --git a/DiscordChatExporter.Gui/Services/SettingsService.cs b/DiscordChatExporter.Gui/Services/SettingsService.cs
+index 4f69969..80a8d4b 100644
+--- a/DiscordChatExporter.Gui/Services/SettingsService.cs
++++ b/DiscordChatExporter.Gui/Services/SettingsService.cs
+@@ -14,7 +14,13 @@ namespace DiscordChatExporter.Gui.Services;
+ [INotifyPropertyChanged]
+ public partial class SettingsService()
+     : SettingsBase(
+-        Path.Combine(AppContext.BaseDirectory, "Settings.dat"),
++        Path.Combine(
++          System.IO.Path.Combine(
++            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
++            "discordchatexporter"
++          ),
++          "Settings.dat"
++        ),
+         SerializerContext.Default
+     )
+ {
diff --git a/pkgs/by-name/di/discordchatexporter-desktop/updater.sh b/pkgs/by-name/di/discordchatexporter-desktop/updater.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
+set -eo pipefail
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+new_version="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/tyrrrz/DiscordChatExporter/releases?per_page=1" | jq -r '.[0].name')"
+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
+if [[ "$new_version" == "$old_version" ]]; then
+  echo "Up to date"
+  exit 0
+fi
+
+cd ../../../..
+update-source-version discordchatexporter-desktop "$new_version"
+$(nix-build -A discordchatexporter-desktop.fetch-deps --no-out-link)