2 files changed, 26 insertions(+), 14 deletions(-)

M flake.lock
M flake.nix

@@ 70,7 70,24 @@
         "docutils-0_20_1": "docutils-0_20_1",
         "license-list-XML": "license-list-XML",
         "nixpkgs": "nixpkgs",
-        "npmlock2nix": "npmlock2nix"
+        "npmlock2nix": "npmlock2nix",
+        "soupault-4_7_0": "soupault-4_7_0"
+      }
+    },
+    "soupault-4_7_0": {
+      "locked": {
+        "lastModified": 1695144377,
+        "narHash": "sha256-SBdoEJ/sFCONlj/zumHf2Ipjn9ohaz/JI3qJQi9/w5c=",
+        "owner": "toastal",
+        "repo": "nixpkgs",
+        "rev": "11542fbc14acecd90b68e2441f69a425ea235371",
+        "type": "github"
+      },
+      "original": {
+        "owner": "toastal",
+        "ref": "soupault-4.7.0",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     }
   },

@@ 13,6 13,7 @@
     npmlock2nix = { url = "github:nix-community/npmlock2nix"; flake = false; };
     license-list-XML = { url = "github:spdx/license-list-XML/main"; flake = false; };
     docutils-0_20_1 = { url = "gitlab:toastal/nixpkgs/docutils-0.20.1"; };
+    soupault-4_7_0 = { url = "github:toastal/nixpkgs/soupault-4.7.0"; };
   };
 
   outputs =


@@ 51,17 52,11 @@
           if final.lib.strings.versionAtLeast prev."${pkg}".version ver
           then final.lib.warn "${pkg} ${ver} overlay can be removed" prev."${pkg}"
           else inputs.docutils-0_20_1.legacyPackages.${prev.system}."${pkg}";
-        soupault-alpha = prev.soupault.overrideAttrs (f: p: {
-          version = "4.7.0-45ec78cd0340853556bef9ab04fd976e1198fc30";
-          configureFlags = (p.configureFlags or [ ]) ++ [ "--enable-flambda" "-flambda" ];
-          src = final.fetchFromGitea {
-            domain = "codeberg.org";
-            owner = "PataphysicalSociety";
-            repo = "soupault";
-            rev = "45ec78cd0340853556bef9ab04fd976e1198fc30";
-            sha256 = "rQ5RV7EA0fIigiXdeTxlqrI3MbpOXlq5l6dMQwj8m28=";
-          };
-        });
+        soupault =
+          let pkg = "soupault"; ver = "4.7.0"; in
+          if final.lib.strings.versionAtLeast prev."${pkg}".version ver
+          then final.lib.warn "${pkg} ${ver} overlay can be removed" prev."${pkg}"
+          else inputs.soupault-4_7_0.legacyPackages.${prev.system}."${pkg}";
         iosevka-univers = final.iosevka.override {
           set = "univers";
           privateBuildPlan = builtins.readFile ./fonts/iosevka-univers.toml;


@@ 157,7 152,7 @@
                   nickel
                   pandoc
                   parallel
-                  soupault-alpha
+                  soupault
                   self.packages.${system}.prismjs-cli
                   tree
                 ];


@@ 448,7 443,7 @@
               nodejs
               scour
               simple-http-server
-              soupault-alpha
+              soupault
               topiary
               self.packages.${system}.prismjs-cli
             ];