lol

Merge pull request #110467 from teto/luarocks-update

authored by

Sandro and committed by
GitHub
c58219ff 77f32f2f

+6 -9
+1 -1
maintainers/scripts/luarocks-packages.csv
··· 6 6 binaryheap,,,,,vcunat 7 7 bit32,,,,lua5_1,lblasc 8 8 busted,,,,, 9 - cassowary,,,,,marsam 9 + cassowary,,,,,marsam alerque 10 10 cjson,lua-cjson,,,, 11 11 compat53,,,,,vcunat 12 12 cosmo,,,,,marsam
+1 -1
maintainers/scripts/update-luarocks-packages
··· 66 66 67 67 These packages are manually refined in lua-overrides.nix 68 68 */ 69 - { self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: 69 + { self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args: 70 70 self: super: 71 71 with self; 72 72 {
+1 -1
pkgs/development/lua-modules/generated-packages.nix
··· 5 5 6 6 These packages are manually refined in lua-overrides.nix 7 7 */ 8 - { self, lib, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: 8 + { self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args: 9 9 self: super: 10 10 with self; 11 11 {
+3 -6
pkgs/development/tools/misc/luarocks/luarocks-nix.nix
··· 1 1 { luarocks, fetchFromGitHub }: 2 2 luarocks.overrideAttrs(old: { 3 3 pname = "luarocks-nix"; 4 - version = "2019-09-07"; 4 + version = "2021-01-22"; 5 5 src = fetchFromGitHub { 6 6 owner = "nix-community"; 7 7 repo = "luarocks-nix"; 8 - rev = "73b8772e56fd39dfffda9e3b13e9eb31e93d5cde"; 9 - sha256 = "00jgshygw439pbaxg7yph3ijia6nid9r1br416wdbyl5wqhlhm1y"; 8 + rev = "v3.5.0_nix"; 9 + sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk="; 10 10 }; 11 - patches = [ 12 - ./darwin-3.1.3.patch 13 - ]; 14 11 })