From 632bca87344e58a5c010663614f72b1a6ceeb1d5 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 13 Oct 2025 11:54:59 +0800
Subject: [PATCH] conda: 25.3.1-1 -> 25.9.1-1

---
 pkgs/by-name/co/conda/package.nix | 73 +++++++++++++++----------------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix
index 8ebd8825a82a..dd36990c60b0 100644
--- a/pkgs/by-name/co/conda/package.nix
+++ b/pkgs/by-name/co/conda/package.nix
@@ -27,6 +27,7 @@
   ],
   # Any extra nixpkgs you'd like available in the FHS env for Conda to use
   extraPkgs ? [ ],
+  runScript ? "bash -l",
 }:
 
 # How to use this package?
@@ -43,7 +44,7 @@
 # $ conda-shell
 # $ conda install spyder
 let
-  version = "25.3.1-1";
+  version = "25.9.1-1";
 
   src =
     let
@@ -59,21 +60,15 @@ let
     fetchurl {
       url = "https://repo.anaconda.com/miniconda/Miniconda3-py313_${version}-Linux-${arch}.sh";
       hash = selectSystem {
-        x86_64-linux = "sha256-U6hhCUY8/XC6esqzltQW5iMBKRTu4ARynh7Nb+lOjGk=";
-        aarch64-linux = "sha256-TKoMJmq3JrRAzK1Ap0d0FnSU4AHaXeKBt08tVnPkrOk=";
+        x86_64-linux = "sha256-YCJxTaIphgl7vvoT2rPZVyV/7wThw30evTZFtbmbydQ=";
+        aarch64-linux = "sha256-oN5FYsNoqLXKQ4WEP0BWhMeb6nqjt111E/+ZwMZDXVE=";
       };
     };
 
-  conda = (
-    let
-      libPath = lib.makeLibraryPath [
-        zlib # libz.so.1
-      ];
-    in
+  conda =
     runCommand "install-conda"
       {
         nativeBuildInputs = [ makeWrapper ];
-        buildInputs = [ zlib ];
       }
       # on line 10, we have 'unset LD_LIBRARY_PATH'
       # we have to comment it out however in a way that the number of bytes in the
@@ -82,24 +77,25 @@ let
       # of bytes from the top of the installer script
       # and unsetting the library path prevents the zlib library from being discovered
       ''
-        mkdir -p $out/bin
+        mkdir --parents $out/bin
 
         sed 's/unset LD_LIBRARY_PATH/#nset LD_LIBRARY_PATH/' ${src} > $out/bin/miniconda-installer.sh
         chmod +x $out/bin/miniconda-installer.sh
 
-        makeWrapper                            \
-          $out/bin/miniconda-installer.sh      \
-          $out/bin/install-conda               \
+        makeWrapper $out/bin/miniconda-installer.sh $out/bin/install-conda \
           --add-flags "-p ${installationPath}" \
-          --add-flags "-b"                     \
-          --prefix "LD_LIBRARY_PATH" : "${libPath}"
-      ''
-  );
+          --add-flags "-b" \
+          --prefix "LD_LIBRARY_PATH" : "${
+            lib.makeLibraryPath [
+              zlib # libz.so.1
+            ]
+          }"
+      '';
 in
 
 buildFHSEnv {
   pname = "conda-shell";
-  inherit version;
+  inherit version runScript;
 
   targetPkgs =
     pkgs:
@@ -109,25 +105,26 @@ buildFHSEnv {
       extraPkgs
     ]);
 
-  profile = ''
-    # Add conda to PATH
-    export PATH=${installationPath}/bin:$PATH
-    # Paths for gcc if compiling some C sources with pip
-    export NIX_CFLAGS_COMPILE="-I${installationPath}/include"
-    export NIX_CFLAGS_LINK="-L${installationPath}lib"
-    # Some other required environment variables
-    export FONTCONFIG_FILE=/etc/fonts/fonts.conf
-    export QTCOMPOSE=${xorg.libX11}/share/X11/locale
-    export LIBARCHIVE=${lib.getLib libarchive}/lib/libarchive.so
-    # Allows `conda activate` to work properly
-    condaSh=${installationPath}/etc/profile.d/conda.sh
-    if [ ! -f $condaSh ]; then
-      install-conda
-    fi
-    source $condaSh
-  '';
-
-  runScript = "bash -l";
+  profile =
+    let
+      condaSh = "${installationPath}/etc/profile.d/conda.sh";
+    in
+    ''
+      # Add conda to PATH
+      export PATH=${installationPath}/bin:$PATH
+      # Paths for gcc if compiling some C sources with pip
+      export NIX_CFLAGS_COMPILE="-I${installationPath}/include"
+      export NIX_CFLAGS_LINK="-L${installationPath}/lib"
+      # Some other required environment variables
+      export FONTCONFIG_FILE=/etc/fonts/fonts.conf
+      export QTCOMPOSE=${xorg.libX11}/share/X11/locale
+      export LIBARCHIVE=${lib.getLib libarchive}/lib/libarchive.so
+      # Allows `conda activate` to work properly
+      if [ ! -f ${condaSh} ]; then
+        install-conda
+      fi
+      source ${condaSh}
+    '';
 
   meta = {
     description = "Package manager for Python";