From c516c10603cc7d21144b744c12af7534c8eb2e2a Mon Sep 17 00:00:00 2001
From: PgBiel <9021226+PgBiel@users.noreply.github.com>
Date: Sun, 22 Dec 2024 11:51:26 -0300
Subject: [PATCH 1/3] add nixpkgs follows to 'glistix new'

OK since Glistix now pins its Rust version
---
 compiler-cli/src/new.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compiler-cli/src/new.rs b/compiler-cli/src/new.rs
index d5bc72517..1cc540b63 100644
--- a/compiler-cli/src/new.rs
+++ b/compiler-cli/src/new.rs
@@ -277,7 +277,10 @@ jobs:
     }};
 
     # Pick your Glistix version here.
-    glistix.url = "github:glistix/glistix/v0.4.0";
+    glistix.url = {{
+      url = "github:glistix/glistix/v0.4.0";
+      inputs.nixpkgs.follows = "nixpkgs";
+    }};
 
     # Submodules
     # Add any submodules which you use as dependencies here,

From c15f2851c84d3e724b710d2305fa6ea27ed88b59 Mon Sep 17 00:00:00 2001
From: PgBiel <9021226+PgBiel@users.noreply.github.com>
Date: Sun, 22 Dec 2024 22:59:47 -0300
Subject: [PATCH 2/3] whoopsie

---
 compiler-cli/src/new.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-cli/src/new.rs b/compiler-cli/src/new.rs
index 1cc540b63..ce04d58ff 100644
--- a/compiler-cli/src/new.rs
+++ b/compiler-cli/src/new.rs
@@ -277,7 +277,7 @@ jobs:
     }};
 
     # Pick your Glistix version here.
-    glistix.url = {{
+    glistix = {{
       url = "github:glistix/glistix/v0.4.0";
       inputs.nixpkgs.follows = "nixpkgs";
     }};

From 64a4aeafefd18ba5cd5f0177e2424bc71c6a51f4 Mon Sep 17 00:00:00 2001
From: PgBiel <9021226+PgBiel@users.noreply.github.com>
Date: Mon, 23 Dec 2024 01:01:15 -0300
Subject: [PATCH 3/3] remove follows in CI

---
 .github/workflows/ci.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a0ed639f6..1396cf0cd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -412,6 +412,12 @@ jobs:
           cd .test-flake
           nix run -L .. -- new newpkg
 
+      # For efficiency, just fully reuse the already built glistix
+      - name: Remove 'follows nixpkgs' from test project flake
+        run: |
+          sed -i -e 's/inputs\.nixpkgs\.follows = "nixpkgs";//' flake.nix
+        working-directory: ./.test-flake/newpkg
+
       - name: Build generated project without flake
         run: |
           # Build to generate manifest.toml