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

Conflicts:
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix

2 files changed, 67 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/by-name/ii/iina/package.nix b/nixpkgs/pkgs/by-name/ii/iina/package.nix
new file mode 100644
index 000000000000..2288a688cf0d
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/ii/iina/package.nix
@@ -0,0 +1,38 @@
+{ lib
+, fetchurl
+, stdenv
+, undmg
+, nix-update-script
+}:
+
+stdenv.mkDerivation rec {
+  pname = "iina";
+  version = "1.3.4";
+
+  src = fetchurl {
+    url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg";
+    hash = "sha256-feUPWtSi/Vsnv1mjGyBgB0wFMxx6r6UzrUratlAo14w=";
+  };
+
+  nativeBuildInputs = [ undmg ];
+
+  sourceRoot = "IINA.app";
+
+  installPhase = ''
+    mkdir -p $out/{bin,Applications/IINA.app}
+    cp -R . "$out/Applications/IINA.app"
+    ln -s "$out/Applications/IINA.app/Contents/MacOS/iina-cli" "$out/bin/iina"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    homepage = "https://iina.io/";
+    description = "The modern media player for macOS";
+    platforms = platforms.darwin;
+    license = licenses.gpl3;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    mainProgram = "iina";
+    maintainers = with maintainers; [ arkivm stepbrobd ];
+  };
+}
diff --git a/nixpkgs/pkgs/by-name/ii/iir1/package.nix b/nixpkgs/pkgs/by-name/ii/iir1/package.nix
new file mode 100644
index 000000000000..94d8a554f98d
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/ii/iir1/package.nix
@@ -0,0 +1,29 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "iir1";
+  version = "1.9.4";
+
+  src = fetchFromGitHub {
+    owner = "berndporr";
+    repo = "iir1";
+    rev = finalAttrs.version;
+    hash = "sha256-T8gl51IkZIGq+6D5ge4Kb3wm5aw7Rhphmnf6TTGwHbs=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = "https://berndporr.github.io/iir1/";
+    description = "A DSP IIR realtime filter library written in C++";
+    downloadPage = "https://github.com/berndporr/iir1";
+    changelog = "https://github.com/berndporr/iir1/releases/tag/${finalAttrs.src.rev}";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.unix;
+  };
+})