From 63d2c3f5237217bf684ae3b849281d4a0b87cb40 Mon Sep 17 00:00:00 2001 From: chikoyeat <manavrj.07@gmail.com> Date: Thu, 26 Dec 2024 21:41:19 +0530 Subject: [PATCH 01/16] added miniforge --- .../python-modules/miniforge/default.nix | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/miniforge/default.nix diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix new file mode 100644 index 0000000000000..448028375bc70 --- /dev/null +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +, conda +}: + +stdenv.mkDerivation rec { + pname = "miniforge"; + version = "24.11.0-0"; + + src = fetchFromGitHub { + owner = "conda-forge"; + repo = "miniforge"; + rev = version; + sha256 = "sha256-Mtw0TI5LWv7aC2kCx7EStYXEUa9J3xTwUPpN/z9GvAQ="; # Will be provided by nix-build error + }; + + buildInputs = [ + python3 + conda + ]; + + installPhase = '' + mkdir -p $out/bin + cp -r * $out/ + ln -s $out/miniforge3/bin/conda $out/bin/miniforge-conda + ''; + + meta = with lib; { + description = "A conda-forge distribution with mamba 1.5.11"; + homepage = "https://github.com/conda-forge/miniforge"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; # Add your maintainer handle after PR to nixpkgs-maintainers + }; +} From b0a11f62c1112ba2586533a7e35aeba063f0dae8 Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Thu, 26 Dec 2024 22:44:42 +0530 Subject: [PATCH 02/16] Update default.nix --- .../python-modules/miniforge/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix index 448028375bc70..ce2f6fb777c6d 100644 --- a/pkgs/development/python-modules/miniforge/default.nix +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -1,9 +1,4 @@ -{ lib -, stdenv -, fetchFromGitHub -, python3 -, conda -}: +{ lib, stdenv, fetchFromGitHub, python3, conda }: stdenv.mkDerivation rec { pname = "miniforge"; @@ -13,13 +8,11 @@ stdenv.mkDerivation rec { owner = "conda-forge"; repo = "miniforge"; rev = version; - sha256 = "sha256-Mtw0TI5LWv7aC2kCx7EStYXEUa9J3xTwUPpN/z9GvAQ="; # Will be provided by nix-build error + sha256 = + "sha256-Mtw0TI5LWv7aC2kCx7EStYXEUa9J3xTwUPpN/z9GvAQ="; }; - buildInputs = [ - python3 - conda - ]; + buildInputs = [ python3 conda ]; installPhase = '' mkdir -p $out/bin @@ -32,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/conda-forge/miniforge"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ ]; # Add your maintainer handle after PR to nixpkgs-maintainers + maintainers = with maintainers; + [ ]; }; } From e620d9852ad025ba8153968225e1cd6165802e8e Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Thu, 26 Dec 2024 22:47:59 +0530 Subject: [PATCH 03/16] Update default.nix From 26595d8ce03b74a5f992e416adbd36794f4bd823 Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Fri, 27 Dec 2024 01:04:42 +0530 Subject: [PATCH 04/16] Update pkgs/development/python-modules/miniforge/default.nix Co-authored-by: Yohann Boniface <edhyjox@gmail.com> --- pkgs/development/python-modules/miniforge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix index ce2f6fb777c6d..0b149d35996f0 100644 --- a/pkgs/development/python-modules/miniforge/default.nix +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A conda-forge distribution with mamba 1.5.11"; + description = "Conda-forge distribution with mamba"; homepage = "https://github.com/conda-forge/miniforge"; license = licenses.bsd3; platforms = platforms.unix; From dd23daa703e199d12d6b4d7457ae83b8843d876d Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Fri, 27 Dec 2024 01:04:49 +0530 Subject: [PATCH 05/16] Update pkgs/development/python-modules/miniforge/default.nix Co-authored-by: Yohann Boniface <edhyjox@gmail.com> --- pkgs/development/python-modules/miniforge/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix index 0b149d35996f0..f975b3ebbe04b 100644 --- a/pkgs/development/python-modules/miniforge/default.nix +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { owner = "conda-forge"; repo = "miniforge"; rev = version; - sha256 = - "sha256-Mtw0TI5LWv7aC2kCx7EStYXEUa9J3xTwUPpN/z9GvAQ="; + hash = "sha256-Mtw0TI5LWv7aC2kCx7EStYXEUa9J3xTwUPpN/z9GvAQ="; }; buildInputs = [ python3 conda ]; From f682ac66b002797f67ca38c1d6a2cf71e3ab0128 Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Fri, 27 Dec 2024 01:14:59 +0530 Subject: [PATCH 06/16] Updated default.nix --- pkgs/development/python-modules/miniforge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix index f975b3ebbe04b..77076763641f4 100644 --- a/pkgs/development/python-modules/miniforge/default.nix +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, conda }: +{ lib, buildPythonPackage, stdenv, fetchFromGitHub, python3, conda }: stdenv.mkDerivation rec { pname = "miniforge"; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { ln -s $out/miniforge3/bin/conda $out/bin/miniforge-conda ''; - meta = with lib; { + meta = { description = "Conda-forge distribution with mamba"; homepage = "https://github.com/conda-forge/miniforge"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; - [ ]; + [ qxrein ]; }; } From 54323cae8df26085af4e483cb30e482c9ac4ce93 Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Fri, 27 Dec 2024 01:20:52 +0530 Subject: [PATCH 07/16] Update default.nix --- .../python-modules/miniforge/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix index 77076763641f4..e4f5d883c4309 100644 --- a/pkgs/development/python-modules/miniforge/default.nix +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonPackage, stdenv, fetchFromGitHub, python3, conda }: +{ + lib, + buildPythonPackage, + stdenv, + fetchFromGitHub, + python3, + conda, +}: stdenv.mkDerivation rec { pname = "miniforge"; @@ -8,10 +15,13 @@ stdenv.mkDerivation rec { owner = "conda-forge"; repo = "miniforge"; rev = version; - hash = "sha256-Mtw0TI5LWv7aC2kCx7EStYXEUa9J3xTwUPpN/z9GvAQ="; + hash = "sha256-Mtw0TI5LWv7aC2kCx7EStYXEUa9J3xTwUPpN/z9GvAQ="; }; - buildInputs = [ python3 conda ]; + buildInputs = [ + python3 + conda + ]; installPhase = '' mkdir -p $out/bin @@ -24,7 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/conda-forge/miniforge"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; - [ qxrein ]; + maintainers = with maintainers; [ qxrein ]; }; } From 1c7954fbe77654a0b8bf07c23fb7e90fa26fca96 Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Fri, 27 Dec 2024 01:25:05 +0530 Subject: [PATCH 08/16] licenses --- pkgs/development/python-modules/miniforge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix index e4f5d883c4309..53264f52038a3 100644 --- a/pkgs/development/python-modules/miniforge/default.nix +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Conda-forge distribution with mamba"; homepage = "https://github.com/conda-forge/miniforge"; - license = licenses.bsd3; + license = with licenses; [ bsd3 ]; platforms = platforms.unix; maintainers = with maintainers; [ qxrein ]; }; From d6089d84968870d8f9244be870bcda101f4ea00d Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Fri, 27 Dec 2024 01:30:25 +0530 Subject: [PATCH 09/16] default.nix: some formatting issue --- pkgs/development/python-modules/miniforge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix index 53264f52038a3..82141227edd24 100644 --- a/pkgs/development/python-modules/miniforge/default.nix +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Conda-forge distribution with mamba"; homepage = "https://github.com/conda-forge/miniforge"; - license = with licenses; [ bsd3 ]; + license = with licenses; [ bsd3 ]; platforms = platforms.unix; maintainers = with maintainers; [ qxrein ]; }; From ba6c0e1e919bf24f82d28849ff10e074b6bbf2c1 Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Mon, 30 Dec 2024 18:15:40 +0530 Subject: [PATCH 10/16] Update default.nix --- pkgs/development/python-modules/miniforge/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix index 82141227edd24..e5fff41d22d08 100644 --- a/pkgs/development/python-modules/miniforge/default.nix +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -1,6 +1,5 @@ { lib, - buildPythonPackage, stdenv, fetchFromGitHub, python3, @@ -25,15 +24,15 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -r * $out/ - ln -s $out/miniforge3/bin/conda $out/bin/miniforge-conda + cp -r Miniforge3/* $out/ + ln -s ${conda}/bin/conda $out/bin/miniforge-conda ''; - meta = { + meta = with lib; { description = "Conda-forge distribution with mamba"; homepage = "https://github.com/conda-forge/miniforge"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ qxrein ]; + maintainers = [ "qxrein" ]; }; } From 8b217c126b711588568e420a54c2c3ddfe8214eb Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Tue, 31 Dec 2024 11:00:20 +0000 Subject: [PATCH 11/16] python-packages: added package --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78a8674d3e1d4..d2801308c4b51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8185,6 +8185,8 @@ self: super: with self; { minidump = callPackage ../development/python-modules/minidump { }; + miniforge = callPackage ../development/python-modules/miniforge { }; + miniful = callPackage ../development/python-modules/miniful { }; minikanren = callPackage ../development/python-modules/minikanren { }; From bb2b4eb9f6d7b6053743774ab4a02026503c13d1 Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Tue, 31 Dec 2024 11:20:16 +0000 Subject: [PATCH 12/16] added maintainer name --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8bb8e723ac7ec..1e501ddbfbb7f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18567,6 +18567,12 @@ githubId = 40905037; name = "qwqawawow"; }; + qxrein = { + email = "manavrj.07@gmail.com.com"; + github = "qxrein"; + githubId = 101001298; + name = "qxrein"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; From f27596c294da37c589cc200d1c35b2f1b3288b81 Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Tue, 31 Dec 2024 16:51:54 +0530 Subject: [PATCH 13/16] Update maintainer-list.nix --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e501ddbfbb7f..91eb07dcf4516 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18568,7 +18568,7 @@ name = "qwqawawow"; }; qxrein = { - email = "manavrj.07@gmail.com.com"; + email = "manavrj.07@gmail.com"; github = "qxrein"; githubId = 101001298; name = "qxrein"; From 825cedd274c72b0e97360a52df2125d5593c66ff Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Tue, 31 Dec 2024 16:59:26 +0530 Subject: [PATCH 14/16] update for maintainer info --- pkgs/development/python-modules/miniforge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix index e5fff41d22d08..303e3a05d2f63 100644 --- a/pkgs/development/python-modules/miniforge/default.nix +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/conda-forge/miniforge"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = [ "qxrein" ]; + maintainers = with maintainers; [ "qxrein" ]; }; } From 4e99293d5f3ee0370f0b8ebb49e1ee95c7e50cc6 Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Tue, 31 Dec 2024 17:10:51 +0530 Subject: [PATCH 15/16] Update default.nix --- pkgs/development/python-modules/miniforge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/miniforge/default.nix b/pkgs/development/python-modules/miniforge/default.nix index 303e3a05d2f63..5aa1a01c3b250 100644 --- a/pkgs/development/python-modules/miniforge/default.nix +++ b/pkgs/development/python-modules/miniforge/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/conda-forge/miniforge"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ "qxrein" ]; + maintainers = with maintainers; [ qxrein ]; }; } From 45c28c81b699a9c5b1ac5bcfb2477567dc1ad11a Mon Sep 17 00:00:00 2001 From: rein <manavrj.07@gmail.com> Date: Fri, 3 Jan 2025 20:30:41 +0530 Subject: [PATCH 16/16] Update maintainer-list.nix --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 91eb07dcf4516..8bb8e723ac7ec 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18567,12 +18567,6 @@ githubId = 40905037; name = "qwqawawow"; }; - qxrein = { - email = "manavrj.07@gmail.com"; - github = "qxrein"; - githubId = 101001298; - name = "qxrein"; - }; qyliss = { email = "hi@alyssa.is"; github = "alyssais";