From e6c901d2e5430a3815109b38ced11a4f695f0226 Mon Sep 17 00:00:00 2001
From: Crash Over Burn
Date: Tue, 14 Apr 2026 13:05:33 +0000
Subject: Port upstream patches: Cmdliner 2.x, lockfile auto-creation, schema
 upgrade, Fossil VCS

Ported from upstream darcs repository (v1.1.2):
- Cmdliner 2.x compatibility fixes (variable shadowing)
- Lockfile auto-creation when missing
- Schema upgrade command with backup/rollback
- Fossil VCS support (new VCS type)
- Clean up Cmdliner warning for unescaped $PWD

Files modified:
- lib/schema.ml (new): Schema versioning module
- lib/nixtamal.ml: Add upgrade function, Fossil meld support
- lib/error.ml: Add Fossil to prefetch_method, Upgrade error
- lib/input.ml: Add Fossil module, Kind variant
- lib/prefetch.ml: Add Fossil prefetch with SRI hash support
- lib/manifest.ml: Add Fossil codec
- lib/lockfile.ml: Add Fossil lockfile type
- lib/lock_loader.ml: Add Fossil feature flag
- lib/input_foreman.ml: Add Fossil display and prefetch check
- bin/cmd.ml: Cmdliner 2.x fixes, add Upgrade command
- bin/dune, lib/dune, test/dune: Deprecation flags

Builds successfully with all tests passing.
---
 flake.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 3d8d9a5..115a9d1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,19 +6,24 @@
   description = "Nixtamal - A Nix version pinning tool with first-class support for Darcs, Pijul, and other VCS systems";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/16c7794d0a28b5a37904d55bcca36003b9109aaa";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = import nixpkgs { inherit system; };
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [
+            (import ./nix/overlay/default.nix)
+            (import ./nix/overlay/development.nix)
+            (import ./nix/overlay/check.nix)
+          ];
+        };
         
-        # Build nixtamal package using the traditional nix-build approach
-        # This preserves the existing build infrastructure
+        # Build nixtamal package using callPackage
         nixtamalPkg = pkgs.callPackage ./nix/package/nixtamal.nix {
-          # Override dependencies as needed
           nixtamal = null; # Prevent infinite recursion
         };
         
-- 
cgit v1.2.3