From caf0d43c882e126e791b7fde59b25fa1269994ac Mon Sep 17 00:00:00 2001 From: madonuko Date: Thu, 29 Aug 2024 16:38:19 +0800 Subject: [PATCH 01/29] bump: choosenim --- anda/langs/nim/choosenim/choosenim.spec | 2 +- anda/langs/nim/choosenim/update.rhai | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index da60b61965..3b69d8af3b 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -1,5 +1,5 @@ Name: choosenim -Version: 0.8.4 +Version: 0.8.5 Release: 1%?dist Summary: Easily install and manage multiple versions of the Nim programming language License: BSD-3-Clause diff --git a/anda/langs/nim/choosenim/update.rhai b/anda/langs/nim/choosenim/update.rhai index 06b3e87387..6cc4e85559 100644 --- a/anda/langs/nim/choosenim/update.rhai +++ b/anda/langs/nim/choosenim/update.rhai @@ -1 +1 @@ -rpm.version(gh("dom96/choosenim")); +rpm.version(gh("nim-lang/choosenim")); From 1b4106458a08986ee4fcdd3f23a04197d164f154 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 29 Aug 2024 16:41:41 +0800 Subject: [PATCH 02/29] url Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 3b69d8af3b..63ac3e7886 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -3,8 +3,9 @@ Version: 0.8.5 Release: 1%?dist Summary: Easily install and manage multiple versions of the Nim programming language License: BSD-3-Clause -URL: https://github.com/dom96/choosenim +URL: https://github.com/nim-lang/choosenim Source0: %url/archive/refs/tags/v%version.tar.gz +Packager: madonuko BuildRequires: nim git %description From cd1bda43eef2ae736d7e2700b8034f5767eacf09 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 29 Aug 2024 19:54:14 +0800 Subject: [PATCH 03/29] nimble c? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 63ac3e7886..331973d71d 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -17,7 +17,7 @@ sources, enabling you to easily switch between stable and development compilers. %build nimble setup -y -nim c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim +nimble c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim %install install -Dm755 src/choosenim %buildroot%_bindir/choosenim From f7e866452c8614cecb657c826c0dc3b7d6867fa0 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 29 Aug 2024 20:12:04 +0800 Subject: [PATCH 04/29] koch? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 331973d71d..a87cbeda68 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -1,3 +1,5 @@ +%global nimver 2.0.8 + Name: choosenim Version: 0.8.5 Release: 1%?dist @@ -5,6 +7,7 @@ Summary: Easily install and manage multiple versions of the Nim programming lan License: BSD-3-Clause URL: https://github.com/nim-lang/choosenim Source0: %url/archive/refs/tags/v%version.tar.gz +Source1: https://github.com/nim-lang/Nim/archive/refs/tags/v%nimver.tar.gz Packager: madonuko BuildRequires: nim git @@ -14,6 +17,13 @@ sources, enabling you to easily switch between stable and development compilers. %prep %autosetup +tar xf %SOURCE1 + +# bootstrap koch +pushd Nim-%nimver +nim c koch +popd +./Nim-%nimver/koch tools %build nimble setup -y From bc49751e7d063f0e880e30e1ec2de6ecbc166b26 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 29 Aug 2024 20:16:07 +0800 Subject: [PATCH 05/29] koch checksums Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index a87cbeda68..db5d869178 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -23,7 +23,7 @@ tar xf %SOURCE1 pushd Nim-%nimver nim c koch popd -./Nim-%nimver/koch tools +./Nim-%nimver/koch checksums %build nimble setup -y From 1ce8da69dc899474fc96aad2937e172e7b32ff3e Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 29 Aug 2024 21:04:14 +0800 Subject: [PATCH 06/29] =?UTF-8?q?=E2=80=A6dunno=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index db5d869178..cf9915139a 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -22,8 +22,10 @@ tar xf %SOURCE1 # bootstrap koch pushd Nim-%nimver nim c koch +./koch checksums +ls -alh +mv dist ../../ popd -./Nim-%nimver/koch checksums %build nimble setup -y From 4f6c3f6807ef79db29971430433d4db6027bb037 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 29 Aug 2024 21:20:34 +0800 Subject: [PATCH 07/29] Update choosenim.spec Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index cf9915139a..531cb0295c 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -23,8 +23,8 @@ tar xf %SOURCE1 pushd Nim-%nimver nim c koch ./koch checksums -ls -alh -mv dist ../../ +mkdir -p ../nimble/ +mv dist ../nimble/ popd %build From 9dfb8b8aa7edad5f4a214cda74be2e62daf3a7c5 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 4 Sep 2024 13:50:12 +0800 Subject: [PATCH 08/29] try --path Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 531cb0295c..49989b3ccb 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -23,13 +23,11 @@ tar xf %SOURCE1 pushd Nim-%nimver nim c koch ./koch checksums -mkdir -p ../nimble/ -mv dist ../nimble/ popd %build nimble setup -y -nimble c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim +nimble c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim --path:Nim-%nimver %install install -Dm755 src/choosenim %buildroot%_bindir/choosenim From 82af5c16714b217def3211b893ea3c67350a43f3 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 4 Sep 2024 13:55:06 +0800 Subject: [PATCH 09/29] ? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 49989b3ccb..41fa44c856 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -1,4 +1,4 @@ -%global nimver 2.0.8 +%global nimver %(curl -sSL https://nim-lang.org/channels/stable | xargs) Name: choosenim Version: 0.8.5 @@ -7,7 +7,7 @@ Summary: Easily install and manage multiple versions of the Nim programming lan License: BSD-3-Clause URL: https://github.com/nim-lang/choosenim Source0: %url/archive/refs/tags/v%version.tar.gz -Source1: https://github.com/nim-lang/Nim/archive/refs/tags/v%nimver.tar.gz +Source1: https://nim-lang.org/download/nim-$nimver-linux_x64.tar.xz Packager: madonuko BuildRequires: nim git @@ -19,15 +19,11 @@ sources, enabling you to easily switch between stable and development compilers. %autosetup tar xf %SOURCE1 -# bootstrap koch -pushd Nim-%nimver -nim c koch -./koch checksums -popd %build nimble setup -y -nimble c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim --path:Nim-%nimver +nimble c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim --path:nim-%nimver/bin + %install install -Dm755 src/choosenim %buildroot%_bindir/choosenim From f7e8a3baac7e97361118479fa4a0bb0bf1d91b02 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 4 Sep 2024 13:57:42 +0800 Subject: [PATCH 10/29] oops Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 41fa44c856..d07cc5fa34 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -7,7 +7,7 @@ Summary: Easily install and manage multiple versions of the Nim programming lan License: BSD-3-Clause URL: https://github.com/nim-lang/choosenim Source0: %url/archive/refs/tags/v%version.tar.gz -Source1: https://nim-lang.org/download/nim-$nimver-linux_x64.tar.xz +Source1: https://nim-lang.org/download/nim-%nimver-linux_x64.tar.xz Packager: madonuko BuildRequires: nim git From de0b5ad2ef68658f1c7a234ce2b436660b903a0f Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 4 Sep 2024 14:01:32 +0800 Subject: [PATCH 11/29] ls? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index d07cc5fa34..2d20d18f3b 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -18,6 +18,7 @@ sources, enabling you to easily switch between stable and development compilers. %prep %autosetup tar xf %SOURCE1 +ls -alh nim-%nimver/ %build From 9e598428ced36c839c32cc260e566b1a177cb134 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 4 Sep 2024 14:04:51 +0800 Subject: [PATCH 12/29] --path Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 2d20d18f3b..17b5c2e140 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -18,12 +18,11 @@ sources, enabling you to easily switch between stable and development compilers. %prep %autosetup tar xf %SOURCE1 -ls -alh nim-%nimver/ %build -nimble setup -y -nimble c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim --path:nim-%nimver/bin +nimble setup -y -p:nim-%nimver/bin +nimble c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim -p:nim-%nimver/bin %install From c4d98e292f86128ef981eb8ac84d8664d4c36203 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 4 Sep 2024 14:10:20 +0800 Subject: [PATCH 13/29] try nimble install instead Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 17b5c2e140..1c02060b0c 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -21,7 +21,7 @@ tar xf %SOURCE1 %build -nimble setup -y -p:nim-%nimver/bin +nimble install -y nimble c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim -p:nim-%nimver/bin From 5d8bef3963ee83c79fa940fb232441eaced22a3f Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 4 Sep 2024 14:20:19 +0800 Subject: [PATCH 14/29] no nimble install? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 1c02060b0c..4f107613b9 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -21,7 +21,7 @@ tar xf %SOURCE1 %build -nimble install -y +#nimble install -y nimble c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim -p:nim-%nimver/bin From 6d35431823a5ca4cb684ae47a1ff881168235f47 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 9 Sep 2024 15:13:15 +0800 Subject: [PATCH 15/29] nimble build? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 4f107613b9..6e48488540 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -22,7 +22,7 @@ tar xf %SOURCE1 %build #nimble install -y -nimble c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim -p:nim-%nimver/bin +nimble build -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim -p:nim-%nimver/bin %install From 6824e56c52d389cd47e9c2298f358ef791baf144 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 9 Sep 2024 15:20:25 +0800 Subject: [PATCH 16/29] --path? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 6e48488540..45161fa305 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -22,7 +22,7 @@ tar xf %SOURCE1 %build #nimble install -y -nimble build -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim -p:nim-%nimver/bin +nimble build -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim --path:nim-%nimver/bin %install From 52d8a173fd0408e282f9cd4696ba29d8fbfda074 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 4 Oct 2024 14:17:29 +0800 Subject: [PATCH 17/29] ? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 45161fa305..94511adecf 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -6,24 +6,27 @@ Release: 1%?dist Summary: Easily install and manage multiple versions of the Nim programming language License: BSD-3-Clause URL: https://github.com/nim-lang/choosenim -Source0: %url/archive/refs/tags/v%version.tar.gz Source1: https://nim-lang.org/download/nim-%nimver-linux_x64.tar.xz Packager: madonuko -BuildRequires: nim git +BuildRequires: nim git curl tar %description choosenim installs the Nim programming language from official downloads and sources, enabling you to easily switch between stable and development compilers. %prep -%autosetup -tar xf %SOURCE1 - +%git_clone %url v%version +tar -xvJf %SOURCE1 %build -#nimble install -y -nimble build -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim --path:nim-%nimver/bin - +NIMPATH=`pwd`/nim-%nimver/bin +PATH=$PATH:$NIMPATH +# compile choosenim +ls -lah +cd choosenim +nimble install -y +%nim_c --path:$NIMPATH +# nimble build --path:$NIMPATH -d:release %install install -Dm755 src/choosenim %buildroot%_bindir/choosenim From f1ce4ae5cdbf1df33cb53efbb8f493a40188f87c Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 4 Oct 2024 14:20:42 +0800 Subject: [PATCH 18/29] anda-srpm-macros Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 94511adecf..62bab81276 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -8,7 +8,7 @@ License: BSD-3-Clause URL: https://github.com/nim-lang/choosenim Source1: https://nim-lang.org/download/nim-%nimver-linux_x64.tar.xz Packager: madonuko -BuildRequires: nim git curl tar +BuildRequires: nim git curl tar anda-srpm-macros %description choosenim installs the Nim programming language from official downloads and From 41dcc0a95dc24d1a041752e7fae5d5b3d9394ad2 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 4 Oct 2024 14:37:03 +0800 Subject: [PATCH 19/29] no cd Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 62bab81276..7a2ba8c3b3 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -23,7 +23,6 @@ NIMPATH=`pwd`/nim-%nimver/bin PATH=$PATH:$NIMPATH # compile choosenim ls -lah -cd choosenim nimble install -y %nim_c --path:$NIMPATH # nimble build --path:$NIMPATH -d:release From c8e5f5b06f96d7ce0c0b89d4d715fa56d0185be3 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 4 Oct 2024 14:45:02 +0800 Subject: [PATCH 20/29] Update choosenim.spec Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 7a2ba8c3b3..337cc80beb 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -24,8 +24,8 @@ PATH=$PATH:$NIMPATH # compile choosenim ls -lah nimble install -y -%nim_c --path:$NIMPATH -# nimble build --path:$NIMPATH -d:release +%dnl %nim_c --path:$NIMPATH +nimble build --path:$NIMPATH -d:release %install install -Dm755 src/choosenim %buildroot%_bindir/choosenim From 30f22c3d62eea7e77fadf2a1ef8168801f445ac2 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 4 Oct 2024 14:45:24 +0800 Subject: [PATCH 21/29] 0.8.9? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 337cc80beb..ad0fcf3e05 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -1,7 +1,7 @@ %global nimver %(curl -sSL https://nim-lang.org/channels/stable | xargs) Name: choosenim -Version: 0.8.5 +Version: 0.8.9 Release: 1%?dist Summary: Easily install and manage multiple versions of the Nim programming language License: BSD-3-Clause From 8bf59365edbc09cbf0a971825dcaa991493e37ac Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 4 Oct 2024 14:51:00 +0800 Subject: [PATCH 22/29] idk? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index ad0fcf3e05..05a153a28c 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -23,9 +23,9 @@ NIMPATH=`pwd`/nim-%nimver/bin PATH=$PATH:$NIMPATH # compile choosenim ls -lah -nimble install -y -%dnl %nim_c --path:$NIMPATH -nimble build --path:$NIMPATH -d:release +nimble install --path $NIMPATH -y +%nim_c --path:$NIMPATH +#nimble build --path:$NIMPATH -d:release %install install -Dm755 src/choosenim %buildroot%_bindir/choosenim From 68d3c9db49ab9250dd3c2df7cef7402d49c1389b Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 4 Oct 2024 18:59:02 +0800 Subject: [PATCH 23/29] ? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 05a153a28c..01f9aa9895 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -23,7 +23,7 @@ NIMPATH=`pwd`/nim-%nimver/bin PATH=$PATH:$NIMPATH # compile choosenim ls -lah -nimble install --path $NIMPATH -y +nimble install --path=$NIMPATH -y %nim_c --path:$NIMPATH #nimble build --path:$NIMPATH -d:release From 5e11ded0a0bb7c638362fe2567363feb28dd2753 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 4 Oct 2024 19:17:33 +0800 Subject: [PATCH 24/29] that kinda means I don't need nim here Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 01f9aa9895..6874b50f0a 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -8,7 +8,7 @@ License: BSD-3-Clause URL: https://github.com/nim-lang/choosenim Source1: https://nim-lang.org/download/nim-%nimver-linux_x64.tar.xz Packager: madonuko -BuildRequires: nim git curl tar anda-srpm-macros +BuildRequires: git-core curl tar anda-srpm-macros %description choosenim installs the Nim programming language from official downloads and From 9dd95bb1e0123f3fe1316f8c70b0d8070bc743cc Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 4 Oct 2024 19:27:25 +0800 Subject: [PATCH 25/29] try just nimble build Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 6874b50f0a..da65acac28 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -8,7 +8,7 @@ License: BSD-3-Clause URL: https://github.com/nim-lang/choosenim Source1: https://nim-lang.org/download/nim-%nimver-linux_x64.tar.xz Packager: madonuko -BuildRequires: git-core curl tar anda-srpm-macros +BuildRequires: nim git-core curl tar anda-srpm-macros %description choosenim installs the Nim programming language from official downloads and @@ -16,16 +16,16 @@ sources, enabling you to easily switch between stable and development compilers. %prep %git_clone %url v%version -tar -xvJf %SOURCE1 +%dnl tar -xvJf %SOURCE1 %build NIMPATH=`pwd`/nim-%nimver/bin PATH=$PATH:$NIMPATH # compile choosenim -ls -lah -nimble install --path=$NIMPATH -y -%nim_c --path:$NIMPATH -#nimble build --path:$NIMPATH -d:release +%dnl ls -lah +%dnl nimble install --path=$NIMPATH -y +%dnl %nim_c --path:$NIMPATH +nimble build -d:release -t:"%nim_tflags" -l:"%nim_lflags" %install install -Dm755 src/choosenim %buildroot%_bindir/choosenim From ccb9465428d5b0edec46ca3f14f5a70c53e49884 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 4 Oct 2024 23:34:33 +0800 Subject: [PATCH 26/29] use nim macros Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index da65acac28..5ec4158105 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -6,26 +6,20 @@ Release: 1%?dist Summary: Easily install and manage multiple versions of the Nim programming language License: BSD-3-Clause URL: https://github.com/nim-lang/choosenim -Source1: https://nim-lang.org/download/nim-%nimver-linux_x64.tar.xz +Source0: %url/archive/refs/tags/v%version.tar.gz Packager: madonuko -BuildRequires: nim git-core curl tar anda-srpm-macros +BuildRequires: nim nim-tools git-core anda-srpm-macros %description choosenim installs the Nim programming language from official downloads and sources, enabling you to easily switch between stable and development compilers. %prep -%git_clone %url v%version -%dnl tar -xvJf %SOURCE1 +%autosetup +%nim_prep %build -NIMPATH=`pwd`/nim-%nimver/bin -PATH=$PATH:$NIMPATH -# compile choosenim -%dnl ls -lah -%dnl nimble install --path=$NIMPATH -y -%dnl %nim_c --path:$NIMPATH -nimble build -d:release -t:"%nim_tflags" -l:"%nim_lflags" +%nim_c src/choosenim %install install -Dm755 src/choosenim %buildroot%_bindir/choosenim From 9f6461d7a0537983d0aadd6a59389721286f76a6 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 5 Oct 2024 13:56:39 +0800 Subject: [PATCH 27/29] Update choosenim.spec --- anda/langs/nim/choosenim/choosenim.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 5ec4158105..e5ce766f45 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -16,7 +16,6 @@ sources, enabling you to easily switch between stable and development compilers. %prep %autosetup -%nim_prep %build %nim_c src/choosenim From d6db3014692b45693963fd9835296c55ead130d0 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 6 Oct 2024 13:29:50 +0800 Subject: [PATCH 28/29] try official nim build Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index e5ce766f45..fec853cf86 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -7,8 +7,10 @@ Summary: Easily install and manage multiple versions of the Nim programming lan License: BSD-3-Clause URL: https://github.com/nim-lang/choosenim Source0: %url/archive/refs/tags/v%version.tar.gz +Source1: https://nim-lang.org/download/nim-%nimver-linux_x64.tar.xz Packager: madonuko -BuildRequires: nim nim-tools git-core anda-srpm-macros +BuildRequires: git-core anda-srpm-macros +#BuildRequires: nim nim-tools %description choosenim installs the Nim programming language from official downloads and @@ -16,8 +18,11 @@ sources, enabling you to easily switch between stable and development compilers. %prep %autosetup +tar -xvJf %SOURCE1 %build +NIMPATH=`pwd`/nim-%nimver/bin +PATH=$PATH:$NIMPATH %nim_c src/choosenim %install From 69deca46adb65c3d9a0486e03c16aac7102f634c Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 21 Oct 2024 14:59:54 +0800 Subject: [PATCH 29/29] try buildconflicts? Signed-off-by: madomado --- anda/langs/nim/choosenim/choosenim.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index fec853cf86..6bef4040a7 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -10,6 +10,7 @@ Source0: %url/archive/refs/tags/v%version.tar.gz Source1: https://nim-lang.org/download/nim-%nimver-linux_x64.tar.xz Packager: madonuko BuildRequires: git-core anda-srpm-macros +BuildConflicts: nim nim-tools #BuildRequires: nim nim-tools %description