From 8be7ee877f8b34979a5fc43ba9040a058422a356 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Mon, 30 Sep 2024 19:45:31 +0200
Subject: remove +nightly cargo rustup flag

---
 data/makefile         | 6 ++++--
 makefile              | 2 +-
 pixel-client/makefile | 4 ++--
 server/makefile       | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/data/makefile b/data/makefile
index a13f9095..7b954476 100644
--- a/data/makefile
+++ b/data/makefile
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
-SETS = default none
+SETS = default none anticurry
 all: $(patsubst %,recipes/%.yaml,$(SETS))
 graphs: recipes/default.svg
 
@@ -21,11 +21,13 @@ JSR = deno run
 
 recipes/none.yaml:
 	echo > $@
+recipes/anticurry.yaml: recipes/default.yaml
+	recipes/anticurry.sed <$<>$@
 recipes/default.yaml: recipes/default.js
 	DENO_NO_UPDATE_CHECK=1 $(JSR) $< > $@
 
 recipes/%.gv.txt: recipes/%.yaml
-	{ cd .. && cargo +nightly run --release --bin graph $(patsubst recipes/%.yaml,%,$<); } > $@
+	{ cd .. && cargo run --release --bin graph $(patsubst recipes/%.yaml,%,$<); } > $@
 
 recipes/%.svg: recipes/%.gv.txt
 	dot -Tsvg -Kdot >$@<$<
diff --git a/makefile b/makefile
index 0c6b038c..5bacd060 100644
--- a/makefile
+++ b/makefile
@@ -33,4 +33,4 @@ clean:
 	make -C client clean
 	make -C pixel-client clean
 	make -C test-client clean
-	cargo +nightly clean
+	cargo clean
diff --git a/pixel-client/makefile b/pixel-client/makefile
index fc11d613..80ab64bc 100644
--- a/pixel-client/makefile
+++ b/pixel-client/makefile
@@ -41,9 +41,9 @@ clean:
 	$(RM) assets/atlas.ta assets/atlas.meta.csv
 
 $(CLIENT): $(shell find src -type f) $(CLIENT_DEPS)
-	cargo +nightly build --release --bin pixelcurry
+	cargo build --release --bin pixelcurry
 $(IMPORT) $(EXPORT) $(PACK) $(COMPOSE): $(shell find tools/src -type f)
-	{ cd tools; cargo +nightly build --release; }
+	{ cd tools; cargo build --release; }
 
 %.ta: %.import.png $(IMPORT)
 	$(IMPORT) $< $@
diff --git a/server/makefile b/server/makefile
index 9f40d4b0..b80ff3b8 100644
--- a/server/makefile
+++ b/server/makefile
@@ -22,7 +22,7 @@ all: $(SERVER) $(REPLAYTOOL)
 clean:
 
 $(SERVER): $(shell find protocol src -type f)
-	cargo +nightly build --release
+	cargo build --release
 $(REPLAYTOOL): $(shell find protocol replaytool -type f)
-	{ cd replaytool; cargo +nightly build --release; }
+	{ cd replaytool; cargo build --release; }
 
-- 
cgit v1.2.3-70-g09d2