From d703a6f20df15b753cc4f674afdaf79b74853a8c Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <151380951+kmr-srbh@users.noreply.github.com>
Date: Sat, 17 Feb 2024 11:34:41 +0530
Subject: [PATCH 1/6] Added `flex` and `zstd-static=1.5.5` packages.

---
 environment_win.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/environment_win.yml b/environment_win.yml
index af80e30c7c..3da9d77cac 100644
--- a/environment_win.yml
+++ b/environment_win.yml
@@ -2,18 +2,20 @@ name: lp
 channels:
   - conda-forge
 dependencies:
-  - python=3.10.2
-  - numpy
-  - flake8
+  - git
   - pip
+  - make
+  - re2c
   - toml
+  - zlib
+  - flex
+  - cmake
+  - ninja
+  - numpy
+  - xonsh
+  - flake8
   - setuptools
-  - llvmdev=11.1.0
+  - python=3.10.2
   - m2-bison=3.0.4
-  - re2c
-  - xonsh
-  - ninja
-  - cmake
-  - make
-  - zlib
-  - git
+  - llvmdev=11.1.0
+  - zstd-static=1.5.5

From c5731b73db72613b24f8537114fe83b3da9a2edb Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <151380951+kmr-srbh@users.noreply.github.com>
Date: Sat, 17 Feb 2024 11:35:24 +0530
Subject: [PATCH 2/6] Added `flex` and `zstd-static=1.5.5` packages.

---
 environment_unix.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/environment_unix.yml b/environment_unix.yml
index 0942bbcbaf..ddea38dd0b 100644
--- a/environment_unix.yml
+++ b/environment_unix.yml
@@ -2,16 +2,18 @@ name: lp
 channels:
   - conda-forge
 dependencies:
-  - bison=3.4
-  - cmake
-  - flake8
-  - llvmdev=11.0.1
-  - make
-  - numpy
+  - git
   - pip
-  - python=3.10.2
+  - make
   - re2c
-  - setuptools
   - toml
   - zlib
-  - git
+  - flex
+  - cmake
+  - numpy
+  - flake8
+  - setuptools
+  - bison=3.4
+  - python=3.10.2
+  - llvmdev=11.0.1
+  - zstd-static=1.5.5

From 433e4af2faa64d0d89166bde4bfdc65f21dd9e05 Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <151380951+kmr-srbh@users.noreply.github.com>
Date: Sat, 17 Feb 2024 11:37:57 +0530
Subject: [PATCH 3/6] Incorporated suggestions from #2537

Moved global package installations to conda environment.
---
 doc/src/installation.md | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/doc/src/installation.md b/doc/src/installation.md
index e9db50cf92..bc02241cab 100644
--- a/doc/src/installation.md
+++ b/doc/src/installation.md
@@ -12,16 +12,10 @@ Follow the steps below to install and run LPython on Linux, Windows or macOS.
 
 - ### Set up your system
     - Linux
-        - Make sure you have `g++` and `cmake` installed. If not, install them using the below command:
+        - Run the following command to install some global build dependencies:
 
             ```bash
-            sudo apt-get install g++ cmake
-            ```
-
-        - Run the following command to install the build dependencies:
-
-            ```bash
-            sudo apt-get install binutils-dev build-essential zlib1g-dev bison re2c flex
+            sudo apt-get install build-essential binutils-dev clang zlib1g-dev
             ```
     - Windows
         - Download and install [Microsoft Visual Studio Community](https://visualstudio.microsoft.com/downloads/) for free.

From bfa0cdeebd68e40840ffffec3953bb1591be479b Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <151380951+kmr-srbh@users.noreply.github.com>
Date: Sat, 17 Feb 2024 11:41:53 +0530
Subject: [PATCH 4/6] Updated README.md to reflect changes suggested in #2537

---
 README.md | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 49502b582f..6324f41306 100644
--- a/README.md
+++ b/README.md
@@ -36,16 +36,10 @@ Follow the steps below to install and run LPython on Linux, Windows or macOS.
 
 - ### Set up your system
     - Linux
-        - Make sure you have `g++` and `cmake` installed. If not, install them using the below command:
+        - Run the following command to install some global build dependencies:
 
             ```bash
-            sudo apt-get install g++ cmake
-            ```
-
-        - Run the following command to install the build dependencies:
-
-            ```bash
-            sudo apt-get install binutils-dev build-essential zlib1g-dev bison re2c flex
+            sudo apt-get install build-essential binutils-dev clang zlib1g-dev
             ```
     - Windows
         - Download and install [Microsoft Visual Studio Community](https://visualstudio.microsoft.com/downloads/) for free.

From a68a0b258795520b24aa51711736f30f03fe5b0e Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <151380951+kmr-srbh@users.noreply.github.com>
Date: Sat, 17 Feb 2024 12:12:31 +0530
Subject: [PATCH 5/6] Remove `flex`

---
 environment_unix.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/environment_unix.yml b/environment_unix.yml
index ddea38dd0b..af7dffcff0 100644
--- a/environment_unix.yml
+++ b/environment_unix.yml
@@ -8,7 +8,6 @@ dependencies:
   - re2c
   - toml
   - zlib
-  - flex
   - cmake
   - numpy
   - flake8

From 94ea77078eed8d9e2ac98bf1585f02312a8c0311 Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <151380951+kmr-srbh@users.noreply.github.com>
Date: Sat, 17 Feb 2024 12:12:54 +0530
Subject: [PATCH 6/6] Remove `flex`

---
 environment_win.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/environment_win.yml b/environment_win.yml
index 3da9d77cac..60774b822c 100644
--- a/environment_win.yml
+++ b/environment_win.yml
@@ -8,7 +8,6 @@ dependencies:
   - re2c
   - toml
   - zlib
-  - flex
   - cmake
   - ninja
   - numpy