diff options
| author | Caleb Maclennan <caleb@alerque.com> | 2021-09-02 12:37:01 +0300 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2021-09-06 12:42:03 +0300 |
| commit | 07557e3b49e77c42fc3e51e9e95451187dcd2d33 (patch) | |
| tree | ce823f2ffc06e7e7c005156570cd94b4e103aa7c /pkgs/development/lua-modules | |
| parent | eb99f5f522da6cd7af5fc511edea72b5c9805266 (diff) | |
| download | nixpkgs-07557e3b49e77c42fc3e51e9e95451187dcd2d33.tar nixpkgs-07557e3b49e77c42fc3e51e9e95451187dcd2d33.tar.gz nixpkgs-07557e3b49e77c42fc3e51e9e95451187dcd2d33.tar.bz2 nixpkgs-07557e3b49e77c42fc3e51e9e95451187dcd2d33.tar.lz nixpkgs-07557e3b49e77c42fc3e51e9e95451187dcd2d33.tar.xz nixpkgs-07557e3b49e77c42fc3e51e9e95451187dcd2d33.tar.zst nixpkgs-07557e3b49e77c42fc3e51e9e95451187dcd2d33.zip | |
lua-cassowary: 2.3.1-1 → 2.3.1-2
lua-cassowary: Avoid circular check deps with Busted/Penlight
Diffstat (limited to 'pkgs/development/lua-modules')
| -rw-r--r-- | pkgs/development/lua-modules/generated-packages.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c5a1a41cbd3..6f5ffbce9c5 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -160,10 +160,10 @@ busted = buildLuarocksPackage { cassowary = buildLuarocksPackage { pname = "cassowary"; - version = "2.3.1-1"; + version = "2.3.1-2"; knownRockspec = (fetchurl { - url = "https://luarocks.org/cassowary-2.3.1-1.rockspec"; - sha256 = "1rgs0rmlmhghml0gi4dn0rg2iq7rqnn8w8dcy9r3qsbkpyylbajc"; + url = "https://luarocks.org/cassowary-2.3.1-2.rockspec"; + sha256 = "04y882f9ai1jhk0zwla2g0fvl56a75rwnxhsl9r3m0qa5i0ia1i5"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/sile-typesetter/cassowary.lua", @@ -171,7 +171,7 @@ cassowary = buildLuarocksPackage { "date": "2021-07-19T14:37:34+03:00", "path": "/nix/store/rzsbr6gqg8vhchl24ma3p1h4slhk0xp7-cassowary.lua", "sha256": "1r668qcvd2a1rx17xp7ajp5wjhyvh2fwn0c60xmw0mnarjb5w1pq", - "fetchSubmodules": true, + "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false } @@ -179,6 +179,10 @@ cassowary = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; + checkInputs = [ busted ]; + # Avoid circular dependency issue with busted / penlight, see: + # https://github.com/NixOS/nixpkgs/pull/136453/files#r700982255 + doCheck = false; meta = { homepage = "https://github.com/sile-typesetter/cassowary.lua"; |