From 1cc5cb9434eb7a6886684bffbcdf766b2db471dd Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:26:47 -0400
Subject: [PATCH 1/5] rav1e: migrate to by-name

---
 .../video/rav1e/default.nix => by-name/ra/rav1e/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/video/rav1e/default.nix => by-name/ra/rav1e/package.nix} (97%)

diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/by-name/ra/rav1e/package.nix
similarity index 97%
rename from pkgs/tools/video/rav1e/default.nix
rename to pkgs/by-name/ra/rav1e/package.nix
index fae72b0266cb..d2e769568339 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -9,7 +9,7 @@
 , nasm
 , zlib
 , libiconv
-, Security
+, darwin
 , buildPackages
 }:
 
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     zlib
   ] ++ lib.optionals stdenv.isDarwin [
     libiconv
-    Security
+    darwin.apple_sdk.frameworks.Security
   ];
 
   # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a425eafd46c3..d31cb039b61c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6215,10 +6215,6 @@ with pkgs;
     rainloop-community
     rainloop-standard;
 
-  rav1e = callPackage ../tools/video/rav1e {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   raven-reader = callPackage ../applications/networking/newsreaders/raven-reader { };
 
   razergenie = libsForQt5.callPackage ../applications/misc/razergenie { };

From 8a7b6d26b7b294452d84f053ecc6ff6e836411f2 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:27:05 -0400
Subject: [PATCH 2/5] rav1e: format with nixfmt

---
 pkgs/by-name/ra/rav1e/package.nix | 47 +++++++++++++++++--------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index d2e769568339..526c4b9b968c 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -1,16 +1,17 @@
-{ lib
-, rust
-, stdenv
-, rustPlatform
-, fetchCrate
-, pkg-config
-, cargo-c
-, libgit2
-, nasm
-, zlib
-, libiconv
-, darwin
-, buildPackages
+{
+  lib,
+  rust,
+  stdenv,
+  rustPlatform,
+  fetchCrate,
+  pkg-config,
+  cargo-c,
+  libgit2,
+  nasm,
+  zlib,
+  libiconv,
+  darwin,
+  buildPackages,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -26,15 +27,19 @@ rustPlatform.buildRustPackage rec {
 
   depsBuildBuild = [ pkg-config ];
 
-  nativeBuildInputs = [ cargo-c libgit2 nasm ];
-
-  buildInputs = [
-    zlib
-  ] ++ lib.optionals stdenv.isDarwin [
-    libiconv
-    darwin.apple_sdk.frameworks.Security
+  nativeBuildInputs = [
+    cargo-c
+    libgit2
+    nasm
   ];
 
+  buildInputs =
+    [ zlib ]
+    ++ lib.optionals stdenv.isDarwin [
+      libiconv
+      darwin.apple_sdk.frameworks.Security
+    ];
+
   # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
   # and linking it with cctools ld64.
   postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
@@ -43,7 +48,7 @@ rustPlatform.buildRustPackage rec {
 
   checkType = "debug";
 
-  postBuild =  ''
+  postBuild = ''
     ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
   '';
 

From 20726adce7daf23730748c97bf99933ccdfd7ebf Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:27:21 -0400
Subject: [PATCH 3/5] rav1e: adopt

---
 pkgs/by-name/ra/rav1e/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index 526c4b9b968c..44a3fd4b9a62 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/xiph/rav1e";
     changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}";
     license = licenses.bsd2;
-    maintainers = [ ];
+    maintainers = with maintainers; [ getchoo ];
     mainProgram = "rav1e";
   };
 }

From 7f7608889007b13041f0099597c2de3af00ae290 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:31:16 -0400
Subject: [PATCH 4/5] rav1e: modernize

https://github.com/NixOS/nixpkgs/issues/208242
---
 pkgs/by-name/ra/rav1e/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index 44a3fd4b9a62..2e63eb89d683 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -11,7 +11,6 @@
   zlib,
   libiconv,
   darwin,
-  buildPackages,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM=";
+    hash = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM=";
   };
 
   cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY=";
@@ -56,7 +55,7 @@ rustPlatform.buildRustPackage rec {
     ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fastest and safest AV1 encoder";
     longDescription = ''
       rav1e is an AV1 video encoder. It is designed to eventually cover all use
@@ -66,8 +65,8 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/xiph/rav1e";
     changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ getchoo ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "rav1e";
   };
 }

From d12fe4763b21681ea7e5ff3a6145cb0474bc145c Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:32:39 -0400
Subject: [PATCH 5/5] rav1e: add version test

---
 pkgs/by-name/ra/rav1e/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index 2e63eb89d683..b90dd2d56a61 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -6,11 +6,13 @@
   fetchCrate,
   pkg-config,
   cargo-c,
-  libgit2,
-  nasm,
-  zlib,
-  libiconv,
   darwin,
+  libgit2,
+  libiconv,
+  nasm,
+  testers,
+  zlib,
+  rav1e,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -55,6 +57,10 @@ rustPlatform.buildRustPackage rec {
     ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
   '';
 
+  passthru = {
+    tests.version = testers.testVersion { package = rav1e; };
+  };
+
   meta = {
     description = "Fastest and safest AV1 encoder";
     longDescription = ''