Unverified Commit 1ad49ed4 authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

luaPackages.neorg: 9.6 -> 9.6 (#510031)

parents 9f01bdb6 e641e707

maintainers/scripts/luarocks-packages.csv

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ toml-edit,,,,,5.1,mrcjkb 
tree-sitter-cli,,,,,,

tree-sitter-http,,,,0.0.33-1,,

tree-sitter-norg,,,,,5.1,mrcjkb

tree-sitter-norg-meta,,,,,,

tree-sitter-orgmode,,,,,5.1,

utf8,,,,,,

tree-sitter-teal,,,,,,

pkgs/development/lua-modules/generated-packages.nix

+39 −7
Original line number Diff line number Diff line
@@ -4645,19 +4645,20 @@ final: prev: { 
      nui-nvim,

      nvim-nio,

      pathlib-nvim,

      plenary-nvim,

      tree-sitter-norg,

      tree-sitter-norg-meta,

    }:

    buildLuarocksPackage {

      pname = "neorg";

      version = "9.4.0-1";

      version = "9.6.4-1";

      knownRockspec =

        (fetchurl {

          url = "mirror://luarocks/neorg-9.4.0-1.rockspec";

          sha256 = "0gm91iv0a5lpch6n92cnrcbpn525gxl735cgqwlldbrdfjwxv4y2";

          url = "mirror://luarocks/neorg-9.6.4-1.rockspec";

          sha256 = "11k7qwr7430wk3j5kf7isn3d9i4y0drmq6d0dwdx62s4cy9c3pvm";

        }).outPath;

      src = fetchzip {

        url = "https://github.com/nvim-neorg/neorg/archive/d4e6b3665504baa88685c9d2e79446d336dc0594.zip";

        sha256 = "0gjyn9csw3rngnjxq6hyh7zl20ks6ibqvb5kggmkr9qhi3a8kiaj";

        url = "https://github.com/nvim-neorg/neorg/archive/1f14d72aad7165eac307a2a2f6be0fb97a04b3c2.zip";

        sha256 = "0l7hc1w4j00csv8i6dgbdhx0jcf0017b7hhs8gcldvsyka50xkx5";

      };



      disabled = luaOlder "5.1";
@@ -4666,7 +4667,8 @@ final: prev: { 
        nui-nvim

        nvim-nio

        pathlib-nvim

        plenary-nvim

        tree-sitter-norg

        tree-sitter-norg-meta

      ];



      meta = {
@@ -6108,6 +6110,36 @@ final: prev: { 
    }

  ) { };



  tree-sitter-norg-meta = callPackage (

    {

      buildLuarocksPackage,

      fetchurl,

      fetchzip,

      luarocks-build-treesitter-parser,

    }:

    buildLuarocksPackage {

      pname = "tree-sitter-norg-meta";

      version = "0.1.0-1";

      knownRockspec =

        (fetchurl {

          url = "mirror://luarocks/tree-sitter-norg-meta-0.1.0-1.rockspec";

          sha256 = "0vngnyvdad6n36r37sc96asl7h5mph691a0638523mffbg8zdfvr";

        }).outPath;

      src = fetchzip {

        url = "https://github.com/nvim-neorg/tree-sitter-norg-meta/archive/v0.1.0.zip";

        sha256 = "1vz74wc5yy5fykl9c3b16k6fsvskxp93acsy81p337jzg709v97j";

      };



      nativeBuildInputs = [ luarocks-build-treesitter-parser ];



      meta = {

        homepage = "https://github.com/nvim-neorg/tree-sitter-norg-meta";

        license.fullName = "MIT";

        description = "Treesitter parser for Norg's `@document.meta` blocks.";

      };

    }

  ) { };



  tree-sitter-orgmode = callPackage (

    {

      buildLuarocksPackage,

pkgs/development/lua-modules/overrides.nix

+8 −3
Original line number Diff line number Diff line
@@ -889,9 +889,7 @@ in 
    postConfigure = ''

      substituteInPlace ''${rockspecFilename} \

        --replace-fail "'nvim-nio ~> 1.7'," "'nvim-nio >= 1.7'," \

        --replace-fail "'plenary.nvim == 0.1.4'," "'plenary.nvim'," \

        --replace-fail "'nui.nvim == 0.3.0'," "'nui.nvim'," \

        --replace-fail ", 'nvim-treesitter-legacy-api == 0.9.2'" ""

        --replace-fail "'nui.nvim == 0.3.0'," "'nui.nvim',"

    '';

  };
@@ -1252,6 +1250,13 @@ in 
    };

  });



  tree-sitter-norg-meta = prev.tree-sitter-norg-meta.overrideAttrs (old: {

    nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [

      writableTmpDirAsHomeHook

      tree-sitter

    ];

  });



  tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (old: {

    nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [

      writableTmpDirAsHomeHook