kookie
/
nomicon
1
0
Fork 0
Code Issues Projects Releases 1 Activity

Merge staging-next into staging

Browse Source
main
github-actions[bot] 2 years ago committed by GitHub
parent fa46b52651 6ccd35f78f
commit 15c142e5c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 653 additions and 510 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      doc/languages-frameworks/vim.section.md
  2. 6
      maintainers/scripts/luarocks-config.lua
  3. 11
      maintainers/scripts/update-luarocks-packages
  4. 8
      nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
  5. 3
      nixos/doc/manual/release-notes/rl-2211.section.md
  6. 1
      nixos/modules/services/databases/openldap.nix
  7. 4
      pkgs/applications/editors/neovim/tests.nix
  8. 602
      pkgs/applications/editors/vim/plugins/generated.nix
  9. 18
      pkgs/applications/editors/vim/plugins/overrides.nix
  10. 8
      pkgs/applications/editors/vim/plugins/vim-plugin-names
  11. 19
      pkgs/applications/editors/vim/plugins/vim-utils.nix
  12. 1
      pkgs/build-support/fetchurl/mirrors.nix
  13. 4
      pkgs/data/misc/spdx-license-list-data/default.nix
  14. 376
      pkgs/development/lua-modules/generated-packages.nix
  15. 30
      pkgs/development/lua-modules/overrides.nix
  16. 4
      pkgs/development/python-modules/pyinsteon/default.nix
  17. 15
      pkgs/development/tools/build-managers/conan/default.nix
  18. 11
      pkgs/development/tools/misc/luarocks/default.nix
  19. 14
      pkgs/development/tools/misc/luarocks/luarocks-nix.nix
  20. 4
      pkgs/development/tools/neil/default.nix
  21. 16
      pkgs/games/rocksndiamonds/default.nix
  22. 5
      pkgs/test/vim/default.nix

3
doc/languages-frameworks/vim.section.md
Unescape View File

@ -277,9 +277,6 @@ my-vim =
copy paste output2 here
];
# Pathogen would be
# vimrcConfig.pathogen.knownPlugins = plugins; # plugins
# vimrcConfig.pathogen.pluginNames = ["tlib"];
};
```

6
maintainers/scripts/luarocks-config.lua
Unescape View File

@ -1,4 +1,8 @@
-- default of luarocks listed at src/luarocks/core/cfg.lua
-- keep this list synced with pkgs/build-support/fetchurl/mirrors.nix
rocks_servers = {
"https://luarocks.org"
"https://luarocks.org",
"https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"
}
version_check_on_fail = false

11
maintainers/scripts/update-luarocks-packages
Unescape View File

@ -31,7 +31,7 @@ from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment
PKG_LIST="maintainers/scripts/luarocks-packages.csv"
TMP_FILE="$(mktemp)"
GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix"
LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"
LUAROCKS_CONFIG="maintainers/scripts/luarocks-config.lua"
HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
Regenerate it with:
@ -158,14 +158,14 @@ def generate_pkg_nix(plug: LuaPlugin):
Our cache key associates "p.name-p.version" to its rockspec
'''
log.debug("Generating nix expression for %s", plug.name)
cmd = [ "luarocks", "nix"]
custom_env = os.environ.copy()
custom_env['LUAROCKS_CONFIG'] = LUAROCKS_CONFIG
cmd = [ "luarocks", "nix"]
if plug.maintainers:
cmd.append(f"--maintainers={plug.maintainers}")
# updates plugin directly from its repository
print("server: [%s]" % plug.server)
# if plug.server == "src":
if plug.src != "":
if plug.src is None:
@ -194,7 +194,8 @@ def generate_pkg_nix(plug: LuaPlugin):
cmd.append(f"--lua-dir={lua_drv_path}/bin")
log.debug("running %s", ' '.join(cmd))
output = subprocess.check_output(cmd, text=True)
output = subprocess.check_output(cmd, env=custom_env, text=True)
output = "callPackage(" + output.strip() + ") {};\n\n"
return (plug, output)

8
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
Unescape View File

@ -121,6 +121,14 @@
this version for the entire lifecycle of the 22.11 release.
</para>
</listitem>
<listitem>
<para>
(Neo)Vim can not be configured with
<literal>configure.pathogen</literal> anymore to reduce
maintainance burden. Use <literal>configure.packages</literal>
instead.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.11-notable-changes">

3
nixos/doc/manual/release-notes/rl-2211.section.md
Unescape View File

@ -50,6 +50,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- PHP 7.4 is no longer supported due to upstream not supporting this
version for the entire lifecycle of the 22.11 release.
- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
Use `configure.packages` instead.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Other Notable Changes {#sec-release-22.11-notable-changes}

1
nixos/modules/services/databases/openldap.nix
Unescape View File

@ -312,6 +312,7 @@ in {
"-h" (lib.concatStringsSep " " cfg.urlList)
]);
Type = "notify";
NotifyAccess = "all";
PIDFile = cfg.settings.attrs.olcPidFile;
};
};

4
pkgs/applications/editors/neovim/tests.nix
Unescape View File

@ -150,8 +150,8 @@ rec {
# and do `:call deoplete#enable()`. It will print an error if the remote
# plugin is not registered.
test_nvim_with_remote_plugin = neovim.override {
extraName = "-pathogen-remote";
configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ];
extraName = "-remote";
configure.packages.foo.start = with vimPlugins; [ deoplete-nvim ];
};
# only neovim makes use of `requiredPlugins`, test this here

602
pkgs/applications/editors/vim/plugins/generated.nix
View File

File diff suppressed because it is too large Load Diff

18
pkgs/applications/editors/vim/plugins/overrides.nix
Unescape View File

@ -20,8 +20,10 @@
, dasht
, direnv
, fzf
, gawk
, gnome
, himalaya
, jq
, khard
, languagetool
, llvmPackages
@ -300,6 +302,18 @@ self: super: {
'';
});
fzf-hoogle-vim = super.fzf-hoogle-vim.overrideAttrs (old: {
# add this to your lua config to prevent the plugin from trying to write in the
# nix store:
# vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json'
propagatedBuildInputs = [
jq
gawk
];
dependencies = with self; [ fzf-vim ];
});
fzf-lua = super.fzf-lua.overrideAttrs (old: {
propagatedBuildInputs = [ fzf ];
});
@ -845,7 +859,7 @@ self: super: {
let
maple-bin = rustPlatform.buildRustPackage {
name = "maple";
src = old.src;
inherit (old) src;
nativeBuildInputs = [
pkg-config
@ -860,7 +874,7 @@ self: super: {
libiconv
];
cargoSha256 = "0l1x7kprnxa95pbf8ml9ixmj0cmbnnv6nd0v6qry8j67rx8plpmp";
cargoSha256 = "sha256-XmQTRmOO/tyA0F6FQQRxZPcVXCYZkEAiNIzU/ismjc0=";
};
in
''

8
pkgs/applications/editors/vim/plugins/vim-plugin-names
Unescape View File

@ -41,6 +41,7 @@ https://github.com/vim-scripts/a.vim/,,
https://github.com/mileszs/ack.vim/,,
https://github.com/eikenb/acp/,,
https://github.com/stevearc/aerial.nvim/,,
https://github.com/Numkil/ag.nvim/,,
https://github.com/derekelkins/agda-vim/,,
https://github.com/slashmili/alchemist.vim/,,
https://github.com/dense-analysis/ale/,,
@ -223,6 +224,7 @@ https://github.com/shumphrey/fugitive-gitlab.vim/,,
https://github.com/BeneCollyridam/futhark-vim/,,
https://github.com/rktjmp/fwatch.nvim/,,
https://github.com/stsewd/fzf-checkout.vim/,,
https://github.com/monkoose/fzf-hoogle.vim/,HEAD,
https://github.com/gfanto/fzf-lsp.nvim/,,
https://github.com/ibhagwan/fzf-lua/,HEAD,
https://github.com/junegunn/fzf.vim/,,
@ -321,6 +323,7 @@ https://github.com/nvim-lua/lsp-status.nvim/,,
https://github.com/nvim-lua/lsp_extensions.nvim/,,
https://git.sr.ht/~whynothugo/lsp_lines.nvim,,
https://github.com/ray-x/lsp_signature.nvim/,,
https://github.com/lspcontainers/lspcontainers.nvim/,,
https://github.com/onsails/lspkind-nvim/,,
https://github.com/tami5/lspsaga.nvim/,,
https://github.com/folke/lua-dev.nvim/,,
@ -428,12 +431,14 @@ https://github.com/kevinhwang91/nvim-hlslens/,,
https://github.com/neovimhaskell/nvim-hs.vim/,,
https://github.com/mfussenegger/nvim-jdtls/,,
https://github.com/gennaro-tedesco/nvim-jqx/,,
https://github.com/ethanholz/nvim-lastplace/,HEAD,
https://github.com/kosayoda/nvim-lightbulb/,,
https://github.com/josa42/nvim-lightline-lsp/,,
https://github.com/mfussenegger/nvim-lint/,,
https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
https://github.com/neovim/nvim-lspconfig/,,
https://github.com/RishabhRD/nvim-lsputils/,,
https://github.com/rafcamlet/nvim-luapad/,,
https://github.com/scalameta/nvim-metals/,,
https://github.com/AckslD/nvim-neoclip.lua/,,
https://github.com/yamatsum/nvim-nonicons/,,
@ -518,6 +523,7 @@ https://github.com/rust-lang/rust.vim/,,
https://github.com/hauleth/sad.vim/,,
https://github.com/vmware-archive/salt-vim/,,
https://github.com/Xuyuanp/scrollbar.nvim/,,
https://github.com/cakebaker/scss-syntax.vim/,,
https://github.com/RobertAudi/securemodelines/,,
https://github.com/megaannum/self/,,
https://github.com/jaxbot/semantic-highlight.vim/,,
@ -538,6 +544,7 @@ https://github.com/ctjhoa/spacevim/,,
https://github.com/chrisgeo/sparkup/,,
https://github.com/edluffy/specs.nvim/,,
https://github.com/lewis6991/spellsitter.nvim/,HEAD,
https://github.com/stsewd/sphinx.nvim/,,
https://github.com/sjl/splice.vim/,,
https://github.com/vimlab/split-term.vim/,,
https://github.com/AndrewRadev/splitjoin.vim/,,
@ -552,6 +559,7 @@ https://github.com/lambdalisue/suda.vim/,,
https://github.com/ervandew/supertab/,,
https://github.com/ur4ltz/surround.nvim/,,
https://github.com/peterbjorgensen/sved/,,
https://github.com/jamespeapen/swayconfig.vim/,,
https://github.com/keith/swift.vim/,,
https://github.com/AndrewRadev/switch.vim/,,
https://github.com/simrat39/symbols-outline.nvim/,,

19
pkgs/applications/editors/vim/plugins/vim-utils.nix
Unescape View File

@ -51,9 +51,6 @@ vim-with-plugins in PATH:
# full documentation at github.com/MarcWeber/vim-addon-manager
];
# there is a pathogen implementation as well, but its startup is slower and [VAM] has more feature
# vimrcConfig.pathogen.knownPlugins = vimPlugins; # optional
# vimrcConfig.pathogen.pluginNames = ["vim-addon-nix"];
};
WHAT IS A VIM PLUGIN?
@ -103,7 +100,7 @@ It might happen than a plugin is not known by vim-pi yet. We encourage you to
contribute to vim-pi so that plugins can be updated automatically.
CREATING DERVITATIONS AUTOMATICALLY BY PLUGIN NAME
CREATING DERIVATIONS AUTOMATICALLY BY PLUGIN NAME
==================================================
Most convenient is to use a ~/.vim-scripts file putting a plugin name into each line
as documented by [VAM]'s README.md
@ -277,24 +274,18 @@ let
}:
let
/* pathogen mostly can set &rtp at startup time. Its used very commonly.
/* pathogen mostly can set &rtp at startup time. Deprecated.
*/
pathogenImpl = let
knownPlugins = pathogen.knownPlugins or vimPlugins;
plugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames);
pluginsEnv = buildEnv {
name = "pathogen-plugin-env";
paths = map (x: "${x}/${rtpPath}") plugins;
pathogenPackages.pathogen = lib.warn "'pathogen' attribute is deprecated. Use 'packages' instead in your vim configuration" {
start = plugins;
};
in
''
let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.vim-pathogen.rtp}"
execute pathogen#infect('${pluginsEnv}/{}')
filetype indent plugin on | syn on
'';
nativeImpl pathogenPackages;
/* vim-plug is an extremely popular vim plugin manager.
*/

1
pkgs/build-support/fetchurl/mirrors.nix
Unescape View File

@ -323,7 +323,6 @@
"https://luarocks.org/"
"https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"
"https://luafr.org/moonrocks/"
"http://luarocks.logiceditor.com/rocks/"
];
# Python PyPI

4
pkgs/data/misc/spdx-license-list-data/default.nix
Unescape View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "spdx-license-list-data";
version = "3.16";
version = "3.17";
src = fetchFromGitHub {
owner = "spdx";
repo = "license-list-data";
rev = "v${version}";
hash = "sha256-FPN9EIwXtz0b1tUZ/AOWK2zj2nfd5+POGmRC52mSzcA=";
hash = "sha256-wptjEdx1N2HMzeSVsztZ93Bu6OkMAgHGTUfMLYiePZY=";
};
# List of file formats to package.

376
pkgs/development/lua-modules/generated-packages.nix
Unescape View File

@ -15,7 +15,7 @@ buildLuarocksPackage {
pname = "alt-getopt";
version = "0.8.0-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/alt-getopt-0.8.0-1.rockspec";
url = "mirror://luarocks/alt-getopt-0.8.0-1.rockspec";
sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -125,7 +125,7 @@ buildLuarocksPackage {
pname = "bit32";
version = "5.3.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/bit32-5.3.0-1.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/bit32-5.3.0-1.rockspec";
sha256 = "1d6xdihpksrj5a3yvsvnmf3vfk15hj6f8n1rrs65m7adh87hc0yd";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -159,7 +159,7 @@ buildLuarocksPackage {
pname = "busted";
version = "2.0.0-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/busted-2.0.0-1.rockspec";
url = "mirror://luarocks/busted-2.0.0-1.rockspec";
sha256 = "0cbw95bjxl667n9apcgng2kr5hq6bc7gp3vryw4dzixmfabxkcbw";
}).outPath;
src = fetchurl {
@ -184,7 +184,7 @@ buildLuarocksPackage {
pname = "cassowary";
version = "2.3.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/cassowary-2.3.2-1.rockspec";
url = "mirror://luarocks/cassowary-2.3.2-1.rockspec";
sha256 = "0c6sflm8zpgbcdj47s3rd34h69h3nqcciaaqd1wdx5m0lwc3mii0";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -218,7 +218,7 @@ buildLuarocksPackage {
pname = "cldr";
version = "0.2.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/cldr-0.2.0-0.rockspec";
url = "mirror://luarocks/cldr-0.2.0-0.rockspec";
sha256 = "1vjwrlrdy10bacn0324fvs4sx85xryyg7npw2mp1k9kmasfr8r1s";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -252,7 +252,7 @@ buildLuarocksPackage {
pname = "compat53";
version = "0.7-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/compat53-0.7-1.rockspec";
url = "mirror://luarocks/compat53-0.7-1.rockspec";
sha256 = "1r7a3q1cjrcmdycrv2ikgl83irjhxs53sa88v2fdpr9aaamlb101";
}).outPath;
src = fetchurl {
@ -278,7 +278,7 @@ buildLuarocksPackage {
pname = "cosmo";
version = "16.06.04-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cosmo-16.06.04-1.rockspec";
url = "mirror://luarocks/cosmo-16.06.04-1.rockspec";
sha256 = "0ipv1hrlhvaz1myz6qxabq7b7kb3bz456cya3r292487a3g9h9pb";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -310,7 +310,7 @@ buildLuarocksPackage {
pname = "coxpcall";
version = "1.17.0-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/coxpcall-1.17.0-1.rockspec";
url = "mirror://luarocks/coxpcall-1.17.0-1.rockspec";
sha256 = "0mf0nggg4ajahy5y1q5zh2zx9rmgzw06572bxx6k8b736b8j7gca";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -341,7 +341,7 @@ buildLuarocksPackage {
pname = "cqueues";
version = "20200726.52-0";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cqueues-20200726.52-0.rockspec";
url = "mirror://luarocks/cqueues-20200726.52-0.rockspec";
sha256 = "0w2kq9w0wda56k02rjmvmzccz6bc3mn70s9v7npjadh85i5zlhhp";
}).outPath;
src = fetchurl {
@ -399,10 +399,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/astoff/digestif",
"rev": "505ca88a54012be5534654238baaa457f8446fed",
"date": "2021-10-06T21:27:45+02:00",
"path": "/nix/store/6wvpy0nsr5yf78by3dg8m2m0h0kf9xk4-digestif",
"sha256": "1prv5nqskvilyyx3z9b2jiz72lwpz2xcas57qjpbv6qq5l2si1xm",
"rev": "1fac471a153b99da7f858e63edfa19ec2afee791",
"date": "2022-03-13T17:25:22+01:00",
"path": "/nix/store/4fxlwjvv07gbdi094abl59h8j5ly4ghm-digestif",
"sha256": "1mlmn3v97il5jsl28hjjgvm0dix5r6rsrdzavq25pbv0c46b3zzf",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -425,14 +425,14 @@ dkjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "dkjson";
version = "2.5-3";
version = "2.6-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/dkjson-2.5-3.rockspec";
sha256 = "18xngdzl2q207cil64aj81qi6qvj1g269pf07j5x4pbvamd6a1l3";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/dkjson-2.6-1.rockspec";
sha256 = "1hhmgz2nixqg23shfnl0kq6wxdadx36z6hhsrz33g7idbm6rbwm1";
}).outPath;
src = fetchurl {
url = "http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.5.tar.gz?uuid=release_2_5";
sha256 = "14wanday1l7wj2lnpabbxw8rcsa0zbvcdi1w88rdr5gbsq3xwasm";
url = "http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.6.tar.gz?uuid=release_2_6";
sha256 = "0wwpdz20fvg5j36902892mnb99craf22697r6v7xdblqnd7fw1xx";
};
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
@ -452,7 +452,7 @@ buildLuarocksPackage {
pname = "fifo";
version = "0.2-0";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/fifo-0.2-0.rockspec";
url = "mirror://luarocks/fifo-0.2-0.rockspec";
sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq";
}).outPath;
src = fetchurl {
@ -476,7 +476,7 @@ buildLuarocksPackage {
pname = "fluent";
version = "0.2.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/fluent-0.2.0-0.rockspec";
url = "mirror://luarocks/fluent-0.2.0-0.rockspec";
sha256 = "1x3nk8xdf923rvdijr0jx8v6w3wxxfch7ri3kxca0pw80b5bc2fa";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -504,7 +504,7 @@ buildLuarocksPackage {
}) {};
gitsigns-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua, plenary-nvim
, fetchgit, lua
}:
buildLuarocksPackage {
pname = "gitsigns.nvim";
@ -512,10 +512,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lewis6991/gitsigns.nvim",
"rev": "5eb87a0b05914d3763277ebe257bd5bafcdde8cd",
"date": "2021-12-06T18:02:22+00:00",
"path": "/nix/store/c5l5bz7m5f48l57p4yrpxfhqga0cxsny-gitsigns.nvim",
"sha256": "02cmgc3fgrwx6v6ylzqxdwgk9jsmd8j2q6fdnfbllg3zjwx3agcd",
"rev": "27aeb2e715c32cbb99aa0b326b31739464b61644",
"date": "2022-05-26T12:55:53+01:00",
"path": "/nix/store/bfz0bk523dk4dciiknrzvp87yvnbgcb2-gitsigns.nvim",
"sha256": "04m1767cndrx46xsa6frf77xv64hmr6w21dk2wh4s0sqjvqqm1r6",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -524,7 +524,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaversion != "5.1");
propagatedBuildInputs = [ lua plenary-nvim ];
propagatedBuildInputs = [ lua ];
meta = {
homepage = "http://github.com/lewis6991/gitsigns.nvim";
@ -540,7 +540,7 @@ buildLuarocksPackage {
pname = "http";
version = "0.3-0";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/http-0.3-0.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/http-0.3-0.rockspec";
sha256 = "0fn3irkf5nnmfc83alc40b316hs8l7zdq2xlaiaa65sjd8acfvia";
}).outPath;
src = fetchurl {
@ -564,14 +564,14 @@ inspect = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "inspect";
version = "3.1.2-0";
version = "3.1.3-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/inspect-3.1.2-0.rockspec";
sha256 = "13jbv3rhj4mv2farrxns88g7j34ljag7vz0kma0fm2pzdz3686vx";
url = "mirror://luarocks/inspect-3.1.3-0.rockspec";
sha256 = "1iivb2jmz0pacmac2msyqwvjjx8q6py4h959m8fkigia6srg5ins";
}).outPath;
src = fetchurl {
url = "https://github.com/kikito/inspect.lua/archive/v3.1.2.tar.gz";
sha256 = "08ln4p5bmvcs8wj8hzs4ny66m63abyxjkmcxhjji5ay99g85cn3b";
url = "https://github.com/kikito/inspect.lua/archive/v3.1.3.tar.gz";
sha256 = "1sqylz5hmj5sbv4gi9988j6av3cb5lwkd7wiyim1h5lr7xhnlf23";
};
disabled = with lua; (luaOlder "5.1");
@ -626,10 +626,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/stevedonovan/LDoc.git",
"rev": "bbd498ab39fa49318b36378430d3cdab571f8ba0",
"date": "2021-06-24T13:07:51+02:00",
"path": "/nix/store/pzk1qi4fdviz2pq5bg3q91jmrg8wziqx-LDoc",
"sha256": "05wd5m5v3gv777kgikj46216slxyf1zdbzl4idara9lcfw3mfyyw",
"rev": "e97398356b27473e5ba0626427daaec54f407e22",
"date": "2022-01-17T13:53:47+03:00",
"path": "/nix/store/6s0dmcz2jgjhjhakr5miq8ffgkchd0wh-LDoc",
"sha256": "13k4vi12s37izsjqcnfcliwlizr1ic0vwb0zlxcsghi31k031him",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -673,7 +673,7 @@ buildLuarocksPackage {
propagatedBuildInputs = [ lua ];
meta = {
homepage = "https://github.com/pavouk/lgi";
homepage = "http://github.com/pavouk/lgi";
description = "Lua bindings to GObject libraries";
license.fullName = "MIT/X11";
};
@ -708,7 +708,7 @@ buildLuarocksPackage {
pname = "ljsyscall";
version = "0.12-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/ljsyscall-0.12-1.rockspec";
url = "mirror://luarocks/ljsyscall-0.12-1.rockspec";
sha256 = "0zna5s852vn7q414z56kkyqwpighaghyq7h7in3myap4d9vcgm01";
}).outPath;
src = fetchurl {
@ -734,7 +734,7 @@ buildLuarocksPackage {
pname = "lmathx";
version = "20150624-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lmathx-20150624-1.rockspec";
url = "mirror://luarocks/lmathx-20150624-1.rockspec";
sha256 = "181wzsj1mxjyia43y8zwaydxahnl7a70qzcgc8jhhgic7jyi9pgv";
}).outPath;
src = fetchurl {
@ -759,7 +759,7 @@ buildLuarocksPackage {
pname = "lmpfrlib";
version = "20170112-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lmpfrlib-20170112-2.rockspec";
url = "mirror://luarocks/lmpfrlib-20170112-2.rockspec";
sha256 = "1x7qiwmk5b9fi87fn7yvivdsis8h9fk9r3ipqiry5ahx72vzdm7d";
}).outPath;
src = fetchurl {
@ -785,7 +785,7 @@ buildLuarocksPackage {
pname = "loadkit";
version = "1.1.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/loadkit-1.1.0-1.rockspec";
url = "mirror://luarocks/loadkit-1.1.0-1.rockspec";
sha256 = "08fx0xh90r2zvjlfjkyrnw2p95xk1a0qgvlnq4siwdb2mm6fq12l";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -819,7 +819,7 @@ buildLuarocksPackage {
pname = "lpeg";
version = "1.0.2-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lpeg-1.0.2-1.rockspec";
url = "mirror://luarocks/lpeg-1.0.2-1.rockspec";
sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89";
}).outPath;
src = fetchurl {
@ -845,7 +845,7 @@ buildLuarocksPackage {
pname = "lpeg_patterns";
version = "0.5-0";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lpeg_patterns-0.5-0.rockspec";
url = "mirror://luarocks/lpeg_patterns-0.5-0.rockspec";
sha256 = "1vzl3ryryc624mchclzsfl3hsrprb9q214zbi1xsjcc4ckq5qfh7";
}).outPath;
src = fetchurl {
@ -869,7 +869,7 @@ buildLuarocksPackage {
pname = "lpeglabel";
version = "1.6.0-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lpeglabel-1.6.0-1.rockspec";
url = "mirror://luarocks/lpeglabel-1.6.0-1.rockspec";
sha256 = "13gc32pggng6f95xx5zw9n9ian518wlgb26mna9kh4q2xa1k42pm";
}).outPath;
src = fetchurl {
@ -894,7 +894,7 @@ buildLuarocksPackage {
pname = "lpty";
version = "1.2.2-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.rockspec";
url = "mirror://luarocks/lpty-1.2.2-1.rockspec";
sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg";
}).outPath;
src = fetchurl {
@ -919,7 +919,7 @@ buildLuarocksPackage {
pname = "lrexlib-gnu";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lrexlib-gnu-2.9.1-1.rockspec";
url = "mirror://luarocks/lrexlib-gnu-2.9.1-1.rockspec";
sha256 = "1jfjxh26iwsavipkwmscwv52l77qxzvibfmlvpskcpawyii7xcw8";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -952,7 +952,7 @@ buildLuarocksPackage {
pname = "lrexlib-pcre";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lrexlib-pcre-2.9.1-1.rockspec";
url = "mirror://luarocks/lrexlib-pcre-2.9.1-1.rockspec";
sha256 = "036k27xaplxn128b3p67xiqm8k40s7bxvh87wc8v2cx1cc4b9ia4";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -986,7 +986,7 @@ buildLuarocksPackage {
pname = "lrexlib-posix";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lrexlib-posix-2.9.1-1.rockspec";
url = "mirror://luarocks/lrexlib-posix-2.9.1-1.rockspec";
sha256 = "1zxrx9yifm9ry4wbjgv86rlvq3ff6qivldvib3ha4767azla0j0r";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1019,7 +1019,7 @@ buildLuarocksPackage {
pname = "lua-cjson";
version = "2.1.0.6-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-cjson-2.1.0.6-1.rockspec";
url = "mirror://luarocks/lua-cjson-2.1.0.6-1.rockspec";
sha256 = "1x6dk17lwmgkafpki99yl1hlypchbrxr9sxqafrmx7wwvzbz6q11";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1052,7 +1052,7 @@ buildLuarocksPackage {
pname = "lua-cmsgpack";
version = "0.4.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec";
url = "mirror://luarocks/lua-cmsgpack-0.4.0-0.rockspec";
sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1085,7 +1085,7 @@ buildLuarocksPackage {
pname = "lua-iconv";
version = "7-3";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-iconv-7-3.rockspec";
url = "mirror://luarocks/lua-iconv-7-3.rockspec";
sha256 = "0qh5vsaxd7s31p7a8rl08lwd6zv90wnvp15nll4fcz452kffpp72";
}).outPath;
src = fetchurl {
@ -1110,7 +1110,7 @@ buildLuarocksPackage {
pname = "lua-lsp";
version = "0.1.0-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-lsp-0.1.0-2.rockspec";
url = "mirror://luarocks/lua-lsp-0.1.0-2.rockspec";
sha256 = "19jsz00qlgbyims6cg8i40la7v8kr7zsxrrr3dg0kdg0i36xqs6c";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1143,7 +1143,7 @@ buildLuarocksPackage {
pname = "lua-messagepack";
version = "0.5.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-messagepack-0.5.2-1.rockspec";
url = "mirror://luarocks/lua-messagepack-0.5.2-1.rockspec";
sha256 = "15liz6v8hsqgb3xrcd74a71nnjcz79gpc3ak351hk6k4gyjq2rfc";
}).outPath;
src = fetchurl {
@ -1166,17 +1166,17 @@ lua-resty-http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lua-resty-http";
version = "0.16.1-0";
version = "0.17.0.beta.1-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-http-0.16.1-0.rockspec";
sha256 = "1475zncd9zvnrblc3r60cwf49c7v0w3khqmi6wqrc5k331m0wm8w";
url = "mirror://luarocks/lua-resty-http-0.17.0.beta.1-0.rockspec";
sha256 = "1cjl007k43cyrwvj0p58hvp00q4lnd9rq3v3pcvwi5an2pvxnv80";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/ledgetech/lua-resty-http",
"rev": "9bf951dfe162dd9710a0e1f4525738d4902e9d20",
"date": "2021-04-09T17:11:35+01:00",
"path": "/nix/store/zzd1xj4r0iy3srs2hgv4mlm6wflmk24x-lua-resty-http",
"sha256": "1whwn2fwm8c9jda4z1sb5636sfy4pfgjdxw0grcgmf6451xi57nw",
"rev": "8cb73c4cc2118f0c62d9132e3b3b14aa36192e34",
"date": "2022-02-11T16:44:50+00:00",
"path": "/nix/store/29kr6whllphz0nla5nh1f8q30dgp9vnz-lua-resty-http",
"sha256": "0y253dnnx59a5c1nbkcv1p5kq7kdsd5i094i7wzpg5ar6xwvqhjb",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1201,7 +1201,7 @@ buildLuarocksPackage {
pname = "lua-resty-jwt";
version = "0.2.3-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-jwt-0.2.3-0.rockspec";
url = "mirror://luarocks/lua-resty-jwt-0.2.3-0.rockspec";
sha256 = "1fxdwfr4pna3fdfm85kin97n53caq73h807wjb59wpqiynbqzc8c";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1232,17 +1232,17 @@ lua-resty-openidc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lua-resty-openidc";
version = "1.7.4-1";
version = "1.7.5-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-openidc-1.7.4-1.rockspec";
sha256 = "12r03pzx1lpaxzy71iqh0kf1zs6gx1k89vpxc5va9r7nr47a56vy";
url = "mirror://luarocks/lua-resty-openidc-1.7.5-1.rockspec";
sha256 = "14z69c0v35hmhlqvg7kndagpqxa4j7i3cgkm0iyfradqlvgamab4";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/zmartzone/lua-resty-openidc",
"rev": "0c75741b41bc9a8b5dbe0b27f81a2851a6c68b60",
"date": "2020-11-17T17:42:16+01:00",
"path": "/nix/store/240kss5xx1br5n3qz6djw21cs1fj4pfg-lua-resty-openidc",
"sha256": "1gw71av1r0c6v4f1h0bj0l6way2hmipic6wmipnavr17bz7m1q7z",
"rev": "85e30a13e08156ef3d782ecf7236758334234c6c",
"date": "2021-12-21T16:23:45+01:00",
"path": "/nix/store/yr827kcbbrvxpymny5sa43sb1wf0vzqj-lua-resty-openidc",
"sha256": "111mnnl639mnyig105zp5bfynjsdnvs201wpg68zd218bh5f362l",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1264,17 +1264,17 @@ lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit}:
buildLuarocksPackage {
pname = "lua-resty-openssl";
version = "0.8.2-1";
version = "0.8.8-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-openssl-0.8.2-1.rockspec";
sha256 = "1dxaxh3l4vhrv5p2pwphl7jn7jpcjq3dmawfl9wbp3a88121gbsx";
url = "mirror://luarocks/lua-resty-openssl-0.8.8-1.rockspec";
sha256 = "17arjjhrxs3sas6d65ffh8nmvb220vrhwiwac3qam42im7zc8544";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/fffonion/lua-resty-openssl.git",
"rev": "53e2d4ba7e8c31181c1fd71d3817911da0533675",
"date": "2021-11-22T12:07:07+08:00",
"path": "/nix/store/x7s51wf9ysxs2xs4adixf7ypmadfwp5c-lua-resty-openssl",
"sha256": "19cvqz81d0lxql55pgsbgynval0jxh8sicps94nzapvj90xqjviy",
"rev": "7aad15a46bf9f5b81809be53f86ebbdb20ee2e8d",
"date": "2022-04-14T19:05:18+08:00",
"path": "/nix/store/3a8qz63k5xmkx44djm3prwhmig8wmjnf-lua-resty-openssl",
"sha256": "07h1sbfp9l04hr8h6zfgbhs9ray26gr3pa149733wzbdxfkl3bcz",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1295,17 +1295,17 @@ lua-resty-session = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lua-resty-session";
version = "3.8-1";
version = "3.10-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-session-3.8-1.rockspec";
sha256 = "0pz86bshawysmsnfc5q1yh13gr1458j2nh8r93a4rrmk1wggc4ka";
url = "mirror://luarocks/lua-resty-session-3.10-1.rockspec";
sha256 = "1a939ndnyqdn633dxv9nsfkgj59ig71822syx9qk0ai3v6426mw3";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/bungle/lua-resty-session.git",
"rev": "2cd1f8484fdd429505ac33abf7a44adda1f367bf",
"date": "2021-01-04T14:02:41+02:00",
"path": "/nix/store/jqc8arr46mx1xbmrsw503zza1kmz7mcv-lua-resty-session",
"sha256": "09q8xbxkr431i2k21vdyx740rv325v0zmnx0qa3q9x15kcfsd2fm",
"rev": "e6bf2630c90df7b3db35e859f0aa7e096af3e918",
"date": "2022-01-14T20:16:34+02:00",
"path": "/nix/store/76fxliqmhghj6r5qg5q2r59n6nzapra5-lua-resty-session",
"sha256": "1lx0pbb5swyl0fhxycqx0fs3r158rczb78fav02wlz43yc3nbfax",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1329,7 +1329,7 @@ buildLuarocksPackage {
pname = "lua-term";
version = "0.7-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-term-0.7-1.rockspec";
url = "mirror://luarocks/lua-term-0.7-1.rockspec";
sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2";
}).outPath;
src = fetchurl {
@ -1352,7 +1352,7 @@ buildLuarocksPackage {
pname = "lua-toml";
version = "2.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-toml-2.0-1.rockspec";
url = "mirror://luarocks/lua-toml-2.0-1.rockspec";
sha256 = "0zd3hrj1ifq89rjby3yn9y96vk20ablljvqdap981navzlbb7zvq";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1385,7 +1385,7 @@ buildLuarocksPackage {
pname = "lua-yajl";
version = "2.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-yajl-2.0-1.rockspec";
url = "mirror://luarocks/lua-yajl-2.0-1.rockspec";
sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1417,10 +1417,10 @@ lua-zlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lua-zlib";
version = "1.2-1";
version = "1.2-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-zlib-1.2-1.rockspec";
sha256 = "18rpbg9b4vsnh3svapiqrvwwshw1abb5l5fd7441byx1nm3fjq9w";
url = "mirror://luarocks/lua-zlib-1.2-2.rockspec";
sha256 = "1ycjy59w6rkhasqqbiyra0f1sj87fswcz25zwxy4gyv7rrwy5hxd";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/brimworks/lua-zlib.git",
@ -1435,7 +1435,7 @@ buildLuarocksPackage {
}
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
meta = {
@ -1503,17 +1503,17 @@ luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "luacheck";
version = "0.25.0-1";
version = "0.26.1-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luacheck-0.25.0-1.rockspec";
sha256 = "11mvbpnykibg0dx9sdh5x9gpvrhkmvrw76qvjz337x83f8gmvy91";
url = "mirror://luarocks/luacheck-0.26.1-1.rockspec";
sha256 = "11r5g6xi1s2d7cpmz2fysfgi78wpszy58rxfkwikqpi6kyc8qmf5";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/luarocks/luacheck.git",
"rev": "abf7386a892df4ce566fef9e4640ddbf9af78411",
"date": "2021-08-10T12:19:20-03:00",
"path": "/nix/store/9cdlf6c3y0087qwh48ky8ysxxx3lirlj-luacheck",
"sha256": "1ymfkr0qmg6idrrxf9x6mfq14skag8h09kl2qlalwiykicrdljs1",
"url": "https://github.com/lunarmodules/luacheck.git",
"rev": "2445a9dd3859655646bd6eb848459f2b46b4a3e3",
"date": "2022-04-23T17:22:03+03:00",
"path": "/nix/store/7a8qrmy41bnn1wgs93b5gi48k30v5bfj-luacheck",
"sha256": "0zrcni7p0bpqmb383608kmfyxwfxs9qa42g3sb4lhvzg2zggri5q",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1525,7 +1525,7 @@ buildLuarocksPackage {
propagatedBuildInputs = [ lua argparse luafilesystem ];
meta = {
homepage = "https://github.com/luarocks/luacheck";
homepage = "https://github.com/lunarmodules/luacheck";
description = "A static analyzer and a linter for Lua";
license.fullName = "MIT";
};
@ -1538,7 +1538,7 @@ buildLuarocksPackage {
pname = "luacov";
version = "0.15.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luacov-0.15.0-1.rockspec";
url = "mirror://luarocks/luacov-0.15.0-1.rockspec";
sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1571,7 +1571,7 @@ buildLuarocksPackage {
pname = "luadbi";
version = "0.7.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luadbi-0.7.2-1.rockspec";
url = "mirror://luarocks/luadbi-0.7.2-1.rockspec";
sha256 = "0lj1qki20w6bl76cvlcazlmwh170b9wkv5nwlxbrr3cn6w7h370b";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1604,7 +1604,7 @@ buildLuarocksPackage {
pname = "luadbi-mysql";
version = "0.7.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luadbi-mysql-0.7.2-1.rockspec";
url = "mirror://luarocks/luadbi-mysql-0.7.2-1.rockspec";
sha256 = "0gnyqnvcfif06rzzrdw6w6hchp4jrjiwm0rmfx2r8ljchj2bvml5";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1637,7 +1637,7 @@ buildLuarocksPackage {
pname = "luadbi-postgresql";
version = "0.7.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.rockspec";
url = "mirror://luarocks/luadbi-postgresql-0.7.2-1.rockspec";
sha256 = "07rx4agw4hjyzf8157apdwfqh9s26nqndmkr3wm7v09ygjvdjiix";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1670,7 +1670,7 @@ buildLuarocksPackage {
pname = "luadbi-sqlite3";
version = "0.7.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luadbi-sqlite3-0.7.2-1.rockspec";
url = "mirror://luarocks/luadbi-sqlite3-0.7.2-1.rockspec";
sha256 = "022iba0jbiafz8iv1h0iv95rhcivbfq5yg341nxk3dm87yf220vh";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1703,7 +1703,7 @@ buildLuarocksPackage {
pname = "luaepnf";
version = "0.3-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaepnf-0.3-2.rockspec";
url = "mirror://luarocks/luaepnf-0.3-2.rockspec";
sha256 = "0kqmnj11wmfpc9mz04zzq8ab4mnbkrhcgc525wrq6pgl3p5li8aa";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1736,7 +1736,7 @@ buildLuarocksPackage {
pname = "luaevent";
version = "0.4.6-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaevent-0.4.6-1.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaevent-0.4.6-1.rockspec";
sha256 = "03zixadhx4a7nh67n0sm6sy97c8i9va1a78hibhrl7cfbqc2zc7f";
}).outPath;
src = fetchurl {
@ -1761,7 +1761,7 @@ buildLuarocksPackage {
pname = "luaexpat";
version = "1.4.1-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaexpat-1.4.1-1.rockspec";
url = "mirror://luarocks/luaexpat-1.4.1-1.rockspec";
sha256 = "1abwd385x7wnza7qqz5s4aj6m2l1c23pjmbgnpq73q0s17pn1h0c";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1828,7 +1828,7 @@ buildLuarocksPackage {
pname = "luafilesystem";
version = "1.7.0-2";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luafilesystem-1.7.0-2.rockspec";
url = "mirror://luarocks/luafilesystem-1.7.0-2.rockspec";
sha256 = "0xivgn8bbkx1g5a30jrjcv4hg5mpiiyrm3fhlz9lndgbh4cnjrq6";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1862,7 +1862,7 @@ buildLuarocksPackage {
pname = "lualogging";
version = "1.6.0-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lualogging-1.6.0-2.rockspec";
url = "mirror://luarocks/lualogging-1.6.0-2.rockspec";
sha256 = "1235sfss0gmcw744rnhzfffhd1z732g2b2vsbpbz9kcvvhznmamb";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1894,7 +1894,7 @@ buildLuarocksPackage {
pname = "luaossl";
version = "20200709-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaossl-20200709-0.rockspec";
url = "mirror://luarocks/luaossl-20200709-0.rockspec";
sha256 = "0izxxrzc49q4jancza43b2y4hfvasflpcag771nrhapk1n8k45f3";
}).outPath;
src = fetchurl {
@ -1918,7 +1918,7 @@ buildLuarocksPackage {
pname = "luaposix";
version = "34.1.1-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaposix-34.1.1-1.rockspec";
url = "mirror://luarocks/luaposix-34.1.1-1.rockspec";
sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz";
}).outPath;
src = fetchurl {
@ -1942,14 +1942,14 @@ luarepl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "luarepl";
version = "0.9-1";
version = "0.10-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luarepl-0.9-1.rockspec";
sha256 = "1409lanxv4s8kq5rrh46dvld77ip33qzfn3vac3i9zpzbmgb5i8z";
url = "mirror://luarocks/luarepl-0.10-1.rockspec";
sha256 = "12zdljfs4wg55mj7a38iwg7p5i1pmc934v9qlpi61sw4brp6x8d3";
}).outPath;
src = fetchurl {
url = "https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz";
sha256 = "04xka7b84d9mrz3gyf8ywhw08xp65v8jrnzs8ry8k9540aqs721w";
url = "https://github.com/hoelzro/lua-repl/archive/0.10.tar.gz";
sha256 = "0wv37h9w6y5pgr39m7yxbf8imkwvaila6rnwjcp0xsxl5c1rzfjm";
};
disabled = with lua; (luaOlder "5.1");
@ -1967,17 +1967,17 @@ luasec = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "luasec";
version = "1.0.2-1";
version = "1.1.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luasec-1.0.2-1.rockspec";
sha256 = "02qkbfnvn3943zf2fnz3amnz1z05ipx9mnsn3i2rmpjpvvd414dg";
url = "mirror://luarocks/luasec-1.1.0-1.rockspec";
sha256 = "1j080wx40cfxfmb42w6jf06yp2wqfnlf281lda6i7lwh4rh2800m";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/brunoos/luasec",
"rev": "ef14b27a2c8e541cac071165048250e85a7216df",
"date": "2021-08-14T10:28:09-03:00",
"path": "/nix/store/jk2npg54asnmj5fnpldn8dxym9gx8x4g-luasec",
"sha256": "14hx72qw3gjgz12v5bwpz3irgbf69f8584z8y7lglccbyydp4jla",
"rev": "df27c62f4cea33cb3525fed2a4b280997ed11aad",
"date": "2022-04-13T10:46:36-03:00",
"path": "/nix/store/h9bxbfm36ab2z314lpny78jympq9cxli-luasec",
"sha256": "04zch1ims50phgzqnbpxdfnxyrr9kpb8wi5bm9hhsizrzsx637is",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1997,25 +1997,33 @@ buildLuarocksPackage {
}) {};
luasocket = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchurl, lua
, fetchgit, lua
}:
buildLuarocksPackage {
pname = "luasocket";
version = "3.0rc1-2";
version = "3.0.0-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasocket-3.0rc1-2.rockspec";
sha256 = "17fbkihp4zypv5wwgxz8dnghj37pf5bhpi2llg4gbljp1bl2f42c";
url = "mirror://luarocks/luasocket-3.0.0-1.rockspec";
sha256 = "00j6jss7ifrqsylh1k9254i715z17j99hhawhlkmha1y6wn4glam";
}).outPath;
src = fetchurl {
url = "https://github.com/diegonehab/luasocket/archive/v3.0-rc1.zip";
sha256 = "0x0fg07cg08ybgkpzif7zmzaaq5ga979rxwd9rj95kfws9bbrl0y";
};
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lunarmodules/luasocket.git",
"rev": "88c8a85cb6528232288ec590910b7a966aace52b",
"date": "2022-03-25T11:05:48+03:00",
"path": "/nix/store/vn80kf268mjilsnm7850ag4zhan5na2c-luasocket",
"sha256": "0263gmxdpb2snv9yrwqsg3q641a9gm6migqsmi871hrhxaq0l9c1",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
meta = {
homepage = "http://luaforge.net/projects/luasocket/";
homepage = "https://github.com/lunarmodules/luasocket";
description = "Network support for the Lua language";
license.fullName = "MIT";
};
@ -2028,15 +2036,15 @@ buildLuarocksPackage {
pname = "luasql-sqlite3";
version = "2.6.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luasql-sqlite3-2.6.0-1.rockspec";
url = "mirror://luarocks/luasql-sqlite3-2.6.0-1.rockspec";
sha256 = "0w32znsfcaklcja6avqx7daaxbf0hr2v8g8bmz0fysb3401lmp02";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/keplerproject/luasql.git",
"rev": "ce22164f63783afac9c644fd37c231e56fc097cb",
"date": "2021-10-14T09:38:24-03:00",
"path": "/nix/store/h8r8axcc76x7y6gwc2jzsmr7h2lqgbxa-luasql",
"sha256": "10gq3x7vqkafvfk9fs4039rl1xhnqpl2v60z4qpd96wbcy205gnk",
"rev": "fb70ea47433a66f9b72811cd046dd7d7418a0e89",
"date": "2022-05-29T22:25:54-03:00",
"path": "/nix/store/zkir0i3j5jxb704bi5cnn2i51niabl7c-luasql",
"sha256": "1gnp1892v0g5kzsfrg3l3ykhq81nfv11mhb0djhgrjqx7zaxi24l",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2062,7 +2070,7 @@ buildLuarocksPackage {
pname = "luassert";
version = "1.8.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luassert-1.8.0-0.rockspec";
url = "mirror://luarocks/luassert-1.8.0-0.rockspec";
sha256 = "1194y81nlkq4qmrrgl7z82i6vgvhqvp1p673kq0arjix8mv3zyz1";
}).outPath;
src = fetchurl {
@ -2087,7 +2095,7 @@ buildLuarocksPackage {
pname = "luasystem";
version = "0.2.1-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luasystem-0.2.1-0.rockspec";
url = "mirror://luarocks/luasystem-0.2.1-0.rockspec";
sha256 = "0xj5q7lzsbmlw5d3zbjqf3jpj78wcn348h2jcxn5ph4n4hx73z3n";
}).outPath;
src = fetchurl {
@ -2112,7 +2120,7 @@ buildLuarocksPackage {
pname = "luaunbound";
version = "1.0.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaunbound-1.0.0-1.rockspec";
url = "mirror://luarocks/luaunbound-1.0.0-1.rockspec";
sha256 = "1zlkibdwrj5p97nhs33cz8xx0323z3kiq5x7v0h3i7v6j0h8ppvn";
}).outPath;
src = fetchurl {
@ -2137,7 +2145,7 @@ buildLuarocksPackage {
pname = "luautf8";
version = "0.1.3-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luautf8-0.1.3-1.rockspec";
url = "mirror://luarocks/luautf8-0.1.3-1.rockspec";
sha256 = "16i9wfgd0f299g1afgjp0hhczlrk5g8i0kq3ka0f8bwj3mp2wmcp";
}).outPath;
src = fetchurl {
@ -2163,7 +2171,7 @@ buildLuarocksPackage {
pname = "luazip";
version = "1.2.7-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luazip-1.2.7-1.rockspec";
url = "mirror://luarocks/luazip-1.2.7-1.rockspec";
sha256 = "1wxy3p2ksaq4s8lg925mi9cvbh875gsapgkzm323dr8qaxxg7mba";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -2196,7 +2204,7 @@ buildLuarocksPackage {
pname = "luuid";
version = "20120509-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luuid-20120509-2.rockspec";
url = "mirror://luarocks/luuid-20120509-2.rockspec";
sha256 = "1q2fv25wfbiqn49mqv26gs4pyllch311akcf7jjn27l5ik8ji5b6";
}).outPath;
src = fetchurl {
@ -2214,29 +2222,20 @@ buildLuarocksPackage {
};
}) {};
luv = callPackage ({ buildLuarocksPackage, luaOlder, luaAtLeast
luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, cmake, fetchurl, lua
}:
buildLuarocksPackage {
pname = "luv";
version = "1.43.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luv-1.43.0-0.rockspec";
url = "mirror://luarocks/luv-1.43.0-0.rockspec";
sha256 = "0z5a7yp20xbb3f9w73skm9fj89gxxqv72nrxjq3kycsc6c2v3m8f";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/luvit/luv.git",
"rev": "1.43.0-0",
"date": "2022-03-12T16:05:50+08:00",
"path": "/nix/store/d7f3sdw5l0cm8xkjdm4m6jkmx794w48j-luv",
"sha256": "sha256-CcUX69XzgWlJEwHUhhtqs9sDA5TNIusKek5yV2Nt3Wc=",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path"]) ;
src = fetchurl {
url = "https://github.com/luvit/luv/releases/download/1.43.0-0/luv-1.43.0-0.tar.gz";
sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn";
};
disabled = with lua; (luaOlder "5.1");
nativeBuildInputs = [ cmake ];
@ -2256,7 +2255,7 @@ buildLuarocksPackage {
pname = "lyaml";
version = "6.2.7-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lyaml-6.2.7-1.rockspec";
url = "mirror://luarocks/lyaml-6.2.7-1.rockspec";
sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja";
}).outPath;
src = fetchurl {
@ -2282,7 +2281,7 @@ buildLuarocksPackage {
pname = "markdown";
version = "0.33-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/markdown-0.33-1.rockspec";
url = "mirror://luarocks/markdown-0.33-1.rockspec";
sha256 = "02sixijfi6av8h59kx3ngrhygjn2sx1c85c0qfy20gxiz72wi1pl";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -2315,7 +2314,7 @@ buildLuarocksPackage {
pname = "mediator_lua";
version = "1.1.2-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/mediator_lua-1.1.2-0.rockspec";
url = "mirror://luarocks/mediator_lua-1.1.2-0.rockspec";
sha256 = "0frzvf7i256260a1s8xh92crwa2m42972qxfq29zl05aw3pyn7bm";
}).outPath;
src = fetchurl {
@ -2370,7 +2369,7 @@ buildLuarocksPackage {
pname = "mpack";
version = "1.0.9-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/mpack-1.0.9-0.rockspec";
url = "mirror://luarocks/mpack-1.0.9-0.rockspec";
sha256 = "1v10kmw3qw559bbm142z40ib26bwvcyi64qjrk0vf8v6n1mx8wcn";
}).outPath;
src = fetchurl {
@ -2391,11 +2390,11 @@ nvim-client = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "nvim-client";
version = "0.2.2-1";
version = "0.2.3-1";
src = fetchurl {
url = "https://github.com/neovim/lua-client/archive/0.2.2-1.tar.gz";
sha256 = "1h736im524lq0vwlpihv9b317jarpkf3j13a25xl5qq8y8asm8mr";
url = "https://github.com/neovim/lua-client/archive/0.2.3-1.tar.gz";
sha256 = "0w6rc7b9gmz17x4l1q2nv275bkzwvg3pfg5mzsd4wymy2iwrqphf";
};
disabled = with lua; (luaOlder "5.1");
@ -2417,10 +2416,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lunarmodules/penlight.git",
"rev": "0653cdb05591454a9804a7fee8c873b8f06b0b8f",
"date": "2021-08-31T23:42:29+02:00",
"path": "/nix/store/zf3k6z36bxsrbxkkmsa4w6m7vxvlpfgn-penlight",
"sha256": "0l1819dyr9hzmimnjjg99fad6k3ksmlm77hgvdybgz8558lj4g1i",
"rev": "a7b9f888cd72dfa875e3b7cc3b88be632f567d79",
"date": "2022-03-24T13:21:29+01:00",
"path": "/nix/store/vk0z1hx9rwl45g3nn0f6c4m6mx8d9p65-penlight",
"sha256": "0w5w13gdbbnli23zmixy20jq6z3j5p6z3br3abpl5qh36b01i5p4",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2448,10 +2447,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/nvim-lua/plenary.nvim",
"rev": "c2bb2d8fd5b44bfc6aad3a5463c84576a98dd4a9",
"date": "2021-12-06T21:11:29+01:00",
"path": "/nix/store/h376md0lpbv31n5wyrq0cilkpx2lkr18-plenary.nvim",
"sha256": "12csjz882yv9wwhzx964fq210655m8820491xjsrjlwccfc09i35",
"rev": "54b2e3d58f567983feabaeb9408eccf6b7f32206",
"date": "2022-06-01T15:32:39+02:00",
"path": "/nix/store/j29rrzs7dsm6720rsjmzk7r1a27zv7h1-plenary.nvim",
"sha256": "1ldjdc7yq4awlllr9dcv8fnkcwgdpvj0py5mhvx3v1yjniwrkn2i",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2470,7 +2469,7 @@ buildLuarocksPackage {
}) {};
rapidjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua
, cmake, fetchgit, lua
}:
buildLuarocksPackage {
pname = "rapidjson";
@ -2490,6 +2489,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ lua ];
meta = {
@ -2504,14 +2504,14 @@ readline = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "readline";
version = "3.0-0";
version = "3.1-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/readline-3.0-0.rockspec";
sha256 = "1bjj8yn61vc0fzy1lvrfp6cyakj4bf2255xcqai4h3rcg0i5cmpr";
url = "mirror://luarocks/readline-3.1-0.rockspec";
sha256 = "0bl5hsplnlg8fx3v83sz48y2p1rlxfig3iycnk1pn3xi724kscnc";
}).outPath;
src = fetchurl {
url = "http://www.pjb.com.au/comp/lua/readline-3.0.tar.gz";
sha256 = "1rr2b7q8w3i4bm1i634sd6kzhw6v1fpnh53mj09af6xdq1rfhr5n";
url = "http://www.pjb.com.au/comp/lua/readline-3.1.tar.gz";
sha256 = "0i02jsywj9mb4lwiyp742xgz53i9z5xzpx34lh54hcd6q3xkcrw2";
};
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
@ -2555,10 +2555,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lua-stdlib/_debug.git",
"rev": "3236c1561bfc2724a3abd153a6e10c7957b35cf2",
"date": "2020-04-15T16:34:01-07:00",
"path": "/nix/store/rgbn0nn7glm7s52d90ds87j10bx20nij-_debug",
"sha256": "0p6jz6syh2r8qfk08jf2hp4p902rkamjzpzl8xhkpzf8rdzs937w",
"rev": "eaaa493937974889007158fa8681835b312d2a35",
"date": "2022-01-02T17:12:19-08:00",
"path": "/nix/store/qrzwpcg9airmlnayfgxspy7p7pa8csyl-_debug",
"sha256": "0nik882xm0d243ah8v2z5przcny7pfbbj529yn4qyvvz67lsfydb",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2585,10 +2585,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lua-stdlib/normalize.git",
"rev": "fb1d61b88b03406e291f58ec4981edfc538b8216",
"date": "2020-04-15T17:16:16-07:00",
"path": "/nix/store/jr4agcn13fk56b8105p6yr9gn767fkds-normalize",
"sha256": "0jiykdjxc4b5my12fnzrw3bxracjgxc265xrn8kfx95350kvbzl1",
"rev": "ccc697998af22d9d7f675e73f4b27c7a52151b5c",
"date": "2022-01-02T16:33:35-08:00",
"path": "/nix/store/nvyy1ibp43pzaldj6ark02ypqr45wmy1-normalize",
"sha256": "1m6x4lp7xzghvagbqjljyqfcpilh76j25b71da6jd304xc9r0ngy",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2613,7 +2613,7 @@ buildLuarocksPackage {
pname = "stdlib";
version = "41.2.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/stdlib-41.2.2-1.rockspec";
url = "mirror://luarocks/stdlib-41.2.2-1.rockspec";
sha256 = "0rscb4cm8s8bb8fk8rknc269y7bjqpslspsaxgs91i8bvabja6f6";
}).outPath;
src = fetchurl {
@ -2639,7 +2639,7 @@ buildLuarocksPackage {
pname = "tl";
version = "0.13.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/tl-0.13.2-1.rockspec";
url = "mirror://luarocks/tl-0.13.2-1.rockspec";
sha256 = "0a9nr03q6w1689drd0r2y8m7qbyxm8n6bkgjplwkr6c6abvbis3f";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{

30
pkgs/development/lua-modules/overrides.nix
Unescape View File

@ -15,13 +15,17 @@ with prev;
});
busted = prev.busted.overrideAttrs(oa: {
nativeBuildInputs = [
pkgs.installShellFiles
];
postConfigure = ''
substituteInPlace ''${rockspecFilename} \
--replace "'lua_cliargs = 3.0-1'," "'lua_cliargs >= 3.0-1',"
'';
postInstall = ''
install -D completions/zsh/_busted $out/share/zsh/site-functions/_busted
install -D completions/bash/busted.bash $out/share/bash-completion/completions/busted
installShellCompletion --cmd busted \
--zsh completions/zsh/_busted \
--bash completions/bash/busted.bash
'';
});
@ -199,7 +203,7 @@ with prev;
# until Alloyed/lua-lsp#28
postConfigure = ''
substituteInPlace ''${rockspecFilename} \
--replace '"lpeglabel ~> 1.5",' '"lpeglabel >= 1.5",'
--replace '"dkjson ~> 2.5",' '"dkjson >= 2.5",'
'';
});
@ -332,15 +336,23 @@ with prev;
# we shouldn't use luarocks machinery to build complex cmake components
libluv = pkgs.stdenv.mkDerivation {
inherit (prev.luv) pname version meta src;
pname = "libluv";
inherit (prev.luv) version meta src;
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_MODULE=OFF"
"-DWITH_SHARED_LIBUV=ON"
"-DLUA_BUILD_TYPE=System"
"-DWITH_LUA_ENGINE=${if isLuaJIT then "LuaJit" else "Lua"}"
];
buildInputs = [ pkgs.libuv ];
# to make sure we dont use bundled deps
postUnpack = ''
rm -rf deps/lua deps/libuv
'';
buildInputs = [ pkgs.libuv final.lua ];
nativeBuildInputs = [ pkgs.pkg-config pkgs.cmake ]
++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ];
@ -350,18 +362,16 @@ with prev;
buildInputs = [ pkgs.pkg-config pkgs.libuv ];
doInstallCheck = true;
# Use system libuv instead of building local and statically linking
extraVariables = {
"WITH_SHARED_LIBUV" = "ON";
};
# we unset the LUA_PATH since the hook erases the interpreter defaults (To fix)
installCheckPhase = ''
# tests is not run since they are not part of the tarball anymore
preCheck = ''
unset LUA_PATH
rm tests/test-{dns,thread}.lua
lua tests/run.lua
'';
passthru.libluv = final.libluv;
@ -401,7 +411,7 @@ with prev;
})).overrideAttrs (old: {
# Without this, source root is wrongly set to ./readline-2.6/doc
setSourceRoot = ''
sourceRoot=./readline-3.0
sourceRoot=./readline-${pkgs.lib.versions.majorMinor old.version}
'';
});

4
pkgs/development/python-modules/pyinsteon/default.nix
Unescape View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.1.0";
version = "1.1.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-YoDCvYpbw06MXx371SNarrtQ0t4xlhwm1CBbl524P7c=";
hash = "sha256-KrsZfLJRYqlV/VwMElv4YoT3/vvfJmrN47s7dGm4isw=";
};
propagatedBuildInputs = [

15
pkgs/development/tools/build-managers/conan/default.nix
Unescape View File

@ -21,17 +21,6 @@ let newPython = python3.override {
sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0";
};
});
# https://github.com/conan-io/conan/issues/8876
pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
version = "1.7.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
};
disabledTests = [
"test_ec_verify_should_return_false_if_signature_invalid"
];
});
distro = super.distro.overridePythonAttrs (oldAttrs: rec {
version = "1.5.0";
src = oldAttrs.src.override {
@ -43,14 +32,14 @@ let newPython = python3.override {
};
in newPython.pkgs.buildPythonApplication rec {
version = "1.47.0";
version = "1.49.0";
pname = "conan";
src = fetchFromGitHub {
owner = "conan-io";
repo = "conan";
rev = version;
sha256 = "1zs2xb22rsy5fsc0fd7c95vrx1mfz7vasyg1lqkzyfimvn5zah6n";
hash = "sha256-BJGstNAnAZtpwagsCY+4quTd0/79zL+v4ifKikS3vaw=";
};
propagatedBuildInputs = with newPython.pkgs; [

11
pkgs/development/tools/misc/luarocks/default.nix
Unescape View File

@ -3,6 +3,7 @@
, lua
# for 'luarocks pack'
, zip
, nix-update-script
# some packages need to be compiled with cmake
, cmake
, installShellFiles
@ -10,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "luarocks";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "luarocks";
repo = "luarocks";
rev = "v${version}";
sha256 = "sha256-tPSAtveOodF2w54d82hEyaTj91imtySJUTsk/gje2dQ=";
sha256 = "sha256-i0NmF268aK5lr4zjYyhk4TPUO7Zyz0Cl0fSW43Pmd1Q=";
};
patches = [ ./darwin-3.7.0.patch ];
@ -71,6 +72,12 @@ stdenv.mkDerivation rec {
export LUA_PATH="src/?.lua;''${LUA_PATH:-}"
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "A package manager for Lua";
license = licenses.mit ;

14
pkgs/development/tools/misc/luarocks/luarocks-nix.nix
Unescape View File

@ -1,14 +1,20 @@
{ luarocks, fetchFromGitHub }:
{ luarocks, fetchFromGitHub, nix-update-script }:
luarocks.overrideAttrs(old: {
pname = "luarocks-nix";
version = "2021-01-22";
src = fetchFromGitHub {
owner = "nix-community";
repo = "luarocks-nix";
rev = "6aa1d59e88eaef72d699477c3e7aa98b274ca405";
sha256 = "sha256-nQLl01RFYZYhpShz0gHxnhwFPvTgALpAbjFPIuTD2D0=";
rev = "b1ff9eeb64c7c1dc5fc177008d6f2be9191c6aa2";
sha256 = "sha256-mkzrf/6yMyLMIEDwsuCIxi1HJvg57ybyZPXVheFAAHE=";
};
patches = [];
passthru = {
updateScript = nix-update-script {
attrPath = "luarocks-nix";
};
};
meta.mainProgram = "luarocks";
})

4
pkgs/development/tools/neil/default.nix
Unescape View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "neil";
version = "0.0.23";
version = "0.0.31";
src = fetchFromGitHub {
owner = "babashka";
repo = "neil";
rev = "v${version}";
sha256 = "0fx34gkhkklzq3hzk1cj2l4rgqrq9vif5y8b0nx9gg4136yj85cg";
sha256 = "sha256-+TDFSg7WA/roIqkuvECPS2UyBqiKQSLp1dooBsVP4uk=";
};
nativeBuildInputs = [ makeWrapper ];

16
pkgs/games/rocksndiamonds/default.nix
Unescape View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeDesktopItem, SDL2, SDL2_image, SDL2_mixer, SDL2_net }:
{ lib, stdenv, fetchurl, fetchpatch, makeDesktopItem, SDL2, SDL2_image, SDL2_mixer, SDL2_net }:
stdenv.mkDerivation rec {
pname = "rocksndiamonds";
@ -9,6 +9,20 @@ stdenv.mkDerivation rec {
sha256 = "1k0m6l5g886d9mwwh6q0gw75qsb85mpf8i0rglh047app56nsk72";
};
patches = [
# Pull upstream fix for -fno-common toolchain.
(fetchpatch {
name = "fno-common-p1.patch";
url = "https://git.artsoft.org/?p=rocksndiamonds.git;a=patch;h=b4271393b10b7c664a58f3db7349a3875c1676fe";
sha256 = "0bdy4d2ril917radmm0c2yh2gqfyh7q1c8kahig5xknn2rkf2iac";
})
(fetchpatch {
name = "fno-common-p2.patch";
url = "https://git.artsoft.org/?p=rocksndiamonds.git;a=patch;h=81dbde8a570a94dd2e938eff2f52dc5a3ecced21";
sha256 = "1mk5yb8pxrpxvvsxw3pjcbgx2c658baq9vmqqipbj5byhkkw7v2l";
})
];
desktopItem = makeDesktopItem {
name = "rocksndiamonds";
exec = "rocksndiamonds";

5
pkgs/test/vim/default.nix
Unescape View File

@ -23,11 +23,6 @@ in
vimrcConfig.vam.pluginDictionaries = [{name = "vim-nix"; }];
};
test_vim_with_vim_nix_using_pathogen = vim_configurable.customize {
name = "vim-with-vim-addon-nix-using-pathogen";
vimrcConfig.pathogen.pluginNames = [ "vim-nix" ];
};
test_vim_with_vim_nix_using_plug = vim_configurable.customize {
name = "vim-with-vim-addon-nix-using-plug";
vimrcConfig.plug.plugins = with vimPlugins; [ vim-nix ];

Write Preview
Loading…
Cancel
Save