~toastal/toastal-website

27a7085c60ee0396a586ed7c0dd7d2c8095e2ed1 — toastal 2 months ago dd9eed0
remove docutils overlay; clean up
2 files changed, 1 insertions(+), 32 deletions(-)

M flake.lock
M flake.nix
M flake.lock => flake.lock +0 -17
@@ 1,21 1,5 @@
{
  "nodes": {
    "docutils-0_20_1": {
      "locked": {
        "lastModified": 1695111005,
        "narHash": "sha256-hwk7AVwRZbTe3sbNgwkNKaIkFU7Vs43PrZPk63WccHk=",
        "owner": "toastal",
        "repo": "nixpkgs",
        "rev": "33e014f99bc6143d55ae0f656a085d403873a730",
        "type": "gitlab"
      },
      "original": {
        "owner": "toastal",
        "ref": "docutils-0.20.1",
        "repo": "nixpkgs",
        "type": "gitlab"
      }
    },
    "license-list-XML": {
      "flake": false,
      "locked": {


@@ 67,7 51,6 @@
    },
    "root": {
      "inputs": {
        "docutils-0_20_1": "docutils-0_20_1",
        "license-list-XML": "license-list-XML",
        "nixpkgs": "nixpkgs",
        "npmlock2nix": "npmlock2nix",

M flake.nix => flake.nix +1 -15
@@ 8,21 8,12 @@

  inputs = {
    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
    #dhall-contribute-json.url = "sourcehut:~toastal/dhall-contribute-json";
    #sourcehut-asciidoc-renderer = { url = "sourcehut:~toastal/sourcehut-asciidoc-renderer"; inputs.nixpkgs.follows = "nixpkgs"; };
    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 =
    { self
    , nixpkgs
      #, dhall-contribute-json
      #, sourcehut-asciidoc-renderer
    , ...
    }@inputs:
  outputs = { self, nixpkgs, ... }@inputs:
    let
      name = "toastal-website";



@@ 47,11 38,6 @@
    in
    {
      overlay = final: prev: rec {
        docutils =
          let pkg = "docutils"; ver = "0.20.1"; in
          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 =
          let pkg = "soupault"; ver = "4.7.0"; in
          if final.lib.strings.versionAtLeast prev."${pkg}".version ver