From 794116e327e3dfe7e1edeaf6995e05c9babc8c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 15 Mar 2024 11:44:56 +0000
Subject: [PATCH] fix flake/flake-parts templates

---
 examples/simple-remote/.test.sh | 2 ++
 examples/simple/devenv.yaml     | 3 +++
 templates/flake-parts/flake.nix | 5 ++++-
 templates/simple/flake.nix      | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 examples/simple-remote/.test.sh
 create mode 100644 examples/simple/devenv.yaml

diff --git a/examples/simple-remote/.test.sh b/examples/simple-remote/.test.sh
new file mode 100644
index 000000000..7a2ced314
--- /dev/null
+++ b/examples/simple-remote/.test.sh
@@ -0,0 +1,2 @@
+env | grep GREET
+env | grep GREET2
\ No newline at end of file
diff --git a/examples/simple/devenv.yaml b/examples/simple/devenv.yaml
new file mode 100644
index 000000000..c7cb5ceda
--- /dev/null
+++ b/examples/simple/devenv.yaml
@@ -0,0 +1,3 @@
+inputs:
+  nixpkgs:
+    url: github:NixOS/nixpkgs/nixpkgs-unstable
diff --git a/templates/flake-parts/flake.nix b/templates/flake-parts/flake.nix
index f9d1e7a46..1aea74d5c 100644
--- a/templates/flake-parts/flake.nix
+++ b/templates/flake-parts/flake.nix
@@ -2,7 +2,7 @@
   description = "Description for the project";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:github:cachix/devenv-nixpkgs/rolling";
     devenv.url = "github:cachix/devenv";
     nix2container.url = "github:nlewo/nix2container";
     nix2container.inputs.nixpkgs.follows = "nixpkgs";
@@ -26,6 +26,9 @@
         # module parameters provide easy access to attributes of the same
         # system.
 
+        # needed for devenv up
+        packages.devenv-up = self'.devShells.default.config.procfileScript;
+
         # Equivalent to  inputs'.nixpkgs.legacyPackages.hello;
         packages.default = pkgs.hello;
 
diff --git a/templates/simple/flake.nix b/templates/simple/flake.nix
index a440343d2..b049d27f1 100644
--- a/templates/simple/flake.nix
+++ b/templates/simple/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:github:cachix/devenv-nixpkgs/rolling";
     systems.url = "github:nix-systems/default";
     devenv.url = "github:cachix/devenv";
   };