Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into HEAD

3 files changed, 78 insertions, 1 deletions

diff --git a/nixpkgs/pkgs/by-name/si/signal-export/package.nix b/nixpkgs/pkgs/by-name/si/signal-export/package.nix
new file mode 100644
index 000000000000..d1e20fa68a0a
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/si/signal-export/package.nix
@@ -0,0 +1,40 @@
+{ lib
+, python3
+, fetchPypi
+, nix-update-script
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "signal-export";
+  version = "1.6.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-1efc8jclXE4PQ/K9q1GC0mGqYo5lXXOIYEzz3RDNBGA=";
+  };
+
+  nativeBuildInputs = with python3.pkgs; [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    setuptools
+    typer
+    beautifulsoup4
+    emoji
+    markdown
+    pysqlcipher3
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    mainProgram = "sigexport";
+    homepage = "https://github.com/carderne/signal-export";
+    description = "Export your Signal chats to markdown files with attachments.";
+    platforms = platforms.unix;
+    license = licenses.mit;
+    maintainers = with maintainers; [ phaer picnoir ];
+  };
+}
diff --git a/nixpkgs/pkgs/by-name/si/simde/package.nix b/nixpkgs/pkgs/by-name/si/simde/package.nix
new file mode 100644
index 000000000000..c79cbf38f7cd
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/si/simde/package.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchFromGitHub, meson, ninja }:
+
+stdenv.mkDerivation rec {
+  pname = "simde";
+  version = "0.7.6";
+
+  src = fetchFromGitHub {
+    owner = "simd-everywhere";
+    repo = "simde";
+    rev = "v${version}";
+    hash = "sha256-pj+zaD5o9XYkTavezcQFzM6ao0IdQP1zjP9L4vcCyEY=";
+  };
+
+  nativeBuildInputs = [ meson ninja ];
+
+  meta = with lib; {
+    homepage = "https://simd-everywhere.github.io";
+    description = "Implementations of SIMD instruction sets for systems which don't natively support them";
+    license = with licenses; [mit];
+    maintainers = with maintainers; [ whiteley ];
+    platforms = flatten (with platforms; [
+      arm
+      armv7
+      aarch64
+      x86
+      power
+      mips
+    ]);
+  };
+}
diff --git a/nixpkgs/pkgs/by-name/si/sirius/package.nix b/nixpkgs/pkgs/by-name/si/sirius/package.nix
index 2af3c28de922..8518092203b8 100644
--- a/nixpkgs/pkgs/by-name/si/sirius/package.nix
+++ b/nixpkgs/pkgs/by-name/si/sirius/package.nix
@@ -21,9 +21,16 @@
 , eigen
 , libvdwxc
 , llvmPackages
-, gpuBackend ? "none"
 , cudaPackages
 , rocmPackages
+, config
+, gpuBackend ? (
+  if config.cudaSupport
+  then "cuda"
+  else if config.rocmSupport
+  then "rocm"
+  else "none"
+)
 }:
 
 assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ];