From f136d4a6ec926c4eb0a19034816decd50d2759fd Mon Sep 17 00:00:00 2001
From: 4ever2 <3417013+4ever2@users.noreply.github.com>
Date: Mon, 9 Mar 2026 13:42:41 +0100
Subject: [PATCH] rocqPackages.stdpp: init at 1.13.0

---
 .../development/coq-modules/stdpp/default.nix | 96 ++++++++++---------
 .../rocq-modules/stdpp/default.nix            | 41 ++++++++
 pkgs/top-level/rocq-packages.nix              |  1 +
 3 files changed, 95 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/development/rocq-modules/stdpp/default.nix

diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix
index 4270c5877a2c..65b21fd1cf50 100644
--- a/pkgs/development/coq-modules/stdpp/default.nix
+++ b/pkgs/development/coq-modules/stdpp/default.nix
@@ -6,50 +6,60 @@
   version ? null,
 }:
 
-mkCoqDerivation {
-  pname = "stdpp";
-  inherit version;
-  domain = "gitlab.mpi-sws.org";
-  owner = "iris";
-  defaultVersion =
-    let
-      case = case: out: { inherit case out; };
-    in
-    with lib.versions;
-    lib.switch coq.coq-version [
-      (case (range "8.19" "9.1") "1.12.0")
-      (case (range "8.18" "8.19") "1.10.0")
-      (case (range "8.16" "8.18") "1.9.0")
-      (case (range "8.13" "8.17") "1.8.0")
-      (case (range "8.12" "8.14") "1.6.0")
-      (case (range "8.11" "8.13") "1.5.0")
-      (case (range "8.8" "8.10") "1.4.0")
-    ] null;
-  release."1.12.0".sha256 = "sha256-2o8YMkKbXrKHwtfpkdAovxl+2NZZk958GjSSd9wcEIU=";
-  release."1.11.0".sha256 = "sha256-yqnkaA5gUdZBJZ3JnvPYh11vKQRl0BAnior1yGowG7k=";
-  release."1.10.0".sha256 = "sha256-bfynevIKxAltvt76lsqVxBmifFkzEhyX8lRgTKxr21I=";
-  release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI=";
-  release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU=";
-  release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y";
-  release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v";
-  release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf";
-  release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r";
-  releaseRev = v: "coq-stdpp-${v}";
+let
+  derivation = mkCoqDerivation {
+    pname = "stdpp";
+    inherit version;
+    domain = "gitlab.mpi-sws.org";
+    owner = "iris";
+    defaultVersion =
+      let
+        case = case: out: { inherit case out; };
+      in
+      with lib.versions;
+      lib.switch coq.coq-version [
+        (case (range "8.19" "9.1") "1.12.0")
+        (case (range "8.18" "8.19") "1.10.0")
+        (case (range "8.16" "8.18") "1.9.0")
+        (case (range "8.13" "8.17") "1.8.0")
+        (case (range "8.12" "8.14") "1.6.0")
+        (case (range "8.11" "8.13") "1.5.0")
+        (case (range "8.8" "8.10") "1.4.0")
+      ] null;
+    release."1.12.0".sha256 = "sha256-2o8YMkKbXrKHwtfpkdAovxl+2NZZk958GjSSd9wcEIU=";
+    release."1.11.0".sha256 = "sha256-yqnkaA5gUdZBJZ3JnvPYh11vKQRl0BAnior1yGowG7k=";
+    release."1.10.0".sha256 = "sha256-bfynevIKxAltvt76lsqVxBmifFkzEhyX8lRgTKxr21I=";
+    release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI=";
+    release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU=";
+    release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y";
+    release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v";
+    release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf";
+    release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r";
+    releaseRev = v: "coq-stdpp-${v}";
 
-  propagatedBuildInputs = [ stdlib ];
+    propagatedBuildInputs = [ stdlib ];
 
-  preBuild = ''
-    if [[ -f coq-lint.sh ]]
-    then patchShebangs coq-lint.sh
-    fi
-  '';
+    preBuild = ''
+      if [[ -f coq-lint.sh ]]
+      then patchShebangs coq-lint.sh
+      fi
+    '';
 
-  meta = {
-    description = "Extended “Standard Library” for Coq";
-    license = lib.licenses.bsd3;
-    maintainers = [
-      lib.maintainers.vbgl
-      lib.maintainers.ineol
-    ];
+    meta = {
+      description = "Extended “Standard Library” for Coq";
+      license = lib.licenses.bsd3;
+      maintainers = [
+        lib.maintainers.vbgl
+        lib.maintainers.ineol
+      ];
+    };
   };
-}
+in
+# this is just a wrapper for rocqPackages.stdpp for Rocq >= 9.0
+if coq.rocqPackages ? stdpp then
+  coq.rocqPackages.stdpp.override {
+    inherit version;
+    inherit (coq.rocqPackages) rocq-core;
+  }
+else
+  derivation
diff --git a/pkgs/development/rocq-modules/stdpp/default.nix b/pkgs/development/rocq-modules/stdpp/default.nix
new file mode 100644
index 000000000000..927fed975840
--- /dev/null
+++ b/pkgs/development/rocq-modules/stdpp/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  mkRocqDerivation,
+  rocq-core,
+  stdlib,
+  version ? null,
+}:
+
+mkRocqDerivation {
+  pname = "stdpp";
+  inherit version;
+  domain = "gitlab.mpi-sws.org";
+  owner = "iris";
+  defaultVersion =
+    let
+      case = case: out: { inherit case out; };
+    in
+    with lib.versions;
+    lib.switch rocq-core.rocq-version [
+      (case (range "9.0" "9.2") "1.13.0")
+    ] null;
+  release."1.13.0".sha256 = "sha256-kj8oBzarsLB4DDQ43yz4ViQbyzuISqext28wC2Fh3Sw=";
+  releaseRev = v: "stdpp-${v}";
+
+  propagatedBuildInputs = [ stdlib ];
+
+  preBuild = ''
+    if [[ -f coq-lint.sh ]]
+    then patchShebangs coq-lint.sh
+    fi
+  '';
+
+  meta = {
+    description = "Extended “Standard Library” for Rocq";
+    license = lib.licenses.bsd3;
+    maintainers = [
+      lib.maintainers.vbgl
+      lib.maintainers.ineol
+    ];
+  };
+}
diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix
index 53f5720c53d9..5046cfe9b645 100644
--- a/pkgs/top-level/rocq-packages.nix
+++ b/pkgs/top-level/rocq-packages.nix
@@ -52,6 +52,7 @@ let
       relation-algebra = callPackage ../development/rocq-modules/relation-algebra { };
       rocq-elpi = callPackage ../development/rocq-modules/rocq-elpi { };
       stdlib = callPackage ../development/rocq-modules/stdlib { };
+      stdpp = callPackage ../development/rocq-modules/stdpp { };
       vsrocq-language-server = callPackage ../development/rocq-modules/vsrocq-language-server { };
 
       filterPackages = doesFilter: if doesFilter then filterRocqPackages self else self;