From fd786ff3805efea7611eca20d4fff2a13cd79117 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 18 Feb 2025 01:16:19 -0500
Subject: [PATCH 1/3] rivet: move to pkgs/by-name

---
 .../default.nix => by-name/ri/rivet/package.nix}   | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  4 ----
 2 files changed, 7 insertions(+), 11 deletions(-)
 rename pkgs/{development/libraries/physics/rivet/default.nix => by-name/ri/rivet/package.nix} (90%)

diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/by-name/ri/rivet/package.nix
similarity index 90%
rename from pkgs/development/libraries/physics/rivet/default.nix
rename to pkgs/by-name/ri/rivet/package.nix
index adf5ae595efe..cb7ceda22827 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/by-name/ri/rivet/package.nix
@@ -5,10 +5,10 @@
   fastjet,
   fastjet-contrib,
   ghostscript,
+  graphicsmagick-imagemagick-compat,
   hdf5,
   hepmc3,
   highfive,
-  imagemagick,
   less,
   pkg-config,
   python3,
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
   buildInputs = [
+    graphicsmagick-imagemagick-compat
     hepmc3
     highfive
-    imagemagick
     python3
     latex
     python3.pkgs.yoda
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
       --replace-fail '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \
       --replace-fail '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \
       --replace-fail '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \
-      --replace-fail '"convert"' '"${imagemagick.out}/bin/convert"'
+      --replace-fail '"convert"' '"${graphicsmagick-imagemagick-compat.out}/bin/convert"'
     substituteInPlace bin/rivet \
       --replace-fail '"less"' '"${less}/bin/less"'
     substituteInPlace bin/rivet-mkhtml-tex \
@@ -109,11 +109,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Framework for comparison of experimental measurements from high-energy particle colliders to theory predictions";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
     homepage = "https://rivet.hepforge.org";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ veprbl ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb69df388926..e289c52ded44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17364,10 +17364,6 @@ with pkgs;
     hepmc = hepmc2;
   };
 
-  rivet = callPackage ../development/libraries/physics/rivet {
-    imagemagick = graphicsmagick-imagemagick-compat;
-  };
-
   yoda-with-root = lowPrio (yoda.override {
     withRootSupport = true;
   });

From 07679a005a55bb33bf62556c60e9ed18fab4030d Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 18 Feb 2025 03:46:46 -0500
Subject: [PATCH 2/3] yoda: workaround darwin detection

---
 pkgs/by-name/yo/yoda/package.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix
index 838eb0733065..1f98ae4f135a 100644
--- a/pkgs/by-name/yo/yoda/package.nix
+++ b/pkgs/by-name/yo/yoda/package.nix
@@ -30,20 +30,16 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    [
-      python3
-    ]
+    [ python3 ]
     ++ (with python3.pkgs; [
       numpy
       matplotlib
     ])
-    ++ lib.optionals withRootSupport [
-      root
-    ];
+    ++ lib.optionals withRootSupport [ root ];
 
-  propagatedBuildInputs = [
-    zlib
-  ];
+  propagatedBuildInputs = [ zlib ];
+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DWITH_OSX";
 
   strictDeps = true;
 

From facea472a0b0b88a07ff33f6f667c1e24d0a52a5 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 18 Feb 2025 03:47:00 -0500
Subject: [PATCH 3/3] rivet: 4.0.2 -> 4.0.3

---
 pkgs/by-name/ri/rivet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ri/rivet/package.nix b/pkgs/by-name/ri/rivet/package.nix
index cb7ceda22827..f69fc644e841 100644
--- a/pkgs/by-name/ri/rivet/package.nix
+++ b/pkgs/by-name/ri/rivet/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rivet";
-  version = "4.0.2";
+  version = "4.0.3";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    hash = "sha256-ZaOzb0K/94LtJ2eTDmaeCbFAiZYF15cvyPd3hbSogsA=";
+    hash = "sha256-27l7dp0Yd/NMPFAZASe/2nhHvOx5uh3llWH99DzdSGk=";
   };
 
   latex = texliveBasic.withPackages (