diff options
Diffstat (limited to 'pkgs')
104 files changed, 2629 insertions, 1424 deletions
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 1f3b2685feeb1..2562a821b8226 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,25 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkg-config }: +{ lib, stdenv, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; - version = "2020.09.01"; + version = "2021.08.28"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "091qzk0qs7hql0q51hix99srgma35mhdnjfd5ncfba1bmc1h8x5i"; + sha256 = "13kc68vkrzg89khir6ayyxgbnmz16dhippcnw09hhzxivf5ayzpy"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; - makeFlags = [ "debug=no" ]; - - postPatch = '' - export PREFIX=$out - cd src - sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' Makefile - ''; + makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; preConfigure = '' export version="v${version}" diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 3330e3eaefd6c..dc98d761bf083 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "xfig"; - version = "3.2.8a"; + version = "3.2.8b"; src = fetchurl { url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz"; - sha256 = "0y45i1gqg3r0aq55jk047l1hnv90kqis6ld9lppx6c5jhpmc0hxs"; + sha256 = "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index bb28be72deb7f..90d91583a26fc 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { owner = "openstreetmap"; repo = "merkaartor"; rev = version; - sha256 = "sha256-Gx+gnVbSY8JnG03kO5vVQNlSZRl/hrKTdDbh7lyIMbA="; + sha256 = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index e599ffa39d78f..97613b21957b2 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -39,8 +39,9 @@ in stdenv.mkDerivation rec { version = "0.8.0"; src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; repo = pname; rev = "v${version}"; sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw="; @@ -76,7 +77,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Wayland compositor for mobile phones like the Librem 5"; - homepage = "https://source.puri.sm/Librem5/phoc"; + homepage = "https://gitlab.gnome.org/World/Phosh/phoc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ archseer masipcat zhaofengli ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 7ea337660014c..5d8d4afeece80 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,20 +1,20 @@ { "stable": { - "version": "92.0.4515.159", - "sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr", - "sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985", + "version": "93.0.4577.63", + "sha256": "0ls8r77la6p7474j84wchvs4rvnxwfv7c8xvbxjm8h7jqak4zwza", + "sha256bin64": "1kv742arnv710mhakm2v59dwfypg7j01k7rd5if8h0s49yzdw3qc", "deps": { "gn": { - "version": "2021-05-07", + "version": "2021-07-08", "url": "https://gn.googlesource.com/gn", - "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", - "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" + "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", + "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" } }, "chromedriver": { - "version": "92.0.4515.107", - "sha256_linux": "12yckzjhlhxp14j7aphnvlw4xv713vllj44h5pba181ivxavmky3", - "sha256_darwin": "0gm0zazwy053rip9h0ma2s53rc65b8pzy57x48ch0fpq7rrsbycp" + "version": "93.0.4577.15", + "sha256_linux": "11wcimkcgaiz740k9xibi5hq1kd4zgy1vk6bd6cp31wjw4y21x5f", + "sha256_darwin": "0cxf3cg5pg9rigq7wmbap6wvmgpdr6v44bndisyaqhlw7s2hhndn" } }, "beta": { diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 8d51e7a2c79ae..20f0a0f64a6a7 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "91.0.1"; + version = "91.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ach/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ach/firefox-91.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "d3ffa075821d9c11dcb96e7edaf8e8d71df251d53c9d0451fb01fcaee62ef8f4"; + sha256 = "f33d2815c214fe8961aa98d3d531bc91a548c4744fae551663fe78a087168798"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/af/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/af/firefox-91.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "dc51c73414bcffd8b36741f1d6ab2734b15b4bec786502f35a4b9421b9ca3f0a"; + sha256 = "1c9c01a01ca6be5f43477345289f67caf09651ad270b7b252a295a671de817e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/an/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/an/firefox-91.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "4e629d00106765cf22cf4c78d7ad04ba0379838addcd7cb991fae3d0881cb850"; + sha256 = "9ec5c6b14231d52056388ca8a7380954bea6cd5281e415c0854a49cc73640806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ar/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ar/firefox-91.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "c7054c65464e149d3a59ccaa8e9bf2d69bc77677ea5a2ba3ae918db5be8fdaed"; + sha256 = "a45e1e427693f8196bb21aa488c6524c35e84874a32413fc0700c30a7301b050"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ast/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ast/firefox-91.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8270e3217f302700c0a3771f68bb88df45100d9d1d0631351f22053e891e66b8"; + sha256 = "0d7045894345c84e5eabd42ba9e9c8e8606aba2980893485662e9571c3779f2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/az/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/az/firefox-91.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8b1085c48b5e0181c9771763406592bbdbc244d4d3151f33a16988356b5a0952"; + sha256 = "298562a8941641463f728522c70ebde8e8380836fc0cc8311eec52dca5ec51f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/be/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/be/firefox-91.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "447646e47e60981affd8d08c2dba13be7cea36298acf0b5fbb643ad8c65cb3d2"; + sha256 = "0e993e8678d0c2bdfa4499ceebfc0840bfd2ddd83c8c8e72d46d6d0c553c6819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/bg/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/bg/firefox-91.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f684ce4051cffe8e5f49450368b11ba92dfe745a7676c815b48d34649594eb08"; + sha256 = "03381a727b1610aa9901bdef0325c58103ce7772561a65f6943c10cc4ba9d716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/bn/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/bn/firefox-91.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9ba47714afcd7919c681b426c5df76664e7115b1c29f44082a84fe352f2a55be"; + sha256 = "1802540536f260157be20865ef10c829917ecf4fa786a640f5c1ae3f5d32bf8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/br/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/br/firefox-91.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "da820985c59c010f6de527347c5e475db73aae93180517451c3b06ed4605515f"; + sha256 = "9a236a56179b5ce0aad809a85c744762c44daac465c527883157366b5037971c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/bs/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/bs/firefox-91.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "7fcf9509831a7b44b07525d6622a29e8e3f83e1cf2aaf60c66afc73e4514a952"; + sha256 = "bdcd9e29bb472d1519d480288709ccca8ff625b6ddb3a251d526a6cd5b68122f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ca-valencia/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ca-valencia/firefox-91.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "6764d541d324578c381fe723a36c5ccb298276f34749ac61e8ae7a2218036d6b"; + sha256 = "7df5d82aac797456b4f22fdc9ab6f4114d7ad038cc16f28f83daf2d62a5b0f5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ca/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ca/firefox-91.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d598fee99118b2d881326458f8bede038ddf51779bed99d581c6bdc31272fa5b"; + sha256 = "f05391b0bcc16fb1a39710c70bd33b79965c7b0afe57e593c04e00c57e1ad447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/cak/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/cak/firefox-91.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "6c8ed355c7b6b50e9e1752543f7367fd2a1249ab54a7c459f53f0b3e9b5568ae"; + sha256 = "afc0e6676fde094764ad466b735c887a31d5ec808237cedf7ac54b8323c2fb84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/cs/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/cs/firefox-91.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "c2f42dc7fa41645583649aac6da440eb6868b42b4522330c282890bbd11a056c"; + sha256 = "87a144952d612aa03998741a3232d93484200410d871c1823a4017e98b1d0570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/cy/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/cy/firefox-91.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0efe41d3566e6ee405f87c7e76c97725580c25cdcf4753eaac925baca52e31d0"; + sha256 = "5f891c275890f746dee7f8dd27f69d610007fa553e23eaaa2bc949998b1b2d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/da/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/da/firefox-91.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "76f8dbe67bd73c20b219184337ca36b529ff5afbb38278975acc2579c497c938"; + sha256 = "dd36c8b04d729e6746c01fa2de7f818c09dff7d75339fd4234f4285979f4a5cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/de/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/de/firefox-91.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a0886d38dc116d087f3cd06aad8f496f7c969bdb0761a4da09621b04b1c4dad6"; + sha256 = "1f02ed10313352cfc8db46bc888c25da9cd61656e022e1a3260b42a56b1142e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/dsb/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/dsb/firefox-91.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f84647095269cbe6714109ffc8432606be0e3ec7664c26680fbe9d79eaaf6274"; + sha256 = "f53ba888cf993452761ffb21647fc47c799a41c398a28c3546ffdbc9c10bfb56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/el/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/el/firefox-91.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5773765759d427f491ee809c89fe038f43fb0e0680047ae072fdca973439107f"; + sha256 = "4ec5b0b831ad161d501169f650c17715f6a4d505507c458e68cd74dae8aebb7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/en-CA/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/en-CA/firefox-91.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "694df869386c430f5f410e81ecd1e6d9f50448dc1bf8773ff544e40f86ba9015"; + sha256 = "f07cb785234979806c03ae15e308ad72e417268cf4d9b3081ccf0c79d99a1b26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/en-GB/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/en-GB/firefox-91.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "abaccbf19c75df6a077a669f3c70380d589756768f776874c7b44253876cd645"; + sha256 = "de25d50a780d8edc070a10b2ac7e5806814548a2ab3609e0e4f30eb2e0e18272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/en-US/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/en-US/firefox-91.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f3cce733e83ea3abc8085a9809a03afc8caafe6d858f9da5f1823789ee740307"; + sha256 = "9eaac9c88ff4696228292590b65ab2fd1b0d98b7a1edf5a21abc11b7803a046d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/eo/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/eo/firefox-91.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0f7a104438d8175f22998c3e626cac6a85ceb955201bc0961c9f50a2d3c6942d"; + sha256 = "cb11d5f6f3caac78bb8a06dd3ff29ee11b71dd159dcf8804094c0bd969864b9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/es-AR/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-AR/firefox-91.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "6622a16486eff0dcb34c77882dccf94f7e85d22c09e04c6ef8e2be2eb7ca4971"; + sha256 = "849fba4b1375e0426efaed3ae637d9de4c6389c36869b345715a846a87b2473f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/es-CL/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-CL/firefox-91.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "06208db32a2bc11296aa516c83394162e96da2f2e2d947ec56aeacc3711f9c2e"; + sha256 = "06a43322ad648c1e8c0cec8ee0a0e087c795e23fb8ef5e1e9775b009e5784673"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/es-ES/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-ES/firefox-91.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "edeec59af78cea871f1ffcbf49194eb0395300160373c5a51716e3bb3ef528a2"; + sha256 = "cc0bf296b910773e7c5d58760149b2918ee35c0d7c0f9953d890bbb6ace8397d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/es-MX/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-MX/firefox-91.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "157f71cde8354b5c8a03cfd106a17a4748592030177b804432e8d61af7a99bd1"; + sha256 = "7dbaba5d426891452c285a88f557ebea9eaded970aae22d5deb530a8bb30785c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/et/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/et/firefox-91.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "4e90edde6e458a7858e01247c09a585e78eeadfcdd756b0c5cb18a0ea6e587bf"; + sha256 = "b57651dfa1630d2bb202659a8621772d0ba9f2f5b111384105ae7db2db7e1c9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/eu/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/eu/firefox-91.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "01b398b9ad33b3543a0dbf2d0fbc425044d3204109b14d8d0b9aa894c0a3003b"; + sha256 = "b1a3f24309807f139dae331efa358e605fd536188bc04e39e8a52669ce5d4925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/fa/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fa/firefox-91.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7687e30c2812033ad6c36c2abad3bb3e2983bc7c6554ceb8de331e9f168ad4dc"; + sha256 = "ab5fc5668be9ebb9b55b29aa245382f054b088d6920e58e40fe001e4d13b10cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ff/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ff/firefox-91.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "05dbe4360ec07378ab16c3e7e0b7554107a7d2277f330a68d48f91177386ecfb"; + sha256 = "d57c5e4a4337b49e22c9c010c218e0e31b19a9bbf4ef47c1c68c36415ef03793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/fi/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fi/firefox-91.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "98c4a8299bad3392ec33315034828a322189f67c90d10dff6cd76c74de0579d5"; + sha256 = "93cdd41f76160ec2d2286e37ab1745bf7e88a8c4d46fff427bea3468f54b3772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/fr/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fr/firefox-91.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f0ebd26d849f54b87e3330629cacf0928804c2bbe739533e64105391e67dc579"; + sha256 = "04a7ea5dc8576fdfd49156693fd7fcecd1c55ba33a655f6dc832bb22caa51a5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/fy-NL/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fy-NL/firefox-91.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "5ce2534b6298c2d2796445d5ddb7b6bcd0643dbcf17a96177130df8f481eda86"; + sha256 = "24a5acb50252bfcfde2c6ba24949cc06d9b4b2883c3a00178b25dd88f057b9c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ga-IE/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ga-IE/firefox-91.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "80a422b732154d75b5e6a56082b367506bb04629dff74d26dd412ccab3a94a41"; + sha256 = "136b45c8a0f9197e7e02b973b11bfc25d12202fb4e26b8c0e0ce1be4c19714be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/gd/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gd/firefox-91.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f277afca343edbf9dbe56c2fe84d0d7204ba70501894cec0107e6cbab112c213"; + sha256 = "ea674cbc970610827f731f8c8ea3086f6f30cbd4167c12c471f6592c89892d3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/gl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gl/firefox-91.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f5d238ec36d881729dc6b92b41cf73fdcf73419f4706e1578bb226769d272f69"; + sha256 = "f8bde4cb07aab6e7e7c776377a954680184bf3d3ecaf7542fc3843099854db41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/gn/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gn/firefox-91.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "bddab5b3c78078c70d80a99eb963dd7c159f24acaf186f94ef2a032fd15ca1bd"; + sha256 = "845c2c94a5c3432148df173e9e5e3fe0308fbf58577da2b9d8753cedff80c2d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/gu-IN/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gu-IN/firefox-91.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "a4a62c689fe6aa5b2c0f0d196fccc5ad6dba42fc4616c25ad45ecdfc18db6c39"; + sha256 = "9cfbe57f0e0bc2f6ca070f248403b3edb36637bb2a0fd01bd621f97928378463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/he/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/he/firefox-91.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "06a9b9b88f458af96e500d1ddcc58ee587cd3595d152a155a90bfcb9695cf6b6"; + sha256 = "f561c12266a3b841ccc72592caea6410b2607140b9adbb66e067377104c4bdb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/hi-IN/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hi-IN/firefox-91.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "65a1f2e57f0ec59e8b1b6995b6f7c2511b56557abb35f4bb77a0b7fa0e07fc53"; + sha256 = "b5cea26bbbc6fd5cda63f9099f17b50dc61697c1c3a1ea07344aabdf2ad154ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/hr/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hr/firefox-91.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "1dc71379aed8b5537bd751db50c4810f7fa5940575341921b4e111c6b727ac6c"; + sha256 = "aa3bc54890eb5f50a51da981576d77ff89480ac52d1056fecba7c3d699f2ec49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/hsb/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hsb/firefox-91.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "acd5df918ef7e09d08a6fb94696d9a15431e5c899f8137caa8431b2f38d9962a"; + sha256 = "1a07e8e22747ac148d8e9e6c9cb5f23466dd821ee40375d6401d6199e615a757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/hu/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hu/firefox-91.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "afeb9429b3aad80c7f92bde3c42c4cf8e6b1e51e221b62a2e7d405da5f1c9ea3"; + sha256 = "2227a72fb5caa0f95782f19380c60890b0886469207b03bcda9d6ab090f87b29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/hy-AM/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hy-AM/firefox-91.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "bf5fc5658ae5ba925685d06340ef66fe3d80eeb6297406637cb4ee8d05f02f57"; + sha256 = "1cbe3aa9306de87b819c04197e769958be6aada5a192f83decbbbd9b9874c73b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ia/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ia/firefox-91.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d5269e41a98722c264fc6a9e3299d667bd2f8796b2640989c853e6f1b0beab39"; + sha256 = "283daf5d143c70a416d6286cf51d7657d4d3e3785085ae574d1100cf24e40525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/id/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/id/firefox-91.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "47e2e461b7635f7026af8685c2dc6aed981b3e5c8e6953ea855bd08af2a6ee81"; + sha256 = "3cbe27d43c810758aabb755f5745912d92b9e843a294b938224665de614612cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/is/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/is/firefox-91.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "3d93b22ad196777b13ba6d17871fcc46cb6ecde1e8775171624cbd9d527fa345"; + sha256 = "c3a3d505efe0a181fb1c3002c19fdd6669aea41c9b31382cf9679c53fcd0e3e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/it/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/it/firefox-91.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "310b5f10f1ff96805f691dfcf0f8c034a9a1a54e84d6e0ae5ecaafa8ab229764"; + sha256 = "12a3edb320a2aee0d872aae1180f3b106f2f3a68c80ce6137794e00fbd0d09e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ja/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ja/firefox-91.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6e50b5b236da722a01c11402fc6fb5ff362d9c6476ac43815d5c7f48245d158f"; + sha256 = "f5b7fed8385b9132ca458983cb7ad926d453c7d62309994ee7ec8c79b653ccc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ka/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ka/firefox-91.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e39a97ca32c43d53e95af91de0e58051fc74174eead6ce4346d8a201fed56800"; + sha256 = "2db556fe388ec3e29d603eb90e1dc2aa3c0064f09f8a6ad48158b0255433d0df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/kab/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/kab/firefox-91.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "851f4eb72487e5a22777905017e91d9b55e6f10eb06ef366e24d4d96272e18e9"; + sha256 = "fe0d1dbff288168c06501c2f2aca07f0de5a7ad6b1c9ee3ea9fa49a6bcc01f05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/kk/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/kk/firefox-91.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cf83913fd67615c8ed9d542c75d22401b051760eb4c0c4e2a5367f954d473dbc"; + sha256 = "7c4ea35acdfaf20155f68b96af3289e465fe9179d7eeefa5c231bed350ad6f72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/km/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/km/firefox-91.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "82343a709dbb9061d5a71b1f8c5be6adbd8f27e9c0016ff6d0a0ed395f75e4d1"; + sha256 = "09f9246eecc557ea89159ed67c10ffb640cdb4877e7bd3e76a70f429f80d4c7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/kn/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/kn/firefox-91.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "56fe5ee2e6abd203252ec8643bef2fd019c53ee298ac063ee492c67c6377dcac"; + sha256 = "df48636b12ef91f18c837e42beba979d83e0a0f5d25de5593984d19c6a3572b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ko/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ko/firefox-91.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "dbcfce2f941e817cdf6427ef70c3ce1b7d14898ee9b3a30e470d7ce604f4d816"; + sha256 = "0d21181cf503a1b203c160c86a8fb322da5dc9a8bd6ad2b19541a691ca3a9ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/lij/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/lij/firefox-91.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "7764585a7bb44f5d139cf822ddd2f89ae12c32ece08844549724b805ed1c86af"; + sha256 = "e206101e2f05d297305aeff38becb141069fdbb7fd2b8274f150bb9bd8111318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/lt/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/lt/firefox-91.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a64c6ee25e8011f63651085ff3c1c853cbeab97ad24d8988d5c419ac2f3fe660"; + sha256 = "feee32cc11f81db93400d4e91104699e3968f01c09dff99fb7859ab09925833e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/lv/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/lv/firefox-91.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a7bb8ede18fbe6d9d75d9327104e4f0cef1aa6ae8add6045b6952e4c4c4c9df0"; + sha256 = "16b6cdc6e993465c81937bb07ed275a79c786fe77caac3d5c7e309de62698cdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/mk/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/mk/firefox-91.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "c8cb79bd2d0f244aa6b236ebd026c79b25ebbc23d53f429bed4d00e333180f6d"; + sha256 = "e7eb1e3b560ba558aa4e7db1883082279752db3580b97face685f16e541f3778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/mr/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/mr/firefox-91.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "5b451466b9f21f4163c0339c226c475c1d5519e947f98a544fb4fd2a315b2652"; + sha256 = "18aefcd48300b1b8e7a3775539d8952341dc9f930cd4492aabf0f1c9b5db9251"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ms/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ms/firefox-91.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2fc219544e852aae4bc65b97b6a2cf90509eecfa8728358e9bb747c309d7e3a0"; + sha256 = "2a4e8aa5f8fa123dec530c75db7733c7c02be47a854b1a83ca9c9de8999532e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/my/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/my/firefox-91.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "fb2ef8be7e7e553a9529def262c5b072a4a6f36d459858be81ce4d7d7d7f65ab"; + sha256 = "af73e4c5d7d07be9eef45bc4b4623e6d15158b8e195d2679aec57f5b4e5d4522"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/nb-NO/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/nb-NO/firefox-91.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "67bd49a41d34a1f2f14f9fa98998b49b4837c9cf90bd0d393eb9454248562f3c"; + sha256 = "d7f8d00411d40955abe40861cb9cbb6c286c4123e559a4f1a1cef14a16f9a7c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ne-NP/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ne-NP/firefox-91.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "3cf1ec8e18765292105f092e199806281d8e5c10e24b1a2ad02f3cc8e2a03384"; + sha256 = "1a944d38efbdffbafd3ff2ef7caec06a7b541e50f50288b599de6f84501ceb71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/nl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/nl/firefox-91.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c4254c7b2b54abc68ea1ea01fe3ca3a47745477d7e972c1e242288b799035457"; + sha256 = "3053667a9b8fbe9f450775ea4e16f42622a365b306024ad09efb94f0f78e1ec2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/nn-NO/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/nn-NO/firefox-91.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "629b16c5b060d20b4992aa9b4f6601c13495ba8e0f48e6bed299fbb2db1b2dbf"; + sha256 = "778f005a86a464c96fb1cd6d558dd9fe268c4ea810356aa3bbcaf366ac6af895"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/oc/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/oc/firefox-91.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "ddd22460bc90e2b0ea468923478114d55ced9b351b954ce354142a93321e369f"; + sha256 = "831240b9be6aee190a4272ea759d09fa326e3693a6733d4a9e9c68ca701d1663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/pa-IN/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pa-IN/firefox-91.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9f8127b05b46dae4d3f953d83d10815f29e3c7c3d84631be488d68005a81f803"; + sha256 = "a49344f367d80af4d6683729534c4133e2e30f6492f27098d626caeb609c13cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/pl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pl/firefox-91.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "05dda135b165b1f3e90432a25846d1f9deb0e0e4eff4985bc0b8156d4ce03db9"; + sha256 = "7630e7e09eb0c9b83af6771337494ded1e97ab8e00cf38407fb2548b5751f566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/pt-BR/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pt-BR/firefox-91.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6fc80a89332e3f7fbb15ef035f53a854a408209e1d1a2e12adeffd51e3c7a49d"; + sha256 = "0404ec267d35062191f59de8971a7c348a8b48666b571f6fc83ac72da1b71d28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/pt-PT/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pt-PT/firefox-91.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "542e38d07c041845abff165eb17740cf729075020a210e4b11b3a7627c325668"; + sha256 = "939173f1bd04f71db95b3d526b03f8af9f5e543f969523dbc054e6b8fcd24f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/rm/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/rm/firefox-91.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6a484c541b31400b30c193697d5512ed6cccf228c58bc8953187451ceab255e8"; + sha256 = "4079c2b319fb8bbd53c060ac4fd3d92f7a275080efbaabcf3fb1753232d20a00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ro/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ro/firefox-91.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a235174d99da396b491b0ba802558b6ae8e124ad3baa80bc471b65b34ec8cd33"; + sha256 = "611b34e2aede6d0da5269acb5973c7ba802e1c21f54f013c74900e685cc2f696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ru/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ru/firefox-91.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e0e6584185798695f92b34bfef5643a8e60e8d8745e8162b4e1de5962a91f072"; + sha256 = "7f485ffb4db58234f09c86b03735469b9a6b0fe769e248ecb2e735f6d94e56c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sco/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sco/firefox-91.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "bfc2e413320b9bd4479aa36d41fcf881237f6051b978dfb6e0ac8871dc43f272"; + sha256 = "6578345753a4c043e3240aa0da35e6888fa51e91b85e08614e16ae6571ab256b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/si/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/si/firefox-91.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "91b68d52ee3f49e922d9bb85fb34ce8f81f4413f4246d2131430606cdf0dbf27"; + sha256 = "d23d3f09e7a5112e5b6d28d2b2c8c99f4c86be52f1e9422eb2fc3b1906d98ac8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sk/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sk/firefox-91.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6e705eec8f8c99cd8f7761a65df781b094276f3c4ea2483dfab4a2344755aee0"; + sha256 = "90a116fee8568b6a9a55c0421dc6a2860d63ad08b8fc378084c1afd4c949c1d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sl/firefox-91.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4f868d14d0b0f07e5f2204fae2bf3074e9b4b9ad20c715f3618e20fbf5340046"; + sha256 = "771b695988fbe0e12bce06a740e3495fa850c8868a05d67be50ba8090d4ebade"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/son/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/son/firefox-91.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3d9596c5d74aff035ad15178d26d48cafb6baec6a3cbdabf4a9df10560558726"; + sha256 = "0a645ec3f2f57ae891aaecc2ce206487518175828f4fc340736b0ea72af001ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sq/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sq/firefox-91.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "c52577d01a098c808b83a21b9f49123287e58c2cde78818dcee5541b545c8924"; + sha256 = "b3c72f26cc4f14b621bc596c93561d7a117fd5efdbe01e4235aa1fb7c8f2d1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sr/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sr/firefox-91.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "9ded38976438030a6edb5c4c38b1d6a6c5a32006afd2f72b2aadefd4e6a5e9c1"; + sha256 = "36044733f7ee34fdea823253f66e7e8fa3cde8d429711ee91c128960f418ff8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sv-SE/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sv-SE/firefox-91.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "b83c19762d22d7cd0f6f60e095bcc6245bba32695de6672caded6bbb0ebbae62"; + sha256 = "392930224df082d89c5bc1624f8193d985c82ec11c37d3ff9d659d339f1c1814"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/szl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/szl/firefox-91.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "470d77255bab962ca51393593f4416e0a6464e9dbf65e2d3c735901709ade7db"; + sha256 = "8481c1d119e568ed109bb6bfd0c1f897f7f284852e24da7cd2db591a00ada4c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ta/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ta/firefox-91.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d2dbc50bab3854aa0b16580aeee2836e5a59a9cbbc7283230b8e1367f07cff8e"; + sha256 = "3a6e28128ba7f167fcf6c7bb238ac66a7095708e3abeaca7fc6d5ca7eabc43e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/te/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/te/firefox-91.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "4f488f890cddeb3726ed745a3503a6efbf25081d91b3008b9b99e5c23753f75e"; + sha256 = "1c52637dc10ea1fe3c1e7b136f64518c6a97e72d87318e0696b05f0eb25c27e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/th/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/th/firefox-91.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "e988d6aa3392c68307767a01bef615186d8c40937f8efb39ddee7b0401a8b216"; + sha256 = "5fe6f59217a47989e79a3b05b23bde98d77e2a5b8c769e03e66e38976b39804f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/tl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/tl/firefox-91.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d51ca2bcdaabb9bf6ca885cc7b01d1cf4cd13ba98fbc403c9fafe3b8d3870007"; + sha256 = "1128e69f29688da700f60832b9e87529f57d114ed944eec2f9209e7a92cfd790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/tr/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/tr/firefox-91.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "74a188ca542d32bda09a44fc5d7f11f4e0ff77f7cfb65b2b083a233f7ec164d3"; + sha256 = "4e643963f6a1f34553c1fd896ddd58e97208d95fa563de56869ffe5f8e8e8f1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/trs/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/trs/firefox-91.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "7f458cd74a2798391cf46ecca3075e2d7a8fcb89bbec699d466fe02aef5ce1e8"; + sha256 = "ceb96b052b352fafcec29d0f301314187f7800765df4e013394508a2fca76159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/uk/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/uk/firefox-91.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8b491ad4234b7bf1b920ad4456e1e416287fed0a272e4e49295dee5bbfa3081a"; + sha256 = "599f1a52b843d7f1a743547ad54294d95c1f8f73c0a91b0bdbc9c3de7991f54b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ur/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ur/firefox-91.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "68ef530ab99c08854d99b7f9315ee4e5a664538be849b5654df47dc205bf2a78"; + sha256 = "be2aaf110942c218564aacc8318da5b317cc7546e70fbf0d0e47658196da9c6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/uz/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/uz/firefox-91.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "865aaed959c41461ba6c7275c36170bf633f8a2064612d6deb68fe98a34e19cc"; + sha256 = "ef8811b53ce1cea99f068b846ff9e680cf84ad7bcdd30af45102340001cbc330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/vi/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/vi/firefox-91.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "00f2d6282faa8fcb0ecd7d4f5d07514ed9ae23d8cb8ea64ec9911a327153bb13"; + sha256 = "42ef9e751790fbf138ac1d75e03406cfe91b11c6b4afdd2e3a1c5b3ea921f5ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xh/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xh/firefox-91.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "9ef4bd1d054ea8c9773082699f1cc7b2493bb3eed8d99386db8ec6910ea828b5"; + sha256 = "17b3c935627c14f51e1d7ad106ef8428aa7c7399952f87cb54d668336dcd4420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/zh-CN/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/zh-CN/firefox-91.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b91a7fbd4478b913c29b295be9ca968b4992d38410dcdd63fffdb4750b10b872"; + sha256 = "1bc2854070700f2899cd1cca848aa39d34394eb7c3853c4b92b693122deb0867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/zh-TW/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/zh-TW/firefox-91.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "4d2317c96524b21c842af70f6e4096be3518e707f894713d99edfc7d71153dff"; + sha256 = "9620f5ef16421a187d1f3e98c80d5e336995a9bb195241b8c413f619a0a8a3c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ach/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ach/firefox-91.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "d3bf432eec6a56c869c6c3f9cc25e99f6843b806c3a569fcfc8365cdaaf49bdc"; + sha256 = "68648f5e2060c9ba841284a6cc22a793e4a13426c517e803ce0ec21dee6f7792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/af/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/af/firefox-91.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "bf00fcaf0d322e995ece30f7bc3479d37651f866607ead0090f429a4c582bc91"; + sha256 = "b2e55deda95b5e3d180774f5f922ad223a45a7f4ae684203b77bb07937bc2981"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/an/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/an/firefox-91.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "757247fac4eb7232a2668a56e547d031cb55ac76bd8b4c0143c637483ae8ea13"; + sha256 = "f0e5d4574213583ad8cea208955cfea48c0d0c2ec9bf5a62dcef18a20ddc04a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ar/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ar/firefox-91.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "072237ecdaf5bccd8d99aa5ea00e0686a064554bf7039dfb37b05634879e0218"; + sha256 = "1ab07eb8c327180c254061488c1ccfbbe3513657031508ee5658587437049714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ast/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ast/firefox-91.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "cec45238e8e7291bde4d9bc66e489777280b80b6b2d38445899908ca0acf0251"; + sha256 = "b6bca0e8373a9f816b12f856ec0a2515531b02a5e0929a766f904ad2d65c9c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/az/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/az/firefox-91.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "6b178343e28818a29e64b24033e2b5851d77901c372d27ed94fdd93d566527d6"; + sha256 = "4e56f180d96ddb0acab3abedad6fee0709d41075901180123d7bd3cbfa76590c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/be/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/be/firefox-91.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b7ec62a226648166d5942d6064df72e58a70d5ccb4c8489c7cf691bc10812284"; + sha256 = "030df4c436f1d1335b16fdc523180b9eb4d1f78de95aafe2b06a5dd1a8fb72a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/bg/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/bg/firefox-91.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "95eabbdb1016491e8daece292f12cad165eadc906bf7929121bef665eb15100b"; + sha256 = "bc595dbb2930838d60d5cc7455055469498ec645877d3212f3a08f433fe149d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/bn/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/bn/firefox-91.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "c07547743841020f6b8072a76e398ad067b9991955c73229e74bb28cbe4ba2f1"; + sha256 = "97fe8a049a0ca41475645171d829c19514a18320223b96a34870954a0526180a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/br/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/br/firefox-91.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "6c8edc45cf932549e92c1baee6bbbe06f2f412b4087f95ad1d77ac60d48742c9"; + sha256 = "abefc4181bbcdca83ac98be38e08dfaba67ebec48481bca356828331818ab530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/bs/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/bs/firefox-91.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "7f175edda71591a1ff00679d79c51bb63d777090f8e9920280396dbcc2dd0c47"; + sha256 = "0e8e91da19070a5e5d283e0d3f513d01bc856ce5fbd304c9dbaa4fb3b077fed9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ca-valencia/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ca-valencia/firefox-91.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "30bec0fa1b027f3dfe3255f214cfe2bc10b19346cc0ed9bd546d9ce63fe53de5"; + sha256 = "409b9e13038e26de3bf94e7a3a4d35606e378c9a4b07a6c51250a778f4f95cd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ca/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ca/firefox-91.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "33dbe31e5613ace4f58e5f748b58c7c6f9b0a2a192df660904d4c03a2f7faa0e"; + sha256 = "9b983cfbc1a3a46f8277927a5ddd73ad236fd5e29542d3e3b23708242f2ae241"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/cak/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/cak/firefox-91.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "26b995231e3c95b8189114f1682f975b4e6041cb99e081af99ac215e2ad23352"; + sha256 = "b4a4450d741e5bd3bbc5087377bbe4dda26af6ea10af5bf6286c26d09d02f3db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/cs/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/cs/firefox-91.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "946a570a68551772a1590fc69f006f9269a3e669b002dfa0c30ae036c47b52ea"; + sha256 = "d7dd456b77af0f5e98c55013e735140e578f81a402dcf0ab2b3971a9e1562ca9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/cy/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/cy/firefox-91.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "b5f2b8b412b149672646775c421d67f2b243d9fe16cabb3cd34e853b4ce2de8e"; + sha256 = "efee0853acfadd55dcc8a25e693cb7265a38c0ef29704b3eca0ba99036162f49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/da/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/da/firefox-91.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "263430400e8fc7e1177923df2dee3eeba05680250e96303f63c8a6c2f163a36b"; + sha256 = "3835e498f68a75b31f4c6b13eced98ac458df5d3c1acfd34f44f8959388ec57a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/de/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/de/firefox-91.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b90f12c6f4e09e2b8282bd87ad830932073bd41bece3f2309bc698491e4373ae"; + sha256 = "47c3b1cde4cd2a1e57b63ec2e0f8db0e1b393c61bfb3337371764df835527daa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/dsb/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/dsb/firefox-91.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e2bb197a3dd9864496e92f9280b2655e27cb4052e3c5ee17ea41b7387bff5a3e"; + sha256 = "8f3672728a49391be310bee1bfa6336735874369cd427d4f7073f833ddf54626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/el/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/el/firefox-91.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "4018eb187e3534142c5fe760a4d35657693950119ce1aea6d6a0fab7177cbbea"; + sha256 = "df6ded8d5abfb6f33c22c34578a3b12e991c1f64674a2b4b573cd1c682779400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/en-CA/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/en-CA/firefox-91.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3f52e42c0ca74036b65b0221eeceb382c7cf28aa63d70a6e26b7f0278da2086d"; + sha256 = "df5e90395044ef348d766fc9ef4792edc20b8befbaef0cc42794eeace47a0a9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/en-GB/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/en-GB/firefox-91.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7a0e416b48038d7b827ec90d3f5b3656d5099e35283e09f0f9c2833e337f76f4"; + sha256 = "eec39ef04bdc398fd9f6c2eeddcc4e8f85e46ec08be8f53e64564e41d39e111e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/en-US/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/en-US/firefox-91.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "754be9b9e175fc43f96827dcbd894ac539ab4f882d8d078a1a24a8c60cd78fb4"; + sha256 = "c52d82b5a73e37c5c80ccf4e206bb80b632bd835968e6bebc7b93c5f4a5acfc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/eo/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/eo/firefox-91.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "99c612d0748e8980e80750ca1a0477872bbc8151a0703c69bc85fb603dea352d"; + sha256 = "e86dc36a4b14563e546e218589d74fe669083111d97df40b2ef35ad48d2c7309"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/es-AR/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-AR/firefox-91.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "49db8ffbc5c396d7eff390c0bd856ce9f9d38f878584beb8dde90476aaa70fb1"; + sha256 = "891374037a1093cb33739e55188b5fdfc54ecf3f9bf95d3eb9f700d388bc9632"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/es-CL/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-CL/firefox-91.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9fdcd97e6301c2f650a5354b7284705be071f5736c7d356d19dfb097f033f5e2"; + sha256 = "0063ed2e227e579591f1b7fc4c7d9acdb6667323d2110e4605402021eea117b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/es-ES/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-ES/firefox-91.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "ec2fadaeb087f75172531077ed034a230d57385a05d170bdc0b1f0e5ccc86b59"; + sha256 = "d8b20f06f8caa991596222ca189660cc3b4c3fc86148d85d26223425c270c4df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/es-MX/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-MX/firefox-91.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "c268d56c1409c60a1d502b524391ea8cfc221e217cdd9e933b5af785486aaa36"; + sha256 = "8d87de0de6e6a79065f22fef7e17b5bda5fe5644160d37444a4144d26fd6c303"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/et/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/et/firefox-91.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "e22530e22d58a82b0efc6f7f97b48e6b3a36164b65a7e7851fde4b92f6cfe63c"; + sha256 = "f65daaa770f2a0f0f7470b4f4ab6db20d41f107afb3431b2b08ebffb45cfcc6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/eu/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/eu/firefox-91.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "0602c61dc05853c4622cd420c93d85d70931ef4dfa240d9d5a342cc199159762"; + sha256 = "ff1cc7c354dcb3ce8aad5080bc88b33a4282fb678f888a8bde8bd5d8eb53867a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/fa/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fa/firefox-91.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6c77f6673f0b4745596be16273fd126f53798b3ef4c118f6602623f09452c317"; + sha256 = "71cc81129e19253a465f3fa1a5cc22795c9496f6f4e063b39cd5fb4f8504e7a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ff/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ff/firefox-91.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "c492aeb925c7ca214fe74513d4296f6ed8774098709d2383101ff29274f2ef94"; + sha256 = "b2e919a9379d24ce148ac5b1ac5dc498693f3a8f502b24479fd0876403c1567c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/fi/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fi/firefox-91.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "164d5579dbb14ad0335afce5fc99ab18e433f7c75920a6836d390eb67b8ac743"; + sha256 = "cd1729d0e2885304ac6f6fdb4918617f4614754932885ec43f0b9988d647cf3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/fr/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fr/firefox-91.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2b0f336fbb9496ee28d00114c4e6492663573a5e4fad4f1e40ab3a6a498645ea"; + sha256 = "e06c6d6b2e2dda4ec6c3d12798ec2aa119395e9ac252ee5ea8626024810d05f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/fy-NL/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fy-NL/firefox-91.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ebae965bb9faafe4aaa781bc63551a9e885e77501e39aa8db81a03537e802777"; + sha256 = "8f6db800766e9c3e6baaebd5ef5c32fedc3d478837cdb52e734dd9b948587696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ga-IE/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ga-IE/firefox-91.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "8b4640af9b69620b0dcbc07eb677624bfb0c210e8204ac421e5efb87ea8c5aed"; + sha256 = "25cdaaa65a20a41e6a1918539106ab5a5c788e24f6afcbc6458bb57faa667948"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/gd/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gd/firefox-91.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "336df4ba9eb7773eb59e1b437f9cea47ddcb25114f26982402792fae9fb6bc8a"; + sha256 = "560fd9ee5c8cdbb080207793bd14d6d9502a873a2a2b06fa447bf290f30391b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/gl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gl/firefox-91.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "92917b113b9cb7d383e97fa542cedadc6cb37fcaf9f861bb68eafcf46faaf23a"; + sha256 = "4c4bba4dbda0515ac035ee2c3878866ea3f6cb01204f761dd0c356bf95c3c238"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/gn/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gn/firefox-91.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "8dace2530483ab4774e1d5377ec11b36b71a7af393ca6155db2acf223c74c433"; + sha256 = "71d364c0113dc2e6d39347e898143f04b176a28ec69d19a0061737b903a06f80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/gu-IN/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gu-IN/firefox-91.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "982fa9b19585a12c53436eb4c76e75b0836b8ee55326bee0ca5d979af66094a4"; + sha256 = "9a9c106439dcbf7fcfb19a0af682a3a9e755fc568a571c738fb4e385f009a392"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/he/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/he/firefox-91.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b74efdb1e0167e9b5fe3849df91b252a3958f308dffcf3d055840832b2f5bbed"; + sha256 = "4d0aabd64820d3e2fca5f7de902a03aed79a6b4d38c4a744cb463d6814b14df9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/hi-IN/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hi-IN/firefox-91.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4f51b08ce8029f1e4a7f9fd25c949255042b0f7dbd5a0a85800e1e914a56cf1e"; + sha256 = "17d92c11c08c164839d9f959c81847b300cfe2542e48e7bd259cbd59b6be3ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/hr/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hr/firefox-91.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "48bf30b5955b2232ed55a9c67450662a3f378fe1e2c9e994ce68759540718d81"; + sha256 = "f22b580069c1ad3b5e29e59a2fe0e19b7e6467ae6ce55a3ad34b8ce27a1680bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/hsb/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hsb/firefox-91.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "cd4a5758c4073b7d18da174b47e81a82ef828ef5791f49d47ee58fe43426964d"; + sha256 = "2feb509657b6889eef6d5398468987c2ce06972f25b4c0efa455be732f2d2793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/hu/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hu/firefox-91.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "012beccd9fbb7c561b8cbdaedeefbb2bde6ec5fee18208d9794ad04cecd25c6e"; + sha256 = "31c96f8f03df5f128146ff071b25ea0ed13f217eefeb061f9a8bd083d5f0faa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/hy-AM/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hy-AM/firefox-91.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "512f6679b880bc5b1f4f98dd74ee255f94592692ca7987a172bef20ac2722edd"; + sha256 = "3cae4b4ce1aaededb6e1657b4c608967fd7b502fd1d5d73fd8721aef9bda1f67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ia/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ia/firefox-91.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "6d252ec4bcc81917fe61210c60deb87b187b13b6957d07d169339f31bae57ef9"; + sha256 = "048d341b1a3f95b9a131297a5473ccf2d056e8312ff2dbebba41d0ee6159cdca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/id/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/id/firefox-91.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "80b41c75ba207724bb55521a24292713862057cc1b05056dedf135c3e368346b"; + sha256 = "3110e13e4552b1826cc842d241668f7070898657610613c446c4bb0ce231af7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/is/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/is/firefox-91.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "be35a2937d4fbab20386574d27dd714704338e313f6c4232005e50aedc52e75d"; + sha256 = "f4c929aabe2ed2ac02591f4fa556286c51aca294aed93d9db8b29b5e960c16f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/it/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/it/firefox-91.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "d05ecd1685954054601c848f59af446bdb5b3b1399d20421033448122e093792"; + sha256 = "2ce8cc3cb29f5db5701fe54b318c501c4b967c877b258524ba648ac3ffe89e23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ja/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ja/firefox-91.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a71d96f6b3d2e30d422a74b6656b78eb0d43be59c6e46db76bf6c8cae6e65394"; + sha256 = "2bc50a7af5f03393ec0f83fc7eb4ed8858d2c005f9122cc8f3e8a377f7e8ba50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ka/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ka/firefox-91.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "19629e7c91f887b4e5cb2a9a93ab2002d7409787a7e84ece914cb969724e9c7e"; + sha256 = "c806da6a0d3c2039d5551f25a3a4c506ddf0a2edadac4dee220040693b9547ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/kab/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/kab/firefox-91.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "36e9bcae974500da350a1f60114845a127862f972ff435378c45d18d950957d7"; + sha256 = "769a5d8ea726d9a3477d9771302f4f3157ef314012733c31c4852bb4d38782fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/kk/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/kk/firefox-91.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "e19473a3dac5f41bf02b783427161c933257d68d24bddef0381354cd86ad5151"; + sha256 = "0dfb08c348c0be7bc9f1d8ad603081e360d1bef8c91082053edbea313b429082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/km/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/km/firefox-91.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "7f1fc2bd4fafa346838fec02a64bafdf2cbde52550c2b28bc7190c35e72de939"; + sha256 = "09441c111989e0655df16a870cd91a7f445157385e1e7839588ddf6f484eae30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/kn/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/kn/firefox-91.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "3b27a6fe3eb654bf20d7b49e9deef1cd2dd44537b0d1de7b2ad7c63dbb2ad133"; + sha256 = "442cda23ed74ff049963a244b3b31d4971b656b3324ea734e31b3532ff8c5d02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ko/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ko/firefox-91.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "40e8972a4b20e41ad4a24dc75064748e508e30bd7a33f9926cfa0693348f6222"; + sha256 = "accb55d70f8853dd23c32a668f887105bdd924ea717f0b75a1dcc70f347a8f2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/lij/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/lij/firefox-91.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "7a7db77418d2dab962d26107cf54cb8d1eb743fb5324bb507016dd46c84f4fed"; + sha256 = "77b93a3e83c69940033e24e30f7e78069e39fb086d45d29aa8452e298d4044fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/lt/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/lt/firefox-91.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "094fe53032aa6df3ded2e4eb49d56588267f02c3378054ede51aa221d9d69dbf"; + sha256 = "0ff4fdbbf1429bddb00236677ebc77fe6a344e509309f794e87a6d31ff1e34e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/lv/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/lv/firefox-91.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "668b677734c550c7e707f9e3b9c38e4c65d800fa902d1ee3d8c357116acf2700"; + sha256 = "212639e9ccf7f1e8b325b7bb71616d6afdee13816f7592f920d86a10de2e555d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/mk/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/mk/firefox-91.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "10c9760c2eea05c9d1187e3575cf80eee1be3b8eb40a6d401d924a6528ae1359"; + sha256 = "c9f262672128a6a1e7b7e789426d827e8eba5743ed412af337b0eb9bdbe13556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/mr/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/mr/firefox-91.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "bb1ad7d9dc90237c3bf914c33576024575c634fbdf682e0002a4d1edee011c7b"; + sha256 = "075d22d57c9bcd32e5d2e3487c07e1da0f49a0532b2aeff4563d3ac771de2b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ms/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ms/firefox-91.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "49b4e751d17b6ca9f13d632b6b0e8815bfa503d28ddb22aab62b2247c91aced7"; + sha256 = "43d32b01e03f786afea4738b86a1df500840874b3226500b1fc3c6149c5824a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/my/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/my/firefox-91.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "d546e7449ea8e68b948ebf33d9bf94fbce2f62f4b273830fe5f1e8228bbcf339"; + sha256 = "ebc3ea9616a9389c1c7fc922062205ad5a4f5a12edf5b440f618d215b77d0148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/nb-NO/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/nb-NO/firefox-91.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "954bc07f32b59fccca996050240dcdfa76240b7f01929665431935834e50e170"; + sha256 = "5c33d8f9f6975bec07e3b7fecd30fad3d4b61886d0e35831517f383c08c97401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ne-NP/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ne-NP/firefox-91.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ebf70abdcea48b9c9a4e0b5d5f4a80568a1c9215c93482a555eff5aacceba0ab"; + sha256 = "9aa9d913fc5913f4b45f208a5b81a4b5e370048861635ac67403035b6d91f78d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/nl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/nl/firefox-91.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "1f780554975799773e5a8f158b50b188362f94174916a4e1f4ac005ac3538a6a"; + sha256 = "79da9079bd4b3e4f4f6578a0435aca36f49b28ad50cf8e251f02ef2885265d87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/nn-NO/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/nn-NO/firefox-91.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "0da1e744122f745522960dae64933f322410ab0439043da9d5785bd8d3af058a"; + sha256 = "7a4f34f09f995bd71191690af56c7fc78312114988322f24071f9ba496804e20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/oc/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/oc/firefox-91.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "14ff5cd790fba8dee449d7754c3c629db28d35e5ac8d0bae2880f11fdcfc1de1"; + sha256 = "c1e139347a48a19c6bded097e1b841e38005044904d6d5954e3b9a01ffeb8983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/pa-IN/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pa-IN/firefox-91.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "86366ec7227c08a72d9ba296bbc42401ce2c9cb6f5ed314d0a2eb686f9ec11fb"; + sha256 = "f8b22eb93e9f0c4882d5973ad1dde6e76d7a62139114c0a14e2aa1e12a89133b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/pl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pl/firefox-91.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a1bec4f47cdef2cfd1c4253a47d1512b69aa5ae1b1f4f88f277387e983b4a2da"; + sha256 = "b6f1b36c9ae6fe988dce91b5f1830a27e9f7317e4e97dfcd197b1991661543a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/pt-BR/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pt-BR/firefox-91.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f553fb4a38dc3c71ee1a37e56aa1719639ad9c83da5bf2c2757e73a362ca50f3"; + sha256 = "9ae38b8755dcb1fdaccc288e2ed558cf271a3389fcf26f99ea9acf79bb33b472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/pt-PT/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pt-PT/firefox-91.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6194d2616f2fe18b98c107b178014c65bc74c6c00cc744cd97ece3dbc844bb9b"; + sha256 = "c6395580e5420f73ca0e29f3219e2cf9c83752f2cbc035fc80627770cb8a7f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/rm/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/rm/firefox-91.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "bf0c9adbd0a0ca0a00414e6ccbb09ef53a722d4cb5640584c95d40422a67a159"; + sha256 = "acb62c5a011782273f8129f81e3b3692c86f2ccc54825e4886721a80e9210363"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ro/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ro/firefox-91.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "20a69f3723937342eb53cfaa47fcb18ac50c0dfa641052fd3cc113af1804b508"; + sha256 = "95b4f0f29001c364ecca9df0fa3d2550400eace9730867325547880bd0eec72a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ru/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ru/firefox-91.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "67ee468fed1c544aedb4e11aa217909e1dbf804f720b6899d9ccec396577e229"; + sha256 = "f53c5d8a14b56cba20fe1aeb77074e2a0758c9592a780ba3ad630401791eba0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sco/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sco/firefox-91.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "70c6309032e919f4b206f6de2b2cd233583422be15510b0fa6b1d1ed28444fec"; + sha256 = "a475a8321aaa81ba293ff9c0ca527b198810ded5f6cb3c2b54009abf89118018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/si/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/si/firefox-91.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "d102448eba1055c231ca8983fcbf0cfb57da9f7a43addedcdae44858ff387643"; + sha256 = "43c6acf3fab766bcf46507fe92ad7af808740996303336d56e296848372c3864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sk/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sk/firefox-91.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4cc3e5e2c929a5b3775439509a4f917e85962bd9646397ca1c4d41eea83d6284"; + sha256 = "d0e01e60c6dff585a91247f186ddcef007761e44debac2034266a0d8518c3ed9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sl/firefox-91.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ec8d97a98bf3c72a1dcef53cc09ea13d39f6ec6b60e1fc24ffaa3fdfeccbdc47"; + sha256 = "4881245b4d9185fb1997a5ce3563f18aef526f2e5d04c407b9c6257ae8ac6251"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/son/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/son/firefox-91.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "c5452583e32a70cd19f40572bce96f18ff37dd09b2116567c8b2867d0a2a2d10"; + sha256 = "df87da0870a0ffaffb37be3f52df6894a22904d0f0d234714d8a8667e1cf0427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sq/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sq/firefox-91.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "a6d43eef8633ea4cb94307b40ccd76abffc5b59f28d42eead7cbcc9bb9e4bade"; + sha256 = "19ae236fb43e538621ef65399628d74baddf3dae4b4cb287d2c5cb1ec987fa9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sr/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sr/firefox-91.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "442905f80fd06bc19e3422ffe13c1acc98ab86681f1a829c0fc04bbb81f1f757"; + sha256 = "23833e50ef5e8d22b1442f7c564aaa71a7b4c8fdd0907c3688938db8b850eee6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sv-SE/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sv-SE/firefox-91.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9943b50c9771a0fd7aca1c3197f8d1f4ceae0fbe2e48f636652c68748bf86826"; + sha256 = "f1d21b5b94a95a9332892eec75da1bd2f0cc2a75c810e047369ac573c9d179e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/szl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/szl/firefox-91.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "5de3407570162f1a458aef71f279c0b6a4f496b3e293a7b18d210e154ecafe1d"; + sha256 = "12d53befb5c5ed158e32cfd3b8a4ee0b1a839b9303ea6615c8dd9a92703f17b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ta/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ta/firefox-91.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "5b8185d511d8d40c8cea1fa542578fda89e3ae6c80b43a64d4942339968e2349"; + sha256 = "33e905284d3f7f5002387dc769078e6cfc591484fc7377ddcbd3e90f3acd32f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/te/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/te/firefox-91.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "2afc3041ba9ef4ba74a0a1abd44b5e71270917a8f640dced04dad44da253f787"; + sha256 = "bf2cca68f09e2773a6755a54ad30905a7cba8cd873f8e27a835bbc3514d9471b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/th/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/th/firefox-91.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4cd235f4b74d7e35bcd714acd2c9823ef790b40e77335faef7d024ddb9791adc"; + sha256 = "2adf3dfe859661dc8ce44a70f72c2f050baefb47b4b9fba50d752006aa4accb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/tl/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/tl/firefox-91.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "885f1ce73b9633dca06ec91332d88e3783ed8a699cd9a56346c7d2a550511d80"; + sha256 = "065f7448133e1b07135be3f1c08550e7d8ae3392b491b20945a2c6c8b962163a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/tr/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/tr/firefox-91.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "485dbbf6ba54385ac605b627dd63adc1dd0b1f10b8e34f37b1aadc115308bf17"; + sha256 = "52e01277d8c8681929fa9fe23a5c70243cfecc140056fcc6645b34a6f52e54c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/trs/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/trs/firefox-91.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "24d04d03c8e936ce614de375410c5da867995688118e469543fc66dafe6e1532"; + sha256 = "a19a59cd21872e40eb5eb51c7999dc8a585e074140053090f6c328d68747a159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/uk/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/uk/firefox-91.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "beb3566a07a5f1e1acd2aea6d78fc5b970929d7eab51a10d870866da916095c7"; + sha256 = "08ae68dff91152a44f79d54c65e6f40b396209755da22652740b02fa70b5f624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ur/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ur/firefox-91.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "39cbcffe0a7c4f490ff26366c2bdaec7b432ba4c6d00321141d05637a723b8c7"; + sha256 = "4a6d9e0b452e553b9badf05c0f6f8e3603c5d9c4db016d8e07d3b1b1de136455"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/uz/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/uz/firefox-91.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "511fc678e43522fc8c5f33ea4ab9d1a06cf0b8946c7a520ec774e159be00861f"; + sha256 = "d733aec122abd6ec71a17cacaed75479da23f0300d167aa470c6f7982a469150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/vi/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/vi/firefox-91.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "637d3743e5a853a54872053f97b91ac664d303fab76b0d6553a4c5fe3817495c"; + sha256 = "612c5c0e4fc556c33e37dc8ba5792c0880293d6881d95b2567d9b1932e1d151e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/xh/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/xh/firefox-91.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "10594aaaf2b2fa1a71c90b0b0d900978d33bfdd4db00b133a37b4edb4a13c8e9"; + sha256 = "df79b82dae25a4d36d92460be4a3e02eae683793258f2a53322391a7866b32d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/zh-CN/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/zh-CN/firefox-91.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c6cb4c1d22d380b86910a5ec4971e1d40fd77669be9e16caf1e3962e80f3100d"; + sha256 = "416e5869fbb13391ac7e78f0477fecc8a00527dbc3612bc35d3c8d4b9686bd48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/zh-TW/firefox-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/zh-TW/firefox-91.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "79722e27df9badbac931d25f77b8d241d5568a34a586d0e34099ce3355677027"; + sha256 = "5d2ce39f7347216e1358f002f94d6fb3a52707412403b0e6d757de92bf9d3f72"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4bbb98d7a834b..70b8beb6fcea7 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "91.0.1"; + version = "91.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "9388789bfe3dca596542b082d0eca7b1a6d1bbbf69eb97cc445f563d1a5ff0c9b530f3be02ee290805e311b0fcb392a4f5341e9f256d9764a787b43b232bdf67"; + sha512 = "82084799524db6661d97d9942a01ca9edec2fae6b503c9dd2d79fca78bfef4ee0a888e5f5cf4cfa2b91d9c9392658bb8218bae2b9bec0fbcacfe73a174a4dbe7"; }; meta = { diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 389be11e506cc..8487afc208ddc 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -65,8 +65,8 @@ rec { }; kops_1_21 = mkKops rec { - version = "1.21.0"; - sha256 = "sha256-T2i3qpg3GC7yaYCGrN1V5XXrUyT+Ce9Q4aV00gQJ7gM="; + version = "1.21.1"; + sha256 = "sha256-/C/fllgfAovHuyGRY+LM09bsUpYdA8zDw1w0b9HnlBc="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 4966c42b9a42f..62034a39bbc0d 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.9"; - sha256 = "0ml6l5xq1310ib5zqfdwlxmsmhpc5ybd05z7pc6zgxbma1brxdv4"; + version = "1.0.10"; + sha256 = "1yd4j35dmxzg9qapqyq3g3hnhxi5c4f57q43xbim8255bjyn94f0"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix index e9c4ff8c96790..3d34331b57d18 100644 --- a/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -6,7 +6,7 @@ callPackage ./genericModule.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.1.3"; - sha256 = "0jpc8ff56k9q2kv9l86y3p8h3gqbvx6amvs0cw8sp4i7dqd2ihz2"; - vendorSha256 = "0az4gr7292lfr5wrwbkdknrigqm15lkbnf5mh517hl3yzv4pb8yr"; + version = "1.1.4"; + sha256 = "182f3sxw751s8qg16vbssplhl92i9gshgzvflwwvnxraz2795y7l"; + vendorSha256 = "1nddknnsvb05sapbj1c52cv2fmibvdg48f88malxqblzw33wfziq"; } diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 4dd59aa5eee3f..5251b07d8d9fc 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.8.1", + "version": "1.8.2", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -57,7 +57,7 @@ "allchange": "^1.0.0", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "^13.1.7", + "electron": "^13.1.9", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", @@ -83,7 +83,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "13.1.6", + "electronVersion": "13.1.9", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 7af8cc7dc2fa2..12ec78a6af1c6 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -2002,11 +2002,11 @@ }; } { - name = "electron___electron_13.1.7.tgz"; + name = "electron___electron_13.1.9.tgz"; path = fetchurl { - name = "electron___electron_13.1.7.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.1.7.tgz"; - sha1 = "7e17f5c93a8d182a2a486884fed3dc34ab101be9"; + name = "electron___electron_13.1.9.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.1.9.tgz"; + sha1 = "668e2632b81e9fa21edfd32876282d3e2ff7fd76"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index a82fe8ce344b2..1cd7921cb9bda 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -19,12 +19,12 @@ let executableName = "element-desktop"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-FIKbyfnRuHBbmtjwxNC//n5UiGTCQNr+PeiZEi3+RGI="; + sha256 = "sha256-6DPMfx3LF45YWn2do02zDMLYZGBgBrOMJx3XBAO0ZyM="; }; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index a40ccf49f773d..fdea75c78af71 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-C2oWYpPxMeSgGKyjUe6Ih13ggZliN4bmAX5cakzW1u8="; + sha256 = "sha256-SgVxYPmdgFn6Nll1a6b1Sn2H5I0Vkjorn3gA9d5FamQ="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 4eb536256240a..7db77fbc31e31 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, dpkg , alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg -, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: +, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }: let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.69.0.77"; + version = "8.75.0.140"; rpath = lib.makeLibraryPath [ alsa-lib @@ -45,6 +45,7 @@ let libdrm mesa libxkbcommon + libxshmfence xorg.libxkbfile xorg.libX11 xorg.libXcomposite @@ -68,7 +69,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "PaqlPp+BRS0cH7XI4x1/5HqYti63rQThmTtPaghIQH0="; + sha256 = "sha256-z3xsl53CSJthSd/BMbMD7RdYQ4z9oI/Rb9jUvd82H4E="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; @@ -121,7 +122,7 @@ in stdenv.mkDerivation { description = "Linux client for skype"; homepage = "https://www.skype.com"; license = licenses.unfree; - maintainers = with lib.maintainers; [ panaeon jraygauthier ]; + maintainers = with maintainers; [ panaeon jraygauthier ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index 75e6924db9c52..121a65f941c84 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -# Alphabetic ordering below + # Alphabetic ordering below , alsa-lib , at-spi2-atk , atk @@ -59,7 +59,7 @@ let let version = "v20201206-cjk"; in - "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf"; + "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf"; sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4="; }; @@ -70,13 +70,14 @@ let pulseaudio ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "6.2.0"; + version = "6.3.1"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-nKmWxaVVul/rGDIh3u9zCpKu7U0nmrntFFf96xQyzdg="; + sha256 = "sha256-WCjCljA7yB7Zm/I4rDZnfgaUQpDUKwbUvL7hkIG8cVM="; }; nativeBuildInputs = [ @@ -160,6 +161,8 @@ in stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${runtimeLibs}" ) ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; homepage = "https://www.onlyoffice.com/"; diff --git a/pkgs/applications/office/onlyoffice-bin/update.sh b/pkgs/applications/office/onlyoffice-bin/update.sh new file mode 100644 index 0000000000000..d7b0bc106fa2d --- /dev/null +++ b/pkgs/applications/office/onlyoffice-bin/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +version="$(curl -sL "https://api.github.com/repos/ONLYOFFICE/DesktopEditors/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" +update-source-version onlyoffice-bin "$version" diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 1e1fd0a426160..3ba21cf6c8be5 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -13,19 +13,41 @@ let # Fetch a diff between `base` and `rev` on sage's git server. # Used to fetch trac tickets by setting the `base` to the last release and the # `rev` to the last commit of the ticket. - fetchSageDiff = { base, name, rev, sha256, ...}@args: ( + fetchSageDiff = { base, name, rev, sha256, squashed ? false, ...}@args: ( fetchpatch ({ inherit name sha256; - # We used to use - # "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}" - # but the former way does not squash multiple patches together. - url = "https://github.com/sagemath/sage/compare/${base}...${rev}.diff"; + # There are three places to get changes from: + # + # 1) From Sage's Trac. Contains all release tags (like "9.4") and all developer + # branches (wip patches from tickets), but exports each commit as a separate + # patch, so merge commits can lead to conflicts. Used if squashed == false. + # + # 2) From GitHub's sagemath/sage repo. This lets us use a GH feature that allows + # us to choose between a .patch file, with one patch per commit, or a .diff file, + # which squashes all commits into a single diff. This is used if squashed == + # true. This repo has all release tags. However, it has no developer branches, so + # this option can't be used if a change wasn't yet shipped in a (possibly beta) + # release. + # + # 3) From GitHub's sagemath/sagetrac-mirror repo. Mirrors all developer branches, + # but has no release tags. The only use case not covered by 1 or 2 is when we need + # to apply a patch from an open ticket that contains merge commits. + # + # Item 3 could cover all use cases if the sagemath/sagetrack-mirror repo had + # release tags, but it requires a sha instead of a release number in "base", which + # is inconvenient. + urls = if squashed + then [ + "https://github.com/sagemath/sage/compare/${base}...${rev}.diff" + "https://github.com/sagemath/sagetrac-mirror/compare/${base}...${rev}.diff" + ] + else [ "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}" ]; # We don't care about sage's own build system (which builds all its dependencies). # Exclude build system changes to avoid conflicts. excludes = [ "build/*" ]; - } // builtins.removeAttrs args [ "rev" "base" "sha256" ]) + } // builtins.removeAttrs args [ "rev" "base" "sha256" "squashed" ]) ); in stdenv.mkDerivation rec { @@ -80,6 +102,14 @@ stdenv.mkDerivation rec { # now set the cache dir to be within the .sage directory. This is not # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch + + # https://trac.sagemath.org/ticket/32305 + (fetchSageDiff { + base = "9.4"; + name = "networkx-2.6-upgrade.patch"; + rev = "9808325853ba9eb035115e5b056305a1c9d362a0"; + sha256 = "sha256-gJSqycCtbAVr5qnVEbHFUvIuTOvaxFIeffpzd6nH4DE="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/version-management/danger-gitlab/Gemfile b/pkgs/applications/version-management/danger-gitlab/Gemfile new file mode 100644 index 0000000000000..7c95dac9dd35b --- /dev/null +++ b/pkgs/applications/version-management/danger-gitlab/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'danger-gitlab' diff --git a/pkgs/applications/version-management/danger-gitlab/Gemfile.lock b/pkgs/applications/version-management/danger-gitlab/Gemfile.lock new file mode 100644 index 0000000000000..d68ec3108ca25 --- /dev/null +++ b/pkgs/applications/version-management/danger-gitlab/Gemfile.lock @@ -0,0 +1,92 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + claide (1.0.3) + claide-plugins (0.9.2) + cork + nap + open4 (~> 1.3) + colored2 (3.1.2) + cork (0.3.0) + colored2 (~> 3.1) + danger (8.3.1) + claide (~> 1.0) + claide-plugins (>= 0.9.2) + colored2 (~> 3.1) + cork (~> 0.1) + faraday (>= 0.9.0, < 2.0) + faraday-http-cache (~> 2.0) + git (~> 1.7) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.0) + no_proxy_fix + octokit (~> 4.7) + terminal-table (>= 1, < 4) + danger-gitlab (8.0.0) + danger + gitlab (~> 4.2, >= 4.2.0) + faraday (1.7.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-http-cache (2.2.0) + faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + git (1.9.1) + rchardet (~> 1.8) + gitlab (4.17.0) + httparty (~> 0.18) + terminal-table (~> 1.5, >= 1.5.1) + httparty (0.18.1) + mime-types (~> 3.0) + multi_xml (>= 0.5.2) + kramdown (2.3.1) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.0704) + multi_xml (0.6.0) + multipart-post (2.1.1) + nap (1.1.0) + no_proxy_fix (0.1.2) + octokit (4.21.0) + faraday (>= 0.9) + sawyer (~> 0.8.0, >= 0.5.3) + open4 (1.3.4) + public_suffix (4.0.6) + rchardet (1.8.0) + rexml (3.2.5) + ruby2_keywords (0.0.5) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.7.0) + +PLATFORMS + ruby + +DEPENDENCIES + danger-gitlab + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/applications/version-management/danger-gitlab/default.nix b/pkgs/applications/version-management/danger-gitlab/default.nix new file mode 100644 index 0000000000000..e994739008d39 --- /dev/null +++ b/pkgs/applications/version-management/danger-gitlab/default.nix @@ -0,0 +1,14 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "danger-gitlab"; + gemdir = ./.; + exes = [ "danger" ]; + + meta = with lib; { + description = "A gem that exists to ensure all dependencies are set up for Danger with GitLab"; + homepage = "https://github.com/danger/danger-gitlab-gem"; + license = licenses.mit; + maintainers = teams.serokell.members; + }; +} diff --git a/pkgs/applications/version-management/danger-gitlab/gemset.nix b/pkgs/applications/version-management/danger-gitlab/gemset.nix new file mode 100644 index 0000000000000..299716a33bd8e --- /dev/null +++ b/pkgs/applications/version-management/danger-gitlab/gemset.nix @@ -0,0 +1,388 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + type = "gem"; + }; + version = "2.8.0"; + }; + claide = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + type = "gem"; + }; + version = "1.0.3"; + }; + claide-plugins = { + dependencies = ["cork" "nap" "open4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bhw5j985qs48v217gnzva31rw5qvkf7qj8mhp73pcks0sy7isn7"; + type = "gem"; + }; + version = "0.9.2"; + }; + colored2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + cork = { + dependencies = ["colored2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g6l780z1nj4s3jr11ipwcj8pjbibvli82my396m3y32w98ar850"; + type = "gem"; + }; + version = "0.3.0"; + }; + danger = { + dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12nmycrlwr8ca2s0fx76k81gjw12iz15k1n0qanszv5d4l1ykj2l"; + type = "gem"; + }; + version = "8.3.1"; + }; + danger-gitlab = { + dependencies = ["danger" "gitlab"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a530kx5s5rbx5yx3jqay56lkksqh0yj468hcpg16faiyv8dfza9"; + type = "gem"; + }; + version = "8.0.0"; + }; + faraday = { + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r6ik2yvsbx6jj30vck32da2bbvj4m0gf4jhp09vr75i1d6jzfvb"; + type = "gem"; + }; + version = "1.7.0"; + }; + faraday-em_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-http-cache = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7"; + type = "gem"; + }; + version = "2.2.0"; + }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; + git = { + dependencies = ["rchardet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s6426k24ph44kbx1qb16ciar170iczs8ivyl29ckin2ygmrrlvm"; + type = "gem"; + }; + version = "1.9.1"; + }; + gitlab = { + dependencies = ["httparty" "terminal-table"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00p8z8sxk78zik2dwdhflkvaynp5ximy2xc8cw6bz93gkr1xy8n3"; + type = "gem"; + }; + version = "4.17.0"; + }; + httparty = { + dependencies = ["mime-types" "multi_xml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17gpnbf2a7xkvsy20jig3ljvx8hl5520rqm9pffj2jrliq1yi3w7"; + type = "gem"; + }; + version = "0.18.1"; + }; + kramdown = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar"; + type = "gem"; + }; + version = "2.3.1"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + type = "gem"; + }; + version = "1.1.0"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy"; + type = "gem"; + }; + version = "3.2021.0704"; + }; + multi_xml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + type = "gem"; + }; + version = "0.6.0"; + }; + multipart-post = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + version = "2.1.1"; + }; + nap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll"; + type = "gem"; + }; + version = "1.1.0"; + }; + no_proxy_fix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "006dmdb640v1kq0sll3dnlwj1b0kpf3i1p27ygyffv8lpcqlr6sf"; + type = "gem"; + }; + version = "0.1.2"; + }; + octokit = { + dependencies = ["faraday" "sawyer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ak64rb48d8z98nw6q70r6i0i3ivv61iqla40ss5l79491qfnn27"; + type = "gem"; + }; + version = "4.21.0"; + }; + open4 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; + type = "gem"; + }; + version = "1.3.4"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + rchardet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; + type = "gem"; + }; + version = "1.8.0"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + sawyer = { + dependencies = ["addressable" "faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + type = "gem"; + }; + version = "0.8.2"; + }; + terminal-table = { + dependencies = ["unicode-display_width"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + type = "gem"; + }; + version = "1.7.0"; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index c80db8ee9582d..0afcd8400c7b0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -2,9 +2,13 @@ , coreutils , git +, libiconv , ncurses , rustPlatform , sqlite +, stdenv +, Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -33,6 +37,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses sqlite + ] ++ lib.optionals (stdenv.isDarwin) [ + Security + SystemConfiguration + libiconv ]; preCheck = '' @@ -44,6 +52,6 @@ rustPlatform.buildRustPackage rec { description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history"; homepage = "https://github.com/arxanas/git-branchless"; license = licenses.asl20; - maintainers = with maintainers; [ nh2 ]; + maintainers = with maintainers; [ msfjarvis nh2 ]; }; } diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 985814a0a132f..0a16bfc8842b5 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -8,6 +8,8 @@ , wrapGAppsHook , libhandy , libxkbcommon +, libgudev +, callaudiod , pulseaudio , glib , gtk3 @@ -24,27 +26,20 @@ , networkmanager , polkit , libsecret -, writeText }: -let - gvc = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libgnome-volume-control"; - rev = "ae1a34aafce7026b8c0f65a43c9192d756fe1057"; - sha256 = "0a4qh5pgyjki904qf7qmvqz2ksxb0p8xhgl2aixfbhixn0pw6saw"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "phosh"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "048g5sp9jgfiwq6n8my4msm7wy3pdhbg0wxqxvps4m8qf8wa7ffq"; + fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects + sha256 = "sha256-dKQK4mGe/dvNlca/XMDeq1Q4dH/WBF/rtiUh8RssF5c="; }; nativeBuildInputs = [ @@ -60,6 +55,8 @@ in stdenv.mkDerivation rec { libhandy libsecret libxkbcommon + libgudev + callaudiod pulseaudio glib gcr @@ -86,11 +83,6 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ]; - postUnpack = '' - rmdir $sourceRoot/subprojects/gvc - ln -s ${gvc} $sourceRoot/subprojects/gvc - ''; - postPatch = '' chmod +x build-aux/post_install.py patchShebangs build-aux/post_install.py @@ -128,9 +120,9 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A pure Wayland shell prototype for GNOME on mobile devices"; - homepage = "https://source.puri.sm/Librem5/phosh"; + homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ archseer jtojnar masipcat zhaofengli ]; + maintainers = with maintainers; [ jtojnar masipcat zhaofengli ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 47903bb2276e6..218b2a4fefd25 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -1,29 +1,51 @@ -{ lib, stdenv, fetchurl, libX11, xorgproto }: +{ autoreconfHook +, docbook_xml_dtd_44 +, docbook-xsl-ns +, fetchFromGitHub +, lib +, libX11 +, libXpm +, libxslt +, stdenv +}: stdenv.mkDerivation rec { pname = "stalonetray"; - version = "0.8.3"; + version = "0.8.4"; - src = fetchurl { - url = "mirror://sourceforge/stalonetray/${pname}-${version}.tar.bz2"; - sha256 = "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n"; + src = fetchFromGitHub { + owner = "kolbusa"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-grxPqSYPLUstLIOKqzMActaSQ2ftYrjbalfR4HcPDRY="; }; - buildInputs = [ libX11 xorgproto ]; + preConfigure = + let + db_root = "${docbook-xsl-ns}/share/xml/docbook-xsl-ns"; + ac_str = "AC_SUBST(DOCBOOK_ROOT)"; + ac_str_sub = "DOCBOOK_ROOT=${db_root}; ${ac_str}"; + in + '' + substituteInPlace configure.ac --replace '${ac_str}' '${ac_str_sub}' + ''; + + nativeBuildInputs = [ + autoreconfHook + docbook-xsl-ns + docbook_xml_dtd_44 + libX11 + libXpm + libxslt + ]; hardeningDisable = [ "format" ]; meta = with lib; { description = "Stand alone tray"; - homepage = "http://stalonetray.sourceforge.net"; - license = licenses.gpl2; + homepage = "https://github.com/kolbusa/stalonetray"; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; }; - - passthru = { - updateInfo = { - downloadPage = "https://sourceforge.net/projects/stalonetray/files/"; - }; - }; } diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 8d0f9459c3b07..40ff8e2015438 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -27,23 +27,27 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + desktop-file-utils + gettext + glib + itstool + libxml2 meson ninja pkg-config + python3 vala - gettext - itstool - libxml2 - desktop-file-utils wrapGAppsHook - python3 + # Prevents “error: Package `libhandy-1' not found in specified Vala API + # directories or GObject-Introspection GIR directories” with strictDeps, + # even though it should only be a runtime dependency. + libhandy ]; buildInputs = [ gtk3 libhandy glib - gnome.adwaita-icon-theme ]; doCheck = true; diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index 7a76d4948e73f..d89ed3e0d49ff 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -1,66 +1,45 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , autoconf , automake , fontconfig -, gmp-static -, gperf , libX11 -, libpoly , perl , flex , bison , pkg-config -, itktcl -, incrtcl , tcl , tk -, verilog , xorg , yices , zlib , ghc -}: +, gmp-static +, verilog +, asciidoctor +, tex }: let - ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb split ])); + ghcWithPackages = ghc.withPackages (g: (with g; [ old-time regex-compat syb split ])); + in stdenv.mkDerivation rec { pname = "bluespec"; - version = "unstable-2021.03.29"; + version = "2021.07"; src = fetchFromGitHub { - owner = "B-Lang-org"; - repo = "bsc"; - rev = "00185f7960bd1bd5554a1167be9f37e1f18ac454"; - sha256 = "1bcdhql4cla137d8xr8m2h21dyxv0jpjpalpr5mgj2jxqfsmkbrn"; - }; + owner = "B-Lang-org"; + repo = "bsc"; + rev = version; + sha256 = "0gw8wyp65lpkyfhv3laazz9qypdl8qkp1j7cqp0gv11592a9p5qw"; + }; enableParallelBuilding = true; - patches = [ ./libstp_stub_makefile.patch ]; - - buildInputs = yices.buildInputs ++ [ - zlib - tcl tk - libX11 # tcltk - xorg.libXft - fontconfig - ]; - - nativeBuildInputs = [ - automake autoconf - perl - flex - bison - pkg-config - ghcWithPackages - ]; - - checkInputs = [ - verilog - ]; + outputs = [ "out" "doc" ]; + # https://github.com/B-Lang-org/bsc/pull/278 + patches = [ ./libstp_stub_makefile.patch ]; postUnpack = '' mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2 @@ -79,25 +58,65 @@ in stdenv.mkDerivation rec { substituteInPlace src/comp/Makefile \ --replace 'BINDDIR' 'BINDIR' \ --replace 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils' + # allow running bsc to bootstrap - export LD_LIBRARY_PATH=/build/source/inst/lib/SAT + export LD_LIBRARY_PATH=$PWD/inst/lib/SAT ''; + buildInputs = yices.buildInputs ++ [ + fontconfig + libX11 # tcltk + tcl + tk + xorg.libXft + zlib + ]; + + nativeBuildInputs = [ + automake + autoconf + asciidoctor + bison + flex + ghcWithPackages + perl + pkg-config + tex + ]; + makeFlags = [ + "release" "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices.src instead of the subrepo) "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12 "LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43 "STP_STUB=1" ]; - installPhase = "mv inst $out"; - doCheck = true; + checkInputs = [ + gmp-static + verilog + ]; + + checkTarget = "check-smoke"; + + installPhase = '' + mkdir -p $out + mv inst/bin $out + mv inst/lib $out + + # fragile, I know.. + mkdir -p $doc/share/doc/bsc + mv inst/README $doc/share/doc/bsc + mv inst/ReleaseNotes.* $doc/share/doc/bsc + mv inst/doc/*.pdf $doc/share/doc/bsc + ''; + meta = { description = "Toolchain for the Bluespec Hardware Definition Language"; - homepage = "https://github.com/B-Lang-org/bsc"; - license = lib.licenses.bsd3; + homepage = "https://github.com/B-Lang-org/bsc"; + license = lib.licenses.bsd3; platforms = [ "x86_64-linux" ]; # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 # aarch64 fails, as GHC fails with "ghc: could not execute: opt" diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index fec71dc46fdc5..0ef2e89f123a1 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "fstar"; - version = "2021.07.31"; + version = "2021.08.27"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "KZTmphpt8nYpOd8EReAZ6iIkS4uY3ZziKQ3A70BL/90="; + sha256 = "1bf5hrv2nv0ljvdf6jhk59lw1ds3j5qkkcylgxwakylw30g8rxqb"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { description = "ML-like functional programming language aimed at program verification"; homepage = "https://www.fstar-lang.org"; license = licenses.asl20; + changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md"; platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 74f5b2b7b395f..5639b2a4bb901 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -7,8 +7,7 @@ }: { -name ? "${attrs.pname}-${attrs.version}" - +pname , version # by default prefix `name` e.g. "lua5.2-${name}" @@ -60,7 +59,9 @@ name ? "${attrs.pname}-${attrs.version}" # The two above arguments have access to builder variables -- e.g. to $out # relative to srcRoot, path to the rockspec to use when using rocks -, rockspecFilename ? "../*.rockspec" +, rockspecFilename ? null +# relative to srcRoot, path to folder that contains the expected rockspec +, rockspecDir ? "." # must be set for packages that don't have a rock , knownRockspec ? null @@ -71,6 +72,9 @@ name ? "${attrs.pname}-${attrs.version}" # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. let + generatedRockspecFilename = "${rockspecDir}/${pname}-${version}.rockspec"; + + # TODO fix warnings "Couldn't load rockspec for ..." during manifest # construction -- from initial investigation, appears it will require # upstream luarocks changes to fix cleanly (during manifest construction, @@ -144,7 +148,7 @@ in toLuaModule ( lua.stdenv.mkDerivation ( builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariables"] // { - name = namePrefix + name; + name = namePrefix + pname + "-" + version; buildInputs = [ wrapLua lua.pkgs.luarocks ] ++ buildInputs @@ -159,20 +163,8 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab # @-patterns do not capture formal argument default values, so we need to # explicitly inherit this for it to be available as a shell variable in the # builder - inherit rockspecFilename; inherit rocksSubdir; - # enabled only for src.rock - setSourceRoot= let - name_only= lib.getName name; - in - lib.optionalString (knownRockspec == null) '' - # format is rockspec_basename/source_basename - # rockspec can set it via spec.source.dir - folder=$(find . -mindepth 2 -maxdepth 2 -type d -path '*${name_only}*/*'|head -n1) - sourceRoot="$folder" - ''; - configurePhase = '' runHook preConfigure @@ -181,6 +173,9 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab EOF export LUAROCKS_CONFIG="$PWD/${luarocks_config}"; '' + + lib.optionalString (rockspecFilename == null) '' + rockspecFilename="${generatedRockspecFilename}" + '' + lib.optionalString (knownRockspec != null) '' # prevents the following type of error: @@ -192,6 +187,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab runHook postConfigure ''; + # TODO could be moved to configurePhase buildPhase = '' runHook preBuild diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 1b8c46394da3a..172ae39536e6e 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: @@ -16,6 +16,14 @@ in stdenv.mkDerivation rec { sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; }; + patches = [ + (fetchpatch { + name = "CVE-2021-39365.patch"; + url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/cd2472e506dafb1bb8ae510e34ad4797f63e263e.patch"; + sha256 = "1i1p21vlms43iawg4dl1dibnpsbnkx27kcfvllnx76q07bfrpwzm"; + }) + ]; + setupHook = ./setup-hook.sh; mesonFlags = [ diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index c61636bfb95f8..e8fdad61b2aff 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.59.0"; + version = "1.60.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "1lwck5gb2kys7wxg08q3pnb8cqhzwwqy6nxcf2yc030gmnwm4sya"; + sha256 = "1agm5xyaib4ynmw4mhgmkhh4lnxs91wv0q9i1zfihv2vkckfm2s2"; }; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "13zzc8c50cy6fknrxzw5gf6rcclsn5bcb2bi3z9mmzsl29ga32gx"; + sha256 = "09d3mw2hb1gmqg7smaqwnfm7izw40znl0h1dz7s2imms2cnkjws1"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix index 49b75906bdbc2..2ad8573ecb306 100644 --- a/pkgs/development/libraries/libe57format/default.nix +++ b/pkgs/development/libraries/libe57format/default.nix @@ -5,20 +5,17 @@ boost, xercesc, icu, - - dos2unix, - fetchpatch, }: stdenv.mkDerivation rec { pname = "libe57format"; - version = "2.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "asmaloney"; repo = "libE57Format"; rev = "v${version}"; - sha256 = "05z955q68wjbd9gc5fw32nqg69xc82n2x75j5vchxzkgnn3adcpi"; + sha256 = "15l23spjvak5h3n7aj3ggy0c3cwcg8mvnc9jlbd9yc2ra43bx7bp"; }; nativeBuildInputs = [ @@ -36,31 +33,6 @@ stdenv.mkDerivation rec { xercesc ]; - # TODO: Remove CMake patching when https://github.com/asmaloney/libE57Format/pull/60 is available. - - # GNU patch cannot patch `CMakeLists.txt` that has CRLF endings, - # see https://unix.stackexchange.com/questions/239364/how-to-fix-hunk-1-failed-at-1-different-line-endings-message/243748#243748 - # so convert it first. - prePatch = '' - ${dos2unix}/bin/dos2unix CMakeLists.txt - ''; - patches = [ - (fetchpatch { - name = "libE57Format-cmake-Fix-config-filename.patch"; - url = "https://github.com/asmaloney/libE57Format/commit/279d8d6b60ee65fb276cdbeed74ac58770a286f9.patch"; - sha256 = "0fbf92hs1c7yl169i7zlbaj9yhrd1yg3pjf0wsqjlh8mr5m6rp14"; - }) - ]; - # It appears that while the patch has - # diff --git a/cmake/E57Format-config.cmake b/cmake/e57format-config.cmake - # similarity index 100% - # rename from cmake/E57Format-config.cmake - # rename to cmake/e57format-config.cmake - # GNU patch doesn't interpret that. - postPatch = '' - mv cmake/E57Format-config.cmake cmake/e57format-config.cmake - ''; - # The build system by default builds ONLY static libraries, and with # `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see: # https://github.com/asmaloney/libE57Format/issues/48 @@ -79,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Library for reading & writing the E57 file format (fork of E57RefImpl)"; + description = "Library for reading & writing the E57 file format"; homepage = "https://github.com/asmaloney/libE57Format"; license = licenses.boost; maintainers = with maintainers; [ chpatrick nh2 ]; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 6eb1bb93f6b81..b00b4cf9ac85e 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.12.2"; + version = "0.13.0"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "sha256-Tu/BHk9sIS/H2E2HHhzBOdoGaaRv8/2lV6b91NdMpns="; + sha256 = "sha256-y7INvhqJLCpNiJi6xDFhduWFOSaT1Jh2bMu8aM8guiA="; }; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/msgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix index f94bd35c30196..d040eff11a322 100644 --- a/pkgs/development/libraries/msgpack/default.nix +++ b/pkgs/development/libraries/msgpack/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "cpp-${version}"; - sha256 = "07n0kdmdjn3amwfg7fqz3xac1yrrxh7d2l6p4pgc6as087pbm8pl"; + sha256 = "02dxgzxlwn8g9ca2j4m0rjvdq1k2iciy6ickj615daz5w8pcjajd"; }; }) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index d23a7b8e7f5d8..ed22eb6c68386 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -27,20 +27,29 @@ , callPackage , nixosTests , withMediaSession ? true -, gstreamerSupport ? true, gst_all_1 ? null -, ffmpegSupport ? true, ffmpeg ? null -, bluezSupport ? true, bluez ? null, sbc ? null, libfreeaptx ? null, ldacbt ? null, fdk_aac ? null +, gstreamerSupport ? true +, gst_all_1 ? null +, ffmpegSupport ? true +, ffmpeg ? null +, bluezSupport ? true +, bluez ? null +, sbc ? null +, libfreeaptx ? null +, ldacbt ? null +, fdk_aac ? null , nativeHspSupport ? true , nativeHfpSupport ? true , ofonoSupport ? true , hsphfpdSupport ? true -, pulseTunnelSupport ? true, libpulseaudio ? null -, zeroconfSupport ? true, avahi ? null +, pulseTunnelSupport ? true +, libpulseaudio ? null +, zeroconfSupport ? true +, avahi ? null }: let fontsConf = makeFontsConf { - fontDirectories = []; + fontDirectories = [ ]; }; mesonEnable = b: if b then "enabled" else "disabled"; @@ -48,7 +57,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.33"; + version = "0.3.34"; outputs = [ "out" @@ -66,7 +75,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-HP2HcGjrLw0+8pO1upvJQk32v+bifYpi5Rtod0TbBis="; + sha256 = "sha256-ZFARA7YuDnpObGLWbgy1Rk+wzmAxHEMuHQkb6tWD0s0="; }; patches = [ @@ -213,4 +222,5 @@ let }; }; -in self +in +self diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 3adb46cd4ee6b..0f5eb19474e40 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -127,6 +127,8 @@ let callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; in { + inherit callPackage qtCompatVersion qtModule srcs; + mkDerivationWith = import ../mkDerivation.nix { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 4662e45fdfdc0..c12a20dd4daf2 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -139,6 +139,8 @@ let callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; in { + inherit callPackage qtCompatVersion qtModule srcs; + mkDerivationWith = import ../mkDerivation.nix { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index d835ee63dc46a..3b8540ca68fec 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -165,6 +165,8 @@ let callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; in { + inherit callPackage qtCompatVersion qtModule srcs; + mkDerivationWith = import ../mkDerivation.nix { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index 8cd9900b65bfb..eb49efa6c871f 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tclap"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "mirror://sourceforge/tclap/${pname}-${version}.tar.gz"; - sha256 = "sha256-GefbUoFUDxVDSHcLw6dIRXX09Umu+OAKq8yUs5X3c8k="; + sha256 = "sha256-Y0xbWduxzLydal9t5JSiV+KaP1nctvwwRF/zm0UYhXQ="; }; meta = with lib; { diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 00a16e15b0323..502c50db1220f 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -22,12 +22,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - glib meson ninja pkg-config ]; + buildInputs = [ + glib + ]; + propagatedBuildInputs = [ libusb1 ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d7a146ad4242c..c5a1a41cbd3ca 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -13,52 +13,53 @@ with self; alt-getopt = buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/alt-getopt-0.8.0-1.rockspec"; + sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/cheusov/lua-alt-getopt", + "rev": "f495c21d6a203ab280603aa5799e636fb5651ae7", + "date": "2017-01-06T13:50:55+03:00", + "path": "/nix/store/z72v77cw9188408ynsppwhlzii2dr740-lua-alt-getopt", + "sha256": "1kq7r5668045diavsqd1j6i9hxdpsk99w8q4zr8cby9y3ws4q6rv", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/alt-getopt-0.8.0-1.src.rock"; - sha256 = "1mi97dqb97sf47vb6wrk12yf1yxcaz0asr9gbgwyngr5n1adh5i3"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/cheusov/lua-alt-getopt"; description = "Process application arguments the same way as getopt_long"; - maintainers = with maintainers; [ arobyn ]; + maintainers = with lib.maintainers; [ arobyn ]; license.fullName = "MIT/X11"; }; }; -ansicolors = buildLuarocksPackage { - pname = "ansicolors"; - version = "1.0.2-3"; - - src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ansicolors-1.0.2-3.src.rock"; - sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; - }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = with lib; { - homepage = "https://github.com/kikito/ansicolors.lua"; - description = "Library for color Manipulation."; - license.fullName = "MIT <http://opensource.org/licenses/MIT>"; - }; -}; - argparse = buildLuarocksPackage { pname = "argparse"; - version = "0.7.1-1"; + version = "scm-2"; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/luarocks/argparse.git", + "rev": "27967d7b52295ea7885671af734332038c132837", + "date": "2020-07-08T11:17:50+10:00", + "path": "/nix/store/vjm6c826hgvj7h7vqlbgkfpvijsd8yaf-argparse", + "sha256": "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/argparse-0.7.1-1.src.rock"; - sha256 = "0ybqh5jcb9v8f5xpq05av4hzrbk3vfvqrjj9cgmhm8l66mjd0c7a"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/luarocks/argparse"; description = "A feature-rich command-line argument parser"; license.fullName = "MIT"; @@ -67,22 +68,18 @@ argparse = buildLuarocksPackage { basexx = buildLuarocksPackage { pname = "basexx"; - version = "0.4.1-1"; - - knownRockspec = (fetchurl { - url = "https://luarocks.org/basexx-0.4.1-1.rockspec"; - sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; - }).outPath; + version = "scm-0"; + rockspecDir = "dist"; src = fetchurl { - url = "https://github.com/aiq/basexx/archive/v0.4.1.tar.gz"; - sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; + url = "https://github.com/aiq/basexx/archive/master.tar.gz"; + sha256 = "1x0d24aaj4zld4ifr7mi8zwrym5shsfphmwx5jzw2zg22r6xzlz1"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/aiq/basexx"; description = "A base2, base16, base32, base64 and base85 library for Lua"; license.fullName = "MIT"; @@ -94,16 +91,17 @@ binaryheap = buildLuarocksPackage { version = "0.4-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/binaryheap-0.4-1.src.rock"; - sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; + url = "https://github.com/Tieske/binaryheap.lua/archive/version_0v4.tar.gz"; + sha256 = "0f5l4nb5s7dycbkgh3rrl7pf0npcf9k6m2gr2bsn09fjyb3bdc8h"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/Tieske/binaryheap.lua"; description = "Binary heap implementation in pure Lua"; - maintainers = with maintainers; [ vcunat ]; + maintainers = with lib.maintainers; [ vcunat ]; license.fullName = "MIT/X11"; }; }; @@ -111,18 +109,29 @@ binaryheap = buildLuarocksPackage { bit32 = buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/bit32-5.3.0-1.rockspec"; + sha256 = "1d6xdihpksrj5a3yvsvnmf3vfk15hj6f8n1rrs65m7adh87hc0yd"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/keplerproject/lua-compat-5.2.git", + "rev": "10c7d40943601eb1f80caa9e909688bb203edc4d", + "date": "2015-02-17T10:44:04+01:00", + "path": "/nix/store/9kz7kgjmq0w9plrpha866bmwsgp4rfhn-lua-compat-5.2", + "sha256": "1ipqlbvb5w394qwhm2f3w6pdrgy8v4q8sps5hh3pqz14dcqwakhj", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/bit32-5.3.0-1.src.rock"; - sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; description = "Lua 5.2 bit manipulation library"; - maintainers = with maintainers; [ lblasc ]; + maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT/X11"; }; }; @@ -130,12 +139,10 @@ bit32 = buildLuarocksPackage { busted = buildLuarocksPackage { pname = "busted"; version = "2.0.0-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/busted-2.0.0-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/busted-2.0.0-1.rockspec"; sha256 = "0cbw95bjxl667n9apcgng2kr5hq6bc7gp3vryw4dzixmfabxkcbw"; }).outPath; - src = fetchurl { url = "https://github.com/Olivine-Labs/busted/archive/v2.0.0.tar.gz"; sha256 = "1ps7b3f4diawfj637mibznaw4x08gn567pyni0m2s50hrnw4v8zx"; @@ -144,7 +151,7 @@ busted = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; - meta = with lib; { + meta = { homepage = "http://olivinelabs.com/busted/"; description = "Elegant Lua unit testing."; license.fullName = "MIT <http://opensource.org/licenses/MIT>"; @@ -154,18 +161,29 @@ busted = buildLuarocksPackage { cassowary = buildLuarocksPackage { pname = "cassowary"; version = "2.3.1-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/cassowary-2.3.1-1.rockspec"; + sha256 = "1rgs0rmlmhghml0gi4dn0rg2iq7rqnn8w8dcy9r3qsbkpyylbajc"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/sile-typesetter/cassowary.lua", + "rev": "c022a120dee86979d18e4c4613e55e721c632d80", + "date": "2021-07-19T14:37:34+03:00", + "path": "/nix/store/rzsbr6gqg8vhchl24ma3p1h4slhk0xp7-cassowary.lua", + "sha256": "1r668qcvd2a1rx17xp7ajp5wjhyvh2fwn0c60xmw0mnarjb5w1pq", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/cassowary-2.3.1-1.src.rock"; - sha256 = "1whb2d0isp2ca3nlli1kyql8ig9ny4wrvm309a1pzk8q9nys3pf9"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; - meta = with lib; { + meta = { homepage = "https://github.com/sile-typesetter/cassowary.lua"; description = "The cassowary constraint solver"; - maintainers = with maintainers; [ marsam alerque ]; + maintainers = with lib.maintainers; [ marsam alerque ]; license.fullName = "Apache 2"; }; }; @@ -173,18 +191,22 @@ cassowary = buildLuarocksPackage { compat53 = buildLuarocksPackage { pname = "compat53"; version = "0.7-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/compat53-0.7-1.rockspec"; + sha256 = "1r7a3q1cjrcmdycrv2ikgl83irjhxs53sa88v2fdpr9aaamlb101"; + }).outPath; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/compat53-0.7-1.src.rock"; - sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; + url = "https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.zip"; + sha256 = "1x3wv1qx7b2zlf3fh4q9pmi2xxkcdm024g7bf11rpv0yacnhran3"; }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/keplerproject/lua-compat-5.3"; description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1"; - maintainers = with maintainers; [ vcunat ]; + maintainers = with lib.maintainers; [ vcunat ]; license.fullName = "MIT"; }; }; @@ -192,17 +214,28 @@ compat53 = buildLuarocksPackage { cosmo = buildLuarocksPackage { pname = "cosmo"; version = "16.06.04-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/cosmo-16.06.04-1.rockspec"; + sha256 = "0ipv1hrlhvaz1myz6qxabq7b7kb3bz456cya3r292487a3g9h9pb"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/mascarenhas/cosmo.git", + "rev": "e774f08cbf8d271185812a803536af8a8240ac51", + "date": "2016-06-17T05:39:58-07:00", + "path": "/nix/store/k3p4xc4cfihp4h8aj6vacr25rpcsjd96-cosmo", + "sha256": "03b5gwsgxd777970d2h6rx86p7ivqx7bry8xmx2r396g3w85qy2p", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cosmo-16.06.04-1.src.rock"; - sha256 = "1adrk74j0x1yzhy0xz9k80hphxdjvm09kpwpbx00sk3kic6db0ww"; - }; propagatedBuildInputs = [ lpeg ]; - meta = with lib; { + meta = { homepage = "http://cosmo.luaforge.net"; description = "Safe templates for Lua"; - maintainers = with maintainers; [ marsam ]; + maintainers = with lib.maintainers; [ marsam ]; license.fullName = "MIT/X11"; }; }; @@ -210,13 +243,24 @@ cosmo = buildLuarocksPackage { coxpcall = buildLuarocksPackage { pname = "coxpcall"; version = "1.17.0-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/coxpcall-1.17.0-1.rockspec"; + sha256 = "0mf0nggg4ajahy5y1q5zh2zx9rmgzw06572bxx6k8b736b8j7gca"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/keplerproject/coxpcall", + "rev": "ea22f44e490430e40217f0792bf82eaeaec51903", + "date": "2018-02-26T19:53:11-03:00", + "path": "/nix/store/1q4p5qvr6rlwisyarlgnmk4dx6vp8xdl-coxpcall", + "sha256": "1k3q1rr2kavkscf99b5njxhibhp6iwhclrjk6nnnp233iwc2jvqi", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/coxpcall-1.17.0-1.src.rock"; - sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; - }; - meta = with lib; { + meta = { homepage = "http://keplerproject.github.io/coxpcall"; description = "Coroutine safe xpcall and pcall"; license.fullName = "MIT/X11"; @@ -226,18 +270,22 @@ coxpcall = buildLuarocksPackage { cqueues = buildLuarocksPackage { pname = "cqueues"; version = "20200726.52-0"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/cqueues-20200726.52-0.rockspec"; + sha256 = "0w2kq9w0wda56k02rjmvmzccz6bc3mn70s9v7npjadh85i5zlhhp"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/cqueues-20200726.52-0.src.rock"; - sha256 = "1mxs74gzs2xmgnrvhl1dlqy1m3m5m0wwiadack97r4pdd63dcp08"; + url = "https://github.com/wahern/cqueues/archive/rel-20200726.tar.gz"; + sha256 = "0lhd02ag3r1sxr2hx847rdjkddm04l1vf5234v5cz9bd4kfjw4cy"; }; + disabled = (lua.luaversion != "5.2"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://25thandclement.com/~william/projects/cqueues.html"; description = "Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix."; - maintainers = with maintainers; [ vcunat ]; + maintainers = with lib.maintainers; [ vcunat ]; license.fullName = "MIT/X11"; }; }; @@ -246,13 +294,8 @@ cyrussasl = buildLuarocksPackage { pname = "cyrussasl"; version = "1.1.0-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/cyrussasl-1.1.0-1.rockspec"; - sha256 = "0zy9l00l7kr3sq8phdm52jqhlqy35vdv6rdmm8mhjihcbx1fsplc"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/JorjBauer/lua-cyrussasl", + "url": "https://github.com/JorjBauer/lua-cyrussasl", "rev": "78ceec610da76d745d0eff4e21a4fb24832aa72d", "date": "2015-08-21T18:24:54-04:00", "path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl", @@ -266,7 +309,7 @@ cyrussasl = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://github.com/JorjBauer/lua-cyrussasl"; description = "Cyrus SASL library for Lua 5.1+"; license.fullName = "BSD"; @@ -275,16 +318,24 @@ cyrussasl = buildLuarocksPackage { digestif = buildLuarocksPackage { pname = "digestif"; - version = "0.2-1"; + version = "dev-1"; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/astoff/digestif", + "rev": "3a9076f76d8121526adcdbb9303d04dd3c721a34", + "date": "2021-06-24T16:18:41+02:00", + "path": "/nix/store/alzrvcxdmdfqqmm0diaxfljyr3jz1zk3-digestif", + "sha256": "110vsqyyp2pvn6nk492a9r56iyzymy0w1f2hvx26pv5x01mxm20x", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/digestif-0.2-1.src.rock"; - sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd"; - }; disabled = (luaOlder "5.3"); - propagatedBuildInputs = [ lua lpeg dkjson ]; + propagatedBuildInputs = [ lua lpeg ]; - meta = with lib; { + meta = { homepage = "https://github.com/astoff/digestif/"; description = "A code analyzer for TeX"; license.fullName = "MIT"; @@ -293,16 +344,20 @@ digestif = buildLuarocksPackage { dkjson = buildLuarocksPackage { pname = "dkjson"; - version = "2.5-2"; - + version = "2.5-3"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/dkjson-2.5-3.rockspec"; + sha256 = "18xngdzl2q207cil64aj81qi6qvj1g269pf07j5x4pbvamd6a1l3"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/dkjson-2.5-2.src.rock"; - sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; + url = "http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.5.tar.gz?uuid=release_2_5"; + sha256 = "14wanday1l7wj2lnpabbxw8rcsa0zbvcdi1w88rdr5gbsq3xwasm"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; description = "David Kolf's JSON module for Lua"; license.fullName = "MIT/X11"; @@ -312,14 +367,18 @@ dkjson = buildLuarocksPackage { fifo = buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/fifo-0.2-0.rockspec"; + sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/fifo-0.2-0.src.rock"; - sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; + url = "https://github.com/daurnimator/fifo.lua/archive/0.2.zip"; + sha256 = "1a028yyc1xlkaavij8rkz18dqf96risrj65xp0p72y2mhsrckdp1"; }; + propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/daurnimator/fifo.lua"; description = "A lua library/'class' that implements a FIFO"; license.fullName = "MIT/X11"; @@ -330,17 +389,12 @@ gitsigns-nvim = buildLuarocksPackage { pname = "gitsigns.nvim"; version = "scm-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/gitsigns.nvim-scm-1.rockspec"; - sha256 = "12cl4dpx18jrdjfzfk8mckqgb52fh9ayikqny5rfn2s4mbn9i5lj"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/lewis6991/gitsigns.nvim", - "rev": "083dc2f485571546144e287c38a96368ea2e79a1", - "date": "2021-08-09T21:58:59+01:00", - "path": "/nix/store/1kwvlcshbbk31i4pa3s9gx8znsh9nwk2-gitsigns.nvim", - "sha256": "0vrb900p2rc323axb93hc7jwcxg8455zwqsvxm9vkd2mcsdpn33w", + "url": "https://github.com/lewis6991/gitsigns.nvim", + "rev": "daa233aabb4dbc7c870ea7300bcfeef96d49c2a3", + "date": "2021-08-29T23:08:52+01:00", + "path": "/nix/store/4685c871dzh0kqf3fs5iqmaysag4m9nx-gitsigns.nvim", + "sha256": "0y0il8v0g8kvsyzir4hbkwvzv9wk2iqs1apxlvijk9ccfdk9ya0p", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -350,7 +404,7 @@ gitsigns-nvim = buildLuarocksPackage { disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua plenary-nvim ]; - meta = with lib; { + meta = { homepage = "http://github.com/lewis6991/gitsigns.nvim"; description = "Git signs written in pure lua"; license.fullName = "MIT/X11"; @@ -360,18 +414,22 @@ gitsigns-nvim = buildLuarocksPackage { http = buildLuarocksPackage { pname = "http"; version = "0.3-0"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/http-0.3-0.rockspec"; + sha256 = "0fn3irkf5nnmfc83alc40b316hs8l7zdq2xlaiaa65sjd8acfvia"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/http-0.3-0.src.rock"; - sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; + url = "https://github.com/daurnimator/lua-http/archive/v0.3.zip"; + sha256 = "13xyj8qx42mzn1z4lwwdfd7ha06a720q4b7d04ir6vvp2fwp3s4q"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; - meta = with lib; { + meta = { homepage = "https://github.com/daurnimator/lua-http"; description = "HTTP library for Lua"; - maintainers = with maintainers; [ vcunat ]; + maintainers = with lib.maintainers; [ vcunat ]; license.fullName = "MIT"; }; }; @@ -379,15 +437,19 @@ http = buildLuarocksPackage { inspect = buildLuarocksPackage { pname = "inspect"; version = "3.1.1-0"; - + knownRockspec = (fetchurl { + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/inspect-3.1.1-0.rockspec"; + sha256 = "00spibq2h4an8v0204vr1hny4vv6za720c37ipsahpjk198ayf1p"; + }).outPath; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/inspect-3.1.1-0.src.rock"; - sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; + url = "https://github.com/kikito/inspect.lua/archive/v3.1.1.tar.gz"; + sha256 = "1nz0yqhkd0nkymghrj99gb2id40g50drh4a96g3v5k7h1sbg94h2"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/kikito/inspect.lua"; description = "Lua table visualizer, ideal for debugging"; license.fullName = "MIT <http://opensource.org/licenses/MIT>"; @@ -397,14 +459,12 @@ inspect = buildLuarocksPackage { ldbus = buildLuarocksPackage { pname = "ldbus"; version = "scm-0"; - knownRockspec = (fetchurl { url = "mirror://luarocks/ldbus-scm-0.rockspec"; sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/daurnimator/ldbus.git", + "url": "https://github.com/daurnimator/ldbus.git", "rev": "9e176fe851006037a643610e6d8f3a8e597d4073", "date": "2019-08-16T14:26:05+10:00", "path": "/nix/store/gg4zldd6kx048d6p65b9cimg3arma8yh-ldbus", @@ -418,7 +478,7 @@ ldbus = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/daurnimator/ldbus"; description = "A Lua library to access dbus."; license.fullName = "MIT/X11"; @@ -427,21 +487,23 @@ ldbus = buildLuarocksPackage { ldoc = buildLuarocksPackage { pname = "ldoc"; - version = "1.4.6-2"; - - knownRockspec = (fetchurl { - url = "https://luarocks.org/ldoc-1.4.6-2.rockspec"; - sha256 = "14yb0qihizby8ja0fa82vx72vk903mv6m7izn39mzfrgb8mha0pm"; - }).outPath; + version = "scm-3"; - src = fetchurl { - url = "http://stevedonovan.github.io/files/ldoc-1.4.6.zip"; - sha256 = "1fvsmmjwk996ypzizcy565hj82bhj17vdb83ln6ff63mxr3zs1la"; - }; + 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", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; propagatedBuildInputs = [ penlight markdown ]; - meta = with lib; { + meta = { homepage = "http://stevedonovan.github.com/ldoc"; description = "A Lua Documentation Tool"; license.fullName = "MIT/X11"; @@ -451,15 +513,26 @@ ldoc = buildLuarocksPackage { lgi = buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lgi-0.9.2-1.rockspec"; + sha256 = "1gqi07m4bs7xibsy4vx8qgyp3yb1wnh0gdq1cpwqzv35y6hn5ds3"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/pavouk/lgi.git", + "rev": "0fdcf8c677094d0c109dfb199031fdbc0c9c47ea", + "date": "2017-10-09T20:55:55+02:00", + "path": "/nix/store/vh82n8pc8dy5c8nph0vssk99vv7q4qg2-lgi", + "sha256": "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lgi-0.9.2-1.src.rock"; - sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://github.com/pavouk/lgi"; description = "Lua bindings to GObject libraries"; license.fullName = "MIT/X11"; @@ -470,11 +543,6 @@ linenoise = buildLuarocksPackage { pname = "linenoise"; version = "0.9-1"; - knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/linenoise-0.9-1.rockspec"; - sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4"; - }).outPath; - src = fetchurl { url = "https://github.com/hoelzro/lua-linenoise/archive/0.9.tar.gz"; sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c"; @@ -483,7 +551,7 @@ linenoise = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/hoelzro/lua-linenoise"; description = "A binding for the linenoise command line library"; license.fullName = "MIT/X11"; @@ -493,18 +561,22 @@ linenoise = buildLuarocksPackage { ljsyscall = buildLuarocksPackage { pname = "ljsyscall"; version = "0.12-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/ljsyscall-0.12-1.rockspec"; + sha256 = "0zna5s852vn7q414z56kkyqwpighaghyq7h7in3myap4d9vcgm01"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/ljsyscall-0.12-1.src.rock"; - sha256 = "12gs81lnzpxi5d409lbrvjfflld5l2xsdkfhkz93xg7v65sfhh2j"; + url = "https://github.com/justincormack/ljsyscall/archive/v0.12.tar.gz"; + sha256 = "1w9g36nhxv92cypjia7igg1xpfrn3dbs3hfy6gnnz5mx14v50abf"; }; + disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://www.myriabit.com/ljsyscall/"; description = "LuaJIT Linux syscall FFI"; - maintainers = with maintainers; [ lblasc ]; + maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT"; }; }; @@ -512,18 +584,22 @@ ljsyscall = buildLuarocksPackage { lpeg = buildLuarocksPackage { pname = "lpeg"; version = "1.0.2-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/lpeg-1.0.2-1.rockspec"; + sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89"; + }).outPath; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg-1.0.2-1.src.rock"; - sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; + sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html"; description = "Parsing Expression Grammars For Lua"; - maintainers = with maintainers; [ vyp ]; + maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; }; }; @@ -531,14 +607,18 @@ lpeg = buildLuarocksPackage { lpeg_patterns = buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/lpeg_patterns-0.5-0.rockspec"; + sha256 = "1vzl3ryryc624mchclzsfl3hsrprb9q214zbi1xsjcc4ckq5qfh7"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/lpeg_patterns-0.5-0.src.rock"; - sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; + url = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; + sha256 = "17jizbyalzdg009p3x2260bln65xf8xhv9npr0kr93kv986j463b"; }; + propagatedBuildInputs = [ lua lpeg ]; - meta = with lib; { + meta = { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; description = "a collection of LPEG patterns"; license.fullName = "MIT"; @@ -548,15 +628,19 @@ lpeg_patterns = buildLuarocksPackage { lpeglabel = buildLuarocksPackage { pname = "lpeglabel"; version = "1.6.0-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/lpeglabel-1.6.0-1.rockspec"; + sha256 = "13gc32pggng6f95xx5zw9n9ian518wlgb26mna9kh4q2xa1k42pm"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/lpeglabel-1.6.0-1.src.rock"; - sha256 = "0mihrs0gcj40gsjbh4x9b5pm92w2vdwwd1f3fyibyd4a8r1h93r9"; + url = "https://github.com/sqmedeiros/lpeglabel/archive/v1.6.0-1.tar.gz"; + sha256 = "1i02lsxj20iygqm8fy6dih1gh21lqk5qj1mv14wlrkaywnv35wcv"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/sqmedeiros/lpeglabel/"; description = "Parsing Expression Grammars For Lua with Labeled Failures"; license.fullName = "MIT/X11"; @@ -566,15 +650,19 @@ lpeglabel = buildLuarocksPackage { lpty = buildLuarocksPackage { pname = "lpty"; version = "1.2.2-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/lpty-1.2.2-1.rockspec"; + sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg"; + }).outPath; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock"; - sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; + url = "http://www.tset.de/downloads/lpty-1.2.2-1.tar.gz"; + sha256 = "071mvz79wi9vr6hvrnb1rv19lqp1bh2fi742zkpv2sm1r9gy5rav"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://www.tset.de/lpty/"; description = "A simple facility for lua to control other programs via PTYs."; license.fullName = "MIT"; @@ -584,15 +672,26 @@ lpty = buildLuarocksPackage { lrexlib-gnu = buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.1-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lrexlib-gnu-2.9.1-1.rockspec"; + sha256 = "1jfjxh26iwsavipkwmscwv52l77qxzvibfmlvpskcpawyii7xcw8"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/rrthomas/lrexlib.git", + "rev": "69d5c442c5a4bdc1271103e88c5c798b605e9ed2", + "date": "2020-08-07T12:10:29+03:00", + "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", + "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lrexlib-gnu-2.9.1-1.src.rock"; - sha256 = "07ppl5ib2q08mcy1nd4pixp58i0v0m9zv3y6ppbrzv105v21wdvi"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (GNU flavour)."; license.fullName = "MIT/X11"; @@ -602,18 +701,29 @@ lrexlib-gnu = buildLuarocksPackage { lrexlib-pcre = buildLuarocksPackage { pname = "lrexlib-pcre"; version = "2.9.1-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lrexlib-pcre-2.9.1-1.rockspec"; + sha256 = "036k27xaplxn128b3p67xiqm8k40s7bxvh87wc8v2cx1cc4b9ia4"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/rrthomas/lrexlib.git", + "rev": "69d5c442c5a4bdc1271103e88c5c798b605e9ed2", + "date": "2020-08-07T12:10:29+03:00", + "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", + "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lrexlib-pcre-2.9.1-1.src.rock"; - sha256 = "0rsar13nax5r8f96pqjr0hf3civ1f1ijg4k7y69y5gi4wqd376lz"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; - maintainers = with maintainers; [ vyp ]; + maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; }; }; @@ -621,51 +731,55 @@ lrexlib-pcre = buildLuarocksPackage { lrexlib-posix = buildLuarocksPackage { pname = "lrexlib-posix"; version = "2.9.1-1"; + knownRockspec = (fetchurl { + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-posix-2.9.1-1.rockspec"; + sha256 = "1zxrx9yifm9ry4wbjgv86rlvq3ff6qivldvib3ha4767azla0j0r"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/rrthomas/lrexlib.git", + "rev": "69d5c442c5a4bdc1271103e88c5c798b605e9ed2", + "date": "2020-08-07T12:10:29+03:00", + "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", + "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lrexlib-posix-2.9.1-1.src.rock"; - sha256 = "0ajbzs3d6758f2hs95akirymw46nxcyy2prbzlaqq45ynzq02psb"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (POSIX flavour)."; license.fullName = "MIT/X11"; }; }; -ltermbox = buildLuarocksPackage { - pname = "ltermbox"; - version = "0.2-1"; - - src = fetchurl { - url = "https://luarocks.org/ltermbox-0.2-1.src.rock"; - sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; - }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = with lib; { - homepage = "http://code.google.com/p/termbox"; - description = "A termbox library package"; - license.fullName = "New BSD License"; - }; -}; - lua-cjson = buildLuarocksPackage { pname = "lua-cjson"; version = "2.1.0.6-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-cjson-2.1.0.6-1.rockspec"; + sha256 = "1x6dk17lwmgkafpki99yl1hlypchbrxr9sxqafrmx7wwvzbz6q11"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/openresty/lua-cjson", + "rev": "a03094c5473d9a9764bb486fbe5e99a62d166dae", + "date": "2018-04-19T12:03:43-07:00", + "path": "/nix/store/qdpqx2g0xi1c9fknzxx280mcdq6fi8rw-lua-cjson", + "sha256": "0i2sjsi6flax1k0bm647yijgmc02jznq9bn88mj71pgii79pfjhw", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock"; - sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php"; description = "A fast JSON encoding/parsing module"; license.fullName = "MIT"; @@ -675,18 +789,16 @@ lua-cjson = buildLuarocksPackage { lua-cmsgpack = buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; - knownRockspec = (fetchurl { url = "https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec"; sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/antirez/lua-cmsgpack.git", - "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", - "date": "2018-06-14T11:56:56+02:00", - "path": "/nix/store/ndjf00i9r45gvy8lh3vp218y4w4md33p-lua-cmsgpack", - "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", + "url": "https://github.com/antirez/lua-cmsgpack.git", + "rev": "dec1810a70d2948725f2e32cc38163de62b9d9a7", + "date": "2015-06-03T08:39:04+02:00", + "path": "/nix/store/ksqvl7hbd5s7nb6hjffyic1shldac4z2-lua-cmsgpack", + "sha256": "0j0ahc9rprgl6dqxybaxggjam2r5i2wqqsd6764n0d7fdpj9fqm0", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -696,7 +808,7 @@ lua-cmsgpack = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://github.com/antirez/lua-cmsgpack"; description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license.fullName = "Two-clause BSD"; @@ -706,15 +818,19 @@ lua-cmsgpack = buildLuarocksPackage { lua-iconv = buildLuarocksPackage { pname = "lua-iconv"; version = "7-3"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-iconv-7-3.rockspec"; + sha256 = "0qh5vsaxd7s31p7a8rl08lwd6zv90wnvp15nll4fcz452kffpp72"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/lua-iconv-7-3.src.rock"; - sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; + url = "https://github.com/downloads/ittner/lua-iconv/lua-iconv-7.tar.gz"; + sha256 = "02dg5x79fg5mwsycr0fj6w04zykdpiki9xjswkkwzdalqwaikny1"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://ittner.github.com/lua-iconv/"; description = "Lua binding to the iconv"; license.fullName = "MIT/X11"; @@ -723,19 +839,17 @@ lua-iconv = buildLuarocksPackage { lua-lsp = buildLuarocksPackage { pname = "lua-lsp"; - version = "scm-5"; - + version = "0.1.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-lsp-scm-5.rockspec"; - sha256 = "19nlnglg50vpz3wmqvnqafajjkqp8f2snqnfmihz3zi5rpdvzjya"; + url = "https://luarocks.org/lua-lsp-0.1.0-2.rockspec"; + sha256 = "19jsz00qlgbyims6cg8i40la7v8kr7zsxrrr3dg0kdg0i36xqs6c"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/Alloyed/lua-lsp", - "rev": "91d4772d1cd264f8501c6da2326fc214ab0934f2", - "date": "2020-10-31T00:55:09-04:00", - "path": "/nix/store/awwwz5wq8v57kv69cfriivg7f6ipdx67-lua-lsp", - "sha256": "10filff5vani6ligv7ls5dgq70k56hql26gv3x101snmw9fkjz57", + "url": "https://github.com/Alloyed/lua-lsp", + "rev": "6afbe53b43d9fb2e70edad50081cc3062ca3d78f", + "date": "2020-10-17T15:07:11-04:00", + "path": "/nix/store/qn9syhm875k1qardhhsp025cm3dbnqvm-lua-lsp", + "sha256": "17k3jq61jz6j9bz4vc3hmsfx1s26cfgq1acja8fqyixljklmsbqp", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -745,7 +859,7 @@ lua-lsp = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua dkjson lpeglabel inspect ]; - meta = with lib; { + meta = { homepage = "https://github.com/Alloyed/lua-lsp"; description = "A Language Server implementation for lua, the language"; license.fullName = "MIT"; @@ -755,15 +869,19 @@ lua-lsp = buildLuarocksPackage { lua-messagepack = buildLuarocksPackage { pname = "lua-messagepack"; version = "0.5.2-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-messagepack-0.5.2-1.rockspec"; + sha256 = "15liz6v8hsqgb3xrcd74a71nnjcz79gpc3ak351hk6k4gyjq2rfc"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/lua-messagepack-0.5.2-1.src.rock"; - sha256 = "0hqahc84ncl8g4miif14sdkzyvnpqip48886sagz9drl52qvgcfb"; + url = "https://framagit.org/fperrad/lua-MessagePack/raw/releases/lua-messagepack-0.5.2.tar.gz"; + sha256 = "1jgi944d0vx4zs9lrphys9pw0wrsibip93sh141qjwymrjyjg1nc"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://fperrad.frama.io/lua-MessagePack/"; description = "a pure Lua implementation of the MessagePack serialization format"; license.fullName = "MIT/X11"; @@ -773,15 +891,26 @@ lua-messagepack = buildLuarocksPackage { lua-resty-http = buildLuarocksPackage { pname = "lua-resty-http"; version = "0.16.1-0"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-resty-http-0.16.1-0.rockspec"; + sha256 = "1475zncd9zvnrblc3r60cwf49c7v0w3khqmi6wqrc5k331m0wm8w"; + }).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", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-resty-http-0.16.1-0.src.rock"; - sha256 = "0n5hiablpc0dsccs6h76zg81wc3jb4mdvyfn9lfxnhls3yqwrgkj"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/ledgetech/lua-resty-http"; description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua."; license.fullName = "2-clause BSD"; @@ -791,15 +920,26 @@ lua-resty-http = buildLuarocksPackage { lua-resty-jwt = buildLuarocksPackage { pname = "lua-resty-jwt"; version = "0.2.3-0"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-resty-jwt-0.2.3-0.rockspec"; + sha256 = "1fxdwfr4pna3fdfm85kin97n53caq73h807wjb59wpqiynbqzc8c"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/cdbattags/lua-resty-jwt", + "rev": "b3d5c085643fa95099e72a609c57095802106ff9", + "date": "2021-01-20T16:53:57-05:00", + "path": "/nix/store/z4a8ffxj2i3gbjp0f8r377cdp88lkzl4-lua-resty-jwt", + "sha256": "07w8r8gqbby06x493qzislig7a3giw0anqr4ivp3g2ms8v9fnng6", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lua-resty-jwt-0.2.3-0.src.rock"; - sha256 = "0s7ghldwrjnhyc205pvcvgdzrgg46qz42v449vrri0cysh8ad91y"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-openssl ]; - meta = with lib; { + meta = { homepage = "https://github.com/cdbattags/lua-resty-jwt"; description = "JWT for ngx_lua and LuaJIT."; license.fullName = "Apache License Version 2"; @@ -809,15 +949,26 @@ lua-resty-jwt = buildLuarocksPackage { lua-resty-openidc = buildLuarocksPackage { pname = "lua-resty-openidc"; version = "1.7.4-1"; + knownRockspec = (fetchurl { + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-resty-openidc-1.7.4-1.rockspec"; + sha256 = "12r03pzx1lpaxzy71iqh0kf1zs6gx1k89vpxc5va9r7nr47a56vy"; + }).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", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lua-resty-openidc-1.7.4-1.src.rock"; - sha256 = "07ny9rl8zir1c3plrbdmd2a23ysrx45qam196nhqsz118xrbds78"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ]; - meta = with lib; { + meta = { homepage = "https://github.com/zmartzone/lua-resty-openidc"; description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality"; license.fullName = "Apache 2.0"; @@ -827,13 +978,24 @@ lua-resty-openidc = buildLuarocksPackage { lua-resty-openssl = buildLuarocksPackage { pname = "lua-resty-openssl"; version = "0.7.4-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-resty-openssl-0.7.4-1.rockspec"; + sha256 = "1h87nc8rnay2h0hcc9rylkdzrssibjs6whyim53k647wqkm3fslm"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/fffonion/lua-resty-openssl.git", + "rev": "5b113a6059e63dbcf7c6fa95a149a9381b904219", + "date": "2021-08-02T18:09:14+08:00", + "path": "/nix/store/qk6fcp5hwqsm4mday34l1mdkx0ba76bx-lua-resty-openssl", + "sha256": "1iar6znh0i45zkx03n8vrkwhx732158hmxfmfjgbpv547mh30ly6", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lua-resty-openssl-0.7.4-1.src.rock"; - sha256 = "16rzcf6z9rgln4sc0v785awn2f3mi9yrswsk5xsfdsb2y1sdxdc0"; - }; - meta = with lib; { + meta = { homepage = "https://github.com/fffonion/lua-resty-openssl"; description = "No summary"; license.fullName = "BSD"; @@ -843,15 +1005,26 @@ lua-resty-openssl = buildLuarocksPackage { lua-resty-session = buildLuarocksPackage { pname = "lua-resty-session"; version = "3.8-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-resty-session-3.8-1.rockspec"; + sha256 = "0pz86bshawysmsnfc5q1yh13gr1458j2nh8r93a4rrmk1wggc4ka"; + }).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", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lua-resty-session-3.8-1.src.rock"; - sha256 = "1x4l6n0dnm4br4p376r8nkg53hwm6a48xkhrzhsh9fcd5xqgqvxz"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/bungle/lua-resty-session"; description = "Session Library for OpenResty – Flexible and Secure"; license.fullName = "BSD"; @@ -861,19 +1034,17 @@ lua-resty-session = buildLuarocksPackage { lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; - knownRockspec = (fetchurl { url = "https://luarocks.org/lua-term-0.7-1.rockspec"; sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; }).outPath; - src = fetchurl { url = "https://github.com/hoelzro/lua-term/archive/0.07.tar.gz"; sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; }; - meta = with lib; { + meta = { homepage = "https://github.com/hoelzro/lua-term"; description = "Terminal functions for Lua"; license.fullName = "MIT/X11"; @@ -883,15 +1054,26 @@ lua-term = buildLuarocksPackage { lua-toml = buildLuarocksPackage { pname = "lua-toml"; version = "2.0-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-toml-2.0-1.rockspec"; + sha256 = "0zd3hrj1ifq89rjby3yn9y96vk20ablljvqdap981navzlbb7zvq"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/jonstoler/lua-toml.git", + "rev": "13731a5dd48c8c314d2451760604810bd6221085", + "date": "2017-12-08T16:30:50-08:00", + "path": "/nix/store/cnpflpyj441c65jhb68hjr2bcvnj9han-lua-toml", + "sha256": "0lklhgs4n7gbgva5frs39240da1y4nwlx6yxaj3ix6r5lp9sh07b", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lua-toml-2.0-1.src.rock"; - sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/jonstoler/lua-toml"; description = "toml decoder/encoder for Lua"; license.fullName = "MIT"; @@ -901,18 +1083,29 @@ lua-toml = buildLuarocksPackage { lua-yajl = buildLuarocksPackage { pname = "lua-yajl"; version = "2.0-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-yajl-2.0-1.rockspec"; + sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/brimworks/lua-yajl.git", + "rev": "c0b598a70966b6cabc57a110037faf9091436f30", + "date": "2020-11-12T06:22:23-08:00", + "path": "/nix/store/9acgxpqk52kwn03m5xasn4f6mmsby2r9-lua-yajl", + "sha256": "1frry90y7vqnw1rd1dfnksilynh0n24gfhkmjd6wwba73prrg0pf", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lua-yajl-2.0-1.src.rock"; - sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://github.com/brimworks/lua-yajl"; description = "Integrate the yajl JSON library with Lua."; - maintainers = with maintainers; [ pstn ]; + maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT/X11"; }; }; @@ -920,18 +1113,16 @@ lua-yajl = buildLuarocksPackage { lua-zlib = buildLuarocksPackage { pname = "lua-zlib"; version = "1.2-1"; - knownRockspec = (fetchurl { url = "https://luarocks.org/lua-zlib-1.2-1.rockspec"; sha256 = "18rpbg9b4vsnh3svapiqrvwwshw1abb5l5fd7441byx1nm3fjq9w"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/brimworks/lua-zlib.git", - "rev": "82d0fdfe8ddd8645970f55011c13d87469501615", - "date": "2021-03-08T06:04:09-08:00", - "path": "/nix/store/2wr6l2djjl2l63wq1fddfm9ljrrkplr5-lua-zlib", - "sha256": "18q9a5f21fp8hxvpp4sq23wi7m2h0v3p3kydslz140mnryazridj", + "url": "https://github.com/brimworks/lua-zlib.git", + "rev": "a305d98f473d0a253b6fd740ce60d7d5a5f1cda0", + "date": "2017-10-07T08:26:37-07:00", + "path": "/nix/store/6hjfczd3xkilkdxidgqzdrwmaiwnlf05-lua-zlib", + "sha256": "1cv12s5c5lihmf3hb0rz05qf13yihy1bjpb7448v8mkiss6y1s5c", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -941,10 +1132,10 @@ lua-zlib = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/brimworks/lua-zlib"; description = "Simple streaming interface to zlib for Lua."; - maintainers = with maintainers; [ koral ]; + maintainers = with lib.maintainers; [ koral ]; license.fullName = "MIT"; }; }; @@ -954,13 +1145,14 @@ lua_cliargs = buildLuarocksPackage { version = "3.0-2"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua_cliargs-3.0-2.src.rock"; - sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; + url = "https://github.com/amireh/lua_cliargs/archive/v3.0-2.tar.gz"; + sha256 = "0vhpgmy9a8wlxp8a15pnfqfk0aj7pyyb5m41nnfxynx580a6y7cp"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/amireh/lua_cliargs"; description = "A command-line argument parser."; license.fullName = "MIT <http://opensource.org/licenses/MIT>"; @@ -971,17 +1163,12 @@ luabitop = buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/luabitop-1.0.2-3.rockspec"; - sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/LuaDist/luabitop.git", - "rev": "81bb23b0e737805442033535de8e6d204d0e5381", - "date": "2013-02-18T16:36:42+01:00", - "path": "/nix/store/jm7mls5zwkgkkf1hiwgbbwy94c55ir43-luabitop", - "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", + "url": "https://github.com/teto/luabitop.git", + "rev": "8d7b674386460ca83e9510b3a8a4481344eb90ad", + "date": "2021-08-30T10:14:03+02:00", + "path": "/nix/store/sdnza0zpmlkz9jppnysasbvqy29f4zia-luabitop", + "sha256": "1b57f99lrjbwsi4m23cq5kpj0dbpxh3xwr0mxs2rzykr2ijpgwrw", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -991,7 +1178,7 @@ luabitop = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://bitop.luajit.org/"; description = "Lua Bit Operations Module"; license.fullName = "MIT/X license"; @@ -1001,15 +1188,26 @@ luabitop = buildLuarocksPackage { luacheck = buildLuarocksPackage { pname = "luacheck"; version = "0.24.0-2"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/luacheck-0.24.0-2.rockspec"; + sha256 = "1x8n7w1mdr1bmmbw38syzi2612yyd7bbv4j2hnlk2k76qfcvkhf3"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/luarocks/luacheck.git", + "rev": "6651c20d8495c380a49ca81662fcfd1ade6b2411", + "date": "2020-08-20T19:21:52-03:00", + "path": "/nix/store/8r4x8snxp0kjabn9bsxwh62pfczd8wma-luacheck", + "sha256": "08jsqibksdvpl6mvf8d6rlh5pii78hqm3fkhbkgzrs6k8kk5a7lf", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/luacheck-0.24.0-2.src.rock"; - sha256 = "0in09mnhcbm84ia22qawn9mmfmaj0z6zqyii8xwz3llacss0mssq"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua argparse luafilesystem ]; - meta = with lib; { + meta = { homepage = "https://github.com/luarocks/luacheck"; description = "A static analyzer and a linter for Lua"; license.fullName = "MIT"; @@ -1019,15 +1217,26 @@ luacheck = buildLuarocksPackage { luacov = buildLuarocksPackage { pname = "luacov"; version = "0.15.0-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/luacov-0.15.0-1.rockspec"; + sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/keplerproject/luacov.git", + "rev": "19b52ca0298c8942df82dd441d7a4a588db4c413", + "date": "2021-02-15T18:47:58-03:00", + "path": "/nix/store/9vm38il9knzx2m66m250qj1fzdfzqg0y-luacov", + "sha256": "08550nna6qcb5jn6ds1hjm6010y8973wx4qbf9vrvrcn1k2yr6ki", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/luacov-0.15.0-1.src.rock"; - sha256 = "14y79p62m1l7jwj8ay0b8nkarr6hdarjycr6qfzlc4v676h38ikq"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://keplerproject.github.io/luacov/"; description = "Coverage analysis tool for Lua scripts"; license.fullName = "MIT"; @@ -1037,15 +1246,26 @@ luacov = buildLuarocksPackage { luadbi = buildLuarocksPackage { pname = "luadbi"; version = "0.7.2-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/luadbi-0.7.2-1.rockspec"; + sha256 = "0lj1qki20w6bl76cvlcazlmwh170b9wkv5nwlxbrr3cn6w7h370b"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/mwild1/luadbi", + "rev": "73a234c4689e4f87b7520276b6159cc7f6cfd6e0", + "date": "2019-01-14T09:39:17+00:00", + "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", + "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/luadbi-0.7.2-1.src.rock"; - sha256 = "0mj9ggyb05l03gs38ds508620mqaw4fkrzz9861n4j0zxbsbmfwy"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; license.fullName = "MIT/X11"; @@ -1055,15 +1275,26 @@ luadbi = buildLuarocksPackage { luadbi-mysql = buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.2-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/luadbi-mysql-0.7.2-1.rockspec"; + sha256 = "0gnyqnvcfif06rzzrdw6w6hchp4jrjiwm0rmfx2r8ljchj2bvml5"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/mwild1/luadbi", + "rev": "73a234c4689e4f87b7520276b6159cc7f6cfd6e0", + "date": "2019-01-14T09:39:17+00:00", + "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", + "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/luadbi-mysql-0.7.2-1.src.rock"; - sha256 = "1f8i5p66halws8qsa7g09110hwzg7pv29yi22mkqd8sjgjv42iq4"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; - meta = with lib; { + meta = { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; license.fullName = "MIT/X11"; @@ -1073,15 +1304,26 @@ luadbi-mysql = buildLuarocksPackage { luadbi-postgresql = buildLuarocksPackage { pname = "luadbi-postgresql"; version = "0.7.2-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.rockspec"; + sha256 = "07rx4agw4hjyzf8157apdwfqh9s26nqndmkr3wm7v09ygjvdjiix"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/mwild1/luadbi", + "rev": "73a234c4689e4f87b7520276b6159cc7f6cfd6e0", + "date": "2019-01-14T09:39:17+00:00", + "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", + "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.src.rock"; - sha256 = "0nmm1hdzl77wk8p6r6al6mpkh2n332a8r3iqsdi6v4nxamykdh28"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; - meta = with lib; { + meta = { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; license.fullName = "MIT/X11"; @@ -1091,50 +1333,55 @@ luadbi-postgresql = buildLuarocksPackage { luadbi-sqlite3 = buildLuarocksPackage { pname = "luadbi-sqlite3"; version = "0.7.2-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/luadbi-sqlite3-0.7.2-1.rockspec"; + sha256 = "022iba0jbiafz8iv1h0iv95rhcivbfq5yg341nxk3dm87yf220vh"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/mwild1/luadbi", + "rev": "73a234c4689e4f87b7520276b6159cc7f6cfd6e0", + "date": "2019-01-14T09:39:17+00:00", + "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", + "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/luadbi-sqlite3-0.7.2-1.src.rock"; - sha256 = "17wd2djzk5x4l4pv2k3c7b8dcvl46s96kqyk8dp3q6ll8gdl7c65"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; - meta = with lib; { + meta = { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; license.fullName = "MIT/X11"; }; }; -luadoc = buildLuarocksPackage { - pname = "luadoc"; - version = "3.0.1-1"; - - src = fetchurl { - url = "https://luarocks.org/luadoc-3.0.1-1.src.rock"; - sha256 = "112zqjbzkrhx3nvavrxx3vhpv2ix85pznzzbpa8fq4piyv5r781i"; - }; - propagatedBuildInputs = [ lualogging luafilesystem ]; - - meta = with lib; { - homepage = "http://luadoc.luaforge.net/"; - description = "LuaDoc is a documentation tool for Lua source code"; - license.fullName = "MIT/X11"; - }; -}; - luaepnf = buildLuarocksPackage { pname = "luaepnf"; version = "0.3-2"; + knownRockspec = (fetchurl { + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaepnf-0.3-2.rockspec"; + sha256 = "0kqmnj11wmfpc9mz04zzq8ab4mnbkrhcgc525wrq6pgl3p5li8aa"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/siffiejoe/lua-luaepnf.git", + "rev": "4e0a867ff54cf424e1558781f5d2c85d2dc2137c", + "date": "2015-01-15T16:54:10+01:00", + "path": "/nix/store/n7gb0z26sl7dzdyy3bx1y3cz3npsna7d-lua-luaepnf", + "sha256": "1lvsi3fklhvz671jgg0iqn0xbkzn9qjcbf2ks41xxjz3lapjr6c9", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/luaepnf-0.3-2.src.rock"; - sha256 = "01vghy965hkmycbvffb1rbgy16fp74103r2ihy3q78dzia4fbfvs"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua lpeg ]; - meta = with lib; { + meta = { homepage = "http://siffiejoe.github.io/lua-luaepnf/"; description = "Extended PEG Notation Format (easy grammars for LPeg)"; license.fullName = "MIT"; @@ -1144,15 +1391,19 @@ luaepnf = buildLuarocksPackage { luaevent = buildLuarocksPackage { pname = "luaevent"; version = "0.4.6-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/luaevent-0.4.6-1.rockspec"; + sha256 = "03zixadhx4a7nh67n0sm6sy97c8i9va1a78hibhrl7cfbqc2zc7f"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/luaevent-0.4.6-1.src.rock"; - sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; + url = "https://github.com/harningt/luaevent/archive/v0.4.6.tar.gz"; + sha256 = "0pbh315d3p7hxgzmbhphkcldxv2dadbka96131b8j5914nxvl4nx"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/harningt/luaevent"; description = "libevent binding for Lua"; license.fullName = "MIT"; @@ -1162,18 +1413,22 @@ luaevent = buildLuarocksPackage { luaexpat = buildLuarocksPackage { pname = "luaexpat"; version = "1.3.0-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/luaexpat-1.3.0-1.rockspec"; + sha256 = "14f7y2acycbgrx95w3darx5l1qm52a09f7njkqmhyk10w615lrw4"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/luaexpat-1.3.0-1.src.rock"; - sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; + url = "http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz"; + sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://www.keplerproject.org/luaexpat/"; description = "XML Expat parsing"; - maintainers = with maintainers; [ arobyn flosse ]; + maintainers = with lib.maintainers; [ arobyn flosse ]; license.fullName = "MIT/X11"; }; }; @@ -1181,15 +1436,26 @@ luaexpat = buildLuarocksPackage { luaffi = buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaffi-scm-1.rockspec"; + sha256 = "1nia0g4n1yv1sbv5np572y8yfai56a8bnscir807s5kj5bs0xhxm"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/facebook/luaffifb.git", + "rev": "a1cb731b08c91643b0665935eb5622b3d621211b", + "date": "2021-03-01T11:46:30-05:00", + "path": "/nix/store/6dwfn64p3clcsxkq41b307q8izi0fvji-luaffifb", + "sha256": "0nj76fw3yi57vfn35yvbdmpdbg9gmn5j1gw84ajs9w1j86sc0661", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "mirror://luarocks/luaffi-scm-1.src.rock"; - sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/facebook/luaffifb"; description = "FFI library for calling C functions from lua"; license.fullName = "BSD"; @@ -1199,33 +1465,55 @@ luaffi = buildLuarocksPackage { luafilesystem = buildLuarocksPackage { pname = "luafilesystem"; version = "1.7.0-2"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/luafilesystem-1.7.0-2.rockspec"; + sha256 = "0xivgn8bbkx1g5a30jrjcv4hg5mpiiyrm3fhlz9lndgbh4cnjrq6"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/keplerproject/luafilesystem", + "rev": "de87218e9798c4dd1a40d65403d99e9e82e1cfa0", + "date": "2017-09-15T20:07:33-03:00", + "path": "/nix/store/20xm4942kvnb8kypg76jl7zrym5cz03c-luafilesystem", + "sha256": "0zmprgkm9zawdf9wnw0v3w6ibaj442wlc6alp39hmw610fl4vghi", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/luafilesystem-1.7.0-2.src.rock"; - sha256 = "0xhmd08zklsgpnpjr9rjipah35fbs8jd4v4va36xd8bpwlvx9rk5"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "git://github.com/keplerproject/luafilesystem"; description = "File System Library for the Lua Programming Language"; - maintainers = with maintainers; [ flosse ]; + maintainers = with lib.maintainers; [ flosse ]; license.fullName = "MIT/X11"; }; }; lualogging = buildLuarocksPackage { pname = "lualogging"; - version = "1.5.1-1"; + version = "1.5.2-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lualogging-1.5.2-1.rockspec"; + sha256 = "0jlqjhr5p9ji51bkmz8n9jc55i3vzqjfwjxvxp2ib9h4gmh2zqk3"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lunarmodules/lualogging.git", + "rev": "8b4d8dd5a311245a197890405ba9324b9f5f5ab1", + "date": "2021-08-12T19:29:39+02:00", + "path": "/nix/store/q1v28n04hh3r7aw37cxakzksfa3kw5qa-lualogging", + "sha256": "0nj0ik91lgl9rwgizdkn7vy9brddsz1kxfn70c01x861vaxi63iz", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lualogging-1.5.1-1.src.rock"; - sha256 = "1c98dnpfa2292g9xhpgsrfdvm80r1fhndrpay1hcgnq0qnz1sibh"; - }; propagatedBuildInputs = [ luasocket ]; - meta = with lib; { + meta = { homepage = "https://github.com/lunarmodules/lualogging"; description = "A simple API to use logging features"; license.fullName = "MIT/X11"; @@ -1235,14 +1523,18 @@ lualogging = buildLuarocksPackage { luaossl = buildLuarocksPackage { pname = "luaossl"; version = "20200709-0"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/luaossl-20200709-0.rockspec"; + sha256 = "0izxxrzc49q4jancza43b2y4hfvasflpcag771nrhapk1n8k45f3"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/luaossl-20200709-0.src.rock"; - sha256 = "0y6dqf560j2bq2rjlm5572m82pj627fd2p9mjc5y6fbram764vga"; + url = "https://github.com/wahern/luaossl/archive/rel-20200709.zip"; + sha256 = "07j1rqqypjb24x11x6v6qpwf12g0ib23qwg47sw3c2yqkbq744j4"; }; + propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://25thandclement.com/~william/projects/luaossl.html"; description = "Most comprehensive OpenSSL module in the Lua universe."; license.fullName = "MIT/X11"; @@ -1252,18 +1544,22 @@ luaossl = buildLuarocksPackage { luaposix = buildLuarocksPackage { pname = "luaposix"; version = "34.1.1-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/luaposix-34.1.1-1.rockspec"; + sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/luaposix-34.1.1-1.src.rock"; - sha256 = "1l9pkn3g0nzlbmmfj12rhfwvkqb06c21ydqxqgmnmd3w9z4ck53w"; + url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; + sha256 = "1xqx764ji054jphxdhkynsmwzqzkfgxqfizxkf70za6qfrvnl3yh"; }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ bit32 lua ]; - meta = with lib; { + meta = { homepage = "http://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; - maintainers = with maintainers; [ vyp lblasc ]; + maintainers = with lib.maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; }; }; @@ -1271,12 +1567,10 @@ luaposix = buildLuarocksPackage { luarepl = buildLuarocksPackage { pname = "luarepl"; version = "0.9-1"; - knownRockspec = (fetchurl { url = "https://luarocks.org/luarepl-0.9-1.rockspec"; sha256 = "1409lanxv4s8kq5rrh46dvld77ip33qzfn3vac3i9zpzbmgb5i8z"; }).outPath; - src = fetchurl { url = "https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz"; sha256 = "04xka7b84d9mrz3gyf8ywhw08xp65v8jrnzs8ry8k9540aqs721w"; @@ -1285,7 +1579,7 @@ luarepl = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/hoelzro/lua-repl"; description = "A reusable REPL component for Lua, written in Lua"; license.fullName = "MIT/X11"; @@ -1294,19 +1588,30 @@ luarepl = buildLuarocksPackage { luasec = buildLuarocksPackage { pname = "luasec"; - version = "1.0.1-1"; + version = "1.0.2-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/luasec-1.0.2-1.rockspec"; + sha256 = "02qkbfnvn3943zf2fnz3amnz1z05ipx9mnsn3i2rmpjpvvd414dg"; + }).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", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/luasec-1.0.1-1.src.rock"; - sha256 = "0384afx1w124ljs3hpp31ldqlrrgsa2xl625sxrx79yddilgk48f"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; - meta = with lib; { + meta = { homepage = "https://github.com/brunoos/luasec/wiki"; description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket."; - maintainers = with maintainers; [ flosse ]; + maintainers = with lib.maintainers; [ flosse ]; license.fullName = "MIT"; }; }; @@ -1314,15 +1619,19 @@ luasec = buildLuarocksPackage { luasocket = buildLuarocksPackage { pname = "luasocket"; version = "3.0rc1-2"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/luasocket-3.0rc1-2.rockspec"; + sha256 = "17fbkihp4zypv5wwgxz8dnghj37pf5bhpi2llg4gbljp1bl2f42c"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/luasocket-3.0rc1-2.src.rock"; - sha256 = "1isin9m40ixpqng6ds47skwa4zxrc6w8blza8gmmq566w6hz50iq"; + url = "https://github.com/diegonehab/luasocket/archive/v3.0-rc1.zip"; + sha256 = "0x0fg07cg08ybgkpzif7zmzaaq5ga979rxwd9rj95kfws9bbrl0y"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://luaforge.net/projects/luasocket/"; description = "Network support for the Lua language"; license.fullName = "MIT"; @@ -1332,18 +1641,16 @@ luasocket = buildLuarocksPackage { luasql-sqlite3 = buildLuarocksPackage { pname = "luasql-sqlite3"; version = "2.6.0-1"; - knownRockspec = (fetchurl { url = "https://luarocks.org/luasql-sqlite3-2.6.0-1.rockspec"; sha256 = "0w32znsfcaklcja6avqx7daaxbf0hr2v8g8bmz0fysb3401lmp02"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/keplerproject/luasql.git", - "rev": "8c58fd6ee32faf750daf6e99af015a31402578d1", - "date": "2020-09-16T13:25:07+01:00", - "path": "/nix/store/62g3f835iry7la34pw09dbqy2b7mn4q5-luasql", - "sha256": "0jad5fin58mv36mdfz5jwg6hbcd7s32x39lyqymn1j9mxzjc2m2y", + "url": "https://github.com/keplerproject/luasql.git", + "rev": "69f68a858134d6adbe9b65a902dcd3f60cd6a7ce", + "date": "2021-08-27T15:17:22-03:00", + "path": "/nix/store/2374agarn72cnlnk2vripfy1zz2y50la-luasql", + "sha256": "13xs1g67d2p69x4wzxk1h97xh25388h0kkh9bjgw3l1yss9zlxhx", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1353,10 +1660,10 @@ luasql-sqlite3 = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://www.keplerproject.org/luasql/"; description = "Database connectivity for Lua (SQLite3 driver)"; - maintainers = with maintainers; [ vyp ]; + maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; }; }; @@ -1364,12 +1671,10 @@ luasql-sqlite3 = buildLuarocksPackage { luassert = buildLuarocksPackage { pname = "luassert"; version = "1.8.0-0"; - knownRockspec = (fetchurl { url = "https://luarocks.org/luassert-1.8.0-0.rockspec"; sha256 = "1194y81nlkq4qmrrgl7z82i6vgvhqvp1p673kq0arjix8mv3zyz1"; }).outPath; - src = fetchurl { url = "https://github.com/Olivine-Labs/luassert/archive/v1.8.0.tar.gz"; sha256 = "0xlwlb32215524bg33svp1ci8mdvh9wykchl8dkhihpxcd526mar"; @@ -1378,7 +1683,7 @@ luassert = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua say ]; - meta = with lib; { + meta = { homepage = "http://olivinelabs.com/busted/"; description = "Lua Assertions Extension"; license.fullName = "MIT <http://opensource.org/licenses/MIT>"; @@ -1388,15 +1693,19 @@ luassert = buildLuarocksPackage { luasystem = buildLuarocksPackage { pname = "luasystem"; version = "0.2.1-0"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/luasystem-0.2.1-0.rockspec"; + sha256 = "0xj5q7lzsbmlw5d3zbjqf3jpj78wcn348h2jcxn5ph4n4hx73z3n"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/luasystem-0.2.1-0.src.rock"; - sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; + url = "https://github.com/o-lim/luasystem/archive/v0.2.1.tar.gz"; + sha256 = "150bbklchh02gsvpngv56xrrlxxvwpqwrh0yy6z95fnvks7gd0qb"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://olivinelabs.com/luasystem/"; description = "Platform independent system calls for Lua."; license.fullName = "MIT <http://opensource.org/licenses/MIT>"; @@ -1406,18 +1715,22 @@ luasystem = buildLuarocksPackage { luautf8 = buildLuarocksPackage { pname = "luautf8"; version = "0.1.3-1"; - + knownRockspec = (fetchurl { + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luautf8-0.1.3-1.rockspec"; + sha256 = "16i9wfgd0f299g1afgjp0hhczlrk5g8i0kq3ka0f8bwj3mp2wmcp"; + }).outPath; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luautf8-0.1.3-1.src.rock"; - sha256 = "1yp4j1r33yvsqf8cggmf4mhaxhz5lqzxhl9mnc0q5lh01yy5di48"; + url = "https://github.com/starwing/luautf8/archive/0.1.3.tar.gz"; + sha256 = "02rf8jmazmi8rp3i5v4jsz0d7mrf1747qszsl8i2hv1sl0ik92r0"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://github.com/starwing/luautf8"; description = "A UTF-8 support module for Lua"; - maintainers = with maintainers; [ pstn ]; + maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT"; }; }; @@ -1425,15 +1738,26 @@ luautf8 = buildLuarocksPackage { luazip = buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/luazip-1.2.7-1.rockspec"; + sha256 = "1wxy3p2ksaq4s8lg925mi9cvbh875gsapgkzm323dr8qaxxg7mba"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/mpeterv/luazip", + "rev": "e424f667cc5c78dd19bb5eca5a86b3c8698e0ce5", + "date": "2017-09-05T14:02:52+03:00", + "path": "/nix/store/idllj442c0iwnx1cpkrifx2afb7vh821-luazip", + "sha256": "1jlqzqlds3aa3hnp737fm2awcx0hzmwyd87klv0cv13ny5v9f2x4", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/luazip-1.2.7-1.src.rock"; - sha256 = "1yprlr1ap6bhshhy88qfphmmyg9zp1py2hj2158iw6vsva0fk03l"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/mpeterv/luazip"; description = "Library for reading files inside zip files"; license.fullName = "MIT"; @@ -1443,15 +1767,19 @@ luazip = buildLuarocksPackage { luuid = buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/luuid-20120509-2.rockspec"; + sha256 = "1q2fv25wfbiqn49mqv26gs4pyllch311akcf7jjn27l5ik8ji5b6"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/luuid-20120509-2.src.rock"; - sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; + url = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/luuid.tar.gz"; + sha256 = "1bfkj613d05yps3fivmz0j1bxf2zkg9g1yl0ifffgw0vy00hpnvm"; }; + disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; description = "A library for UUID generation"; license.fullName = "Public domain"; @@ -1461,15 +1789,19 @@ luuid = buildLuarocksPackage { luv = buildLuarocksPackage { pname = "luv"; version = "1.30.0-0"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/luv-1.30.0-0.rockspec"; + sha256 = "05j231z6vpfjbxxmsizbigrsr80bk2dg48fcz12isj668lhia32h"; + }).outPath; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.30.0-0.src.rock"; - sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; + url = "https://github.com/luvit/luv/releases/download/1.30.0-0/luv-1.30.0-0.tar.gz"; + sha256 = "1vxmxgdjk2bdnm8d9n3z5lfg6x34cx97j5nh8camm6ps5c0mmisw"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/luvit/luv"; description = "Bare libuv bindings for lua"; license.fullName = "Apache 2.0"; @@ -1479,18 +1811,22 @@ luv = buildLuarocksPackage { lyaml = buildLuarocksPackage { pname = "lyaml"; version = "6.2.7-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/lyaml-6.2.7-1.rockspec"; + sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/lyaml-6.2.7-1.src.rock"; - sha256 = "1sh1q84n109j4sammgbzyr69ni7fxnrjfwqb49fsbrhhd49vw7ca"; + url = "http://github.com/gvvaughan/lyaml/archive/v6.2.7.zip"; + sha256 = "165mr3krf8g8070j4ax9z0j2plfbdwb8x2zk2hydpqaqa0kcdb0c"; }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://github.com/gvvaughan/lyaml"; description = "libYAML binding for Lua"; - maintainers = with maintainers; [ lblasc ]; + maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT/X11"; }; }; @@ -1498,15 +1834,26 @@ lyaml = buildLuarocksPackage { markdown = buildLuarocksPackage { pname = "markdown"; version = "0.33-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/markdown-0.33-1.rockspec"; + sha256 = "02sixijfi6av8h59kx3ngrhygjn2sx1c85c0qfy20gxiz72wi1pl"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/mpeterv/markdown", + "rev": "8c09109924b218aaecbfd4d4b1de538269c4d765", + "date": "2015-09-27T17:49:28+03:00", + "path": "/nix/store/akl80hh077hm20bdqj1lksy0fn2285b5-markdown", + "sha256": "019bk2qprszqncnm8zy6ns6709iq1nwkf7i86nr38f035j4lc11y", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/markdown-0.33-1.src.rock"; - sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/mpeterv/markdown"; description = "Markdown text-to-html markup system."; license.fullName = "MIT/X11"; @@ -1516,12 +1863,10 @@ markdown = buildLuarocksPackage { mediator_lua = buildLuarocksPackage { pname = "mediator_lua"; version = "1.1.2-0"; - knownRockspec = (fetchurl { url = "https://luarocks.org/mediator_lua-1.1.2-0.rockspec"; sha256 = "0frzvf7i256260a1s8xh92crwa2m42972qxfq29zl05aw3pyn7bm"; }).outPath; - src = fetchurl { url = "https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz"; sha256 = "16zzzhiy3y35v8advmlkzpryzxv5vji7727vwkly86q8sagqbxgs"; @@ -1530,7 +1875,7 @@ mediator_lua = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://olivinelabs.com/mediator_lua/"; description = "Event handling through channels"; license.fullName = "MIT <http://opensource.org/licenses/MIT>"; @@ -1540,18 +1885,29 @@ mediator_lua = buildLuarocksPackage { moonscript = buildLuarocksPackage { pname = "moonscript"; version = "0.5.0-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/moonscript-0.5.0-1.rockspec"; + sha256 = "06ykvmzndkcmbwn85a4l1cl8v8jw38g0isdyhwwbgv0m5a306j6d"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/leafo/moonscript.git", + "rev": "b7efcd131046ed921ae1075d7c0f6a3b64a570f7", + "date": "2021-03-18T11:51:52-07:00", + "path": "/nix/store/xijbk0bgjpxjgmvscbqnghj4r3zdzgxl-moonscript", + "sha256": "14xx6pij0djblfv3g2hi0xlljh7h0yrbb03f4x90q5j66v693gx7", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/moonscript-0.5.0-1.src.rock"; - sha256 = "09vv3ayzg94bjnzv5fw50r683ma0x3lb7sym297145zig9aqb9q9"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ]; - meta = with lib; { + meta = { homepage = "http://moonscript.org"; description = "A programmer friendly language that compiles to Lua"; - maintainers = with maintainers; [ arobyn ]; + maintainers = with lib.maintainers; [ arobyn ]; license.fullName = "MIT"; }; }; @@ -1559,19 +1915,17 @@ moonscript = buildLuarocksPackage { mpack = buildLuarocksPackage { pname = "mpack"; version = "1.0.8-0"; - knownRockspec = (fetchurl { url = "https://luarocks.org/mpack-1.0.8-0.rockspec"; sha256 = "0hhpamw2bydnfrild274faaan6v48918nhslnw3kvi9y36b4i5ha"; }).outPath; - src = fetchurl { url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.8/libmpack-lua-1.0.8.tar.gz"; sha256 = "1sf93ffx7a3y1waknc4994l2yrxilrlf3hcp2cj2cvxmpm5inszd"; }; - meta = with lib; { + meta = { homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.8/libmpack-lua-1.0.8.tar.gz"; description = "Lua binding to libmpack"; license.fullName = "MIT"; @@ -1583,13 +1937,14 @@ nvim-client = buildLuarocksPackage { version = "0.2.2-1"; src = fetchurl { - url = "https://luarocks.org/nvim-client-0.2.2-1.src.rock"; - sha256 = "0bgx94ziiq0004zw9lz2zb349xaqs5pminqd8bwdrfdnfjnbp8x0"; + url = "https://github.com/neovim/lua-client/archive/0.2.2-1.tar.gz"; + sha256 = "1h736im524lq0vwlpihv9b317jarpkf3j13a25xl5qq8y8asm8mr"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua mpack luv coxpcall ]; - meta = with lib; { + meta = { homepage = "https://github.com/neovim/lua-client"; description = "Lua client to Nvim"; license.fullName = "Apache"; @@ -1598,15 +1953,26 @@ nvim-client = buildLuarocksPackage { penlight = buildLuarocksPackage { pname = "penlight"; - version = "1.10.0-1"; + version = "dev-1"; - src = fetchurl { - url = "https://luarocks.org/penlight-1.10.0-1.src.rock"; - sha256 = "1awd87833688wjdq8ynbzy1waia8ggaz573h9cqg1g2zm6d2mxvp"; - }; - propagatedBuildInputs = [ luafilesystem ]; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lunarmodules/penlight.git", + "rev": "e3712f00fae09a166dd62540b677600165d5bcd7", + "date": "2021-08-18T21:37:47+02:00", + "path": "/nix/store/i70ndw8qhvcm828ifb3vyj08y22xp0ka-penlight", + "sha256": "19n9xqkb4hlak0k7hamk4ixwjvyxslsnyh1zjazdzrl8n736xhkl", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - meta = with lib; { + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua luafilesystem ]; + checkInputs = [ busted busted ]; + doCheck = false; + + meta = { homepage = "https://lunarmodules.github.io/penlight"; description = "Lua utility libraries loosely based on the Python standard libraries"; license.fullName = "MIT/X11"; @@ -1617,17 +1983,12 @@ plenary-nvim = buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/plenary.nvim-scm-1.rockspec"; - sha256 = "1xgqq0skg3vxahlnh1libc5dvhafp11k6k8cs65jcr9sw6xjycwh"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/nvim-lua/plenary.nvim", - "rev": "adf9d62023e2d39d9d9a2bc550feb3ed7b545d0f", - "date": "2021-08-11T11:38:20-04:00", - "path": "/nix/store/fjmpxdswkx54a1n8vwmh3xfrzjq3j5wg-plenary.nvim", - "sha256": "1h11a0lil14c13v5mdzdmxxqjpqip5fhvjbm34827czb5pz1hvcz", + "url": "https://github.com/nvim-lua/plenary.nvim", + "rev": "15c3cb9e6311dc1a875eacb9fc8df69ca48d7402", + "date": "2021-08-19T19:04:12+02:00", + "path": "/nix/store/fjj6gs1yc9gw3qh3xabf7mra4dlyac5a-plenary.nvim", + "sha256": "0gdysws82vdcyfsfpkpg9wqw223vg6hh74pf821wxh8p6qg3r26m", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1637,7 +1998,7 @@ plenary-nvim = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luassert ]; - meta = with lib; { + meta = { homepage = "http://github.com/nvim-lua/plenary.nvim"; description = "lua functions you don't want to write "; license.fullName = "MIT/X11"; @@ -1648,14 +2009,22 @@ rapidjson = buildLuarocksPackage { pname = "rapidjson"; version = "0.7.1-1"; - src = fetchurl { - url = "https://luarocks.org/rapidjson-0.7.1-1.src.rock"; - sha256 = "010y1n7nlajdsm351fyqmi916v5x8kzp5hbynwlx5xc9r9480w81"; - }; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/xpol/lua-rapidjson", + "rev": "242b40c8eaceb0cc43bcab88309736461cac1234", + "date": "2021-04-09T19:59:20+08:00", + "path": "/nix/store/65l71ph27pmipgrq8j4whg6n8h2avvs4-lua-rapidjson", + "sha256": "1a6srvximxlh6gjkaj5y86d1kf06pc4gby2r6wpdw2pdac8k7xyb", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/xpol/lua-rapidjson"; description = "Json module based on the very fast RapidJSON."; license.fullName = "MIT"; @@ -1665,15 +2034,19 @@ rapidjson = buildLuarocksPackage { readline = buildLuarocksPackage { pname = "readline"; version = "3.0-0"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/readline-3.0-0.rockspec"; + sha256 = "1bjj8yn61vc0fzy1lvrfp6cyakj4bf2255xcqai4h3rcg0i5cmpr"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/readline-3.0-0.src.rock"; - sha256 = "0qpa60llcgvc5mj67a2w3il9i7700lvimraxjpk0lx44zkabh6c8"; + url = "http://www.pjb.com.au/comp/lua/readline-3.0.tar.gz"; + sha256 = "1rr2b7q8w3i4bm1i634sd6kzhw6v1fpnh53mj09af6xdq1rfhr5n"; }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua luaposix ]; - meta = with lib; { + meta = { homepage = "http://pjb.com.au/comp/lua/readline.html"; description = "Interface to the readline library"; license.fullName = "MIT/X11"; @@ -1684,11 +2057,6 @@ say = buildLuarocksPackage { pname = "say"; version = "1.3-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/say-1.3-1.rockspec"; - sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; - }).outPath; - src = fetchurl { url = "https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz"; sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; @@ -1697,7 +2065,7 @@ say = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://olivinelabs.com/busted/"; description = "Lua String Hashing/Indexing Library"; license.fullName = "MIT <http://opensource.org/licenses/MIT>"; @@ -1706,16 +2074,24 @@ say = buildLuarocksPackage { std-_debug = buildLuarocksPackage { pname = "std._debug"; - version = "1.0.1-1"; + version = "git-1"; + + 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", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/std._debug-1.0.1-1.src.rock"; - sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://lua-stdlib.github.io/_debug"; description = "Debug Hints Library"; license.fullName = "MIT/X11"; @@ -1724,16 +2100,24 @@ std-_debug = buildLuarocksPackage { std-normalize = buildLuarocksPackage { pname = "std.normalize"; - version = "2.0.3-1"; + version = "git-1"; + + 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", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/std.normalize-2.0.3-1.src.rock"; - sha256 = "00pq2y5w8i052gxmyhgri5ibijksnfmc24kya9y3d5rjlin0n11s"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua std-_debug ]; - meta = with lib; { + meta = { homepage = "https://lua-stdlib.github.io/normalize"; description = "Normalized Lua Functions"; license.fullName = "MIT/X11"; @@ -1743,18 +2127,22 @@ std-normalize = buildLuarocksPackage { stdlib = buildLuarocksPackage { pname = "stdlib"; version = "41.2.2-1"; - + knownRockspec = (fetchurl { + url = "https://luarocks.org/stdlib-41.2.2-1.rockspec"; + sha256 = "0rscb4cm8s8bb8fk8rknc269y7bjqpslspsaxgs91i8bvabja6f6"; + }).outPath; src = fetchurl { - url = "https://luarocks.org/stdlib-41.2.2-1.src.rock"; - sha256 = "1kricll40xy75j72lrbp2jpyxsj9v8b9d7qjf3m3fq1bpg6dmsk7"; + url = "http://github.com/lua-stdlib/lua-stdlib/archive/release-v41.2.2.zip"; + sha256 = "0is8i8lk4qq4afnan0vj1bwr8brialyrva7cjy43alzgwdphwynx"; }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://lua-stdlib.github.io/lua-stdlib"; description = "General Lua Libraries"; - maintainers = with maintainers; [ vyp ]; + maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; }; }; @@ -1763,14 +2151,22 @@ vstruct = buildLuarocksPackage { pname = "vstruct"; version = "2.1.1-1"; - src = fetchurl { - url = "https://luarocks.org/vstruct-2.1.1-1.src.rock"; - sha256 = "0hdlq8dr27k32n5qr87yisl14wg0k0zqd990xqvjqdxrf8d7iypw"; - }; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/ToxicFrog/vstruct.git", + "rev": "924d3dd63043189e4a7ef6b1b54b19208054cc0f", + "date": "2020-05-06T23:13:06-04:00", + "path": "/nix/store/a4i9k5hx9xiz38bij4hb505dg088jkss-vstruct", + "sha256": "0sl9v874mckhh6jbxsan48s5xajzx193k4qlphw69sdbf8kr3p57", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/ToxicFrog/vstruct"; description = "Lua library to manipulate binary data"; }; diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index de21d3d6a3e6d..183a958b4e1f1 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -20,7 +20,7 @@ else attrs // { - name = "lua${lua.luaversion}-" + attrs.name; + name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version; propagatedBuildInputs = propagatedBuildInputs ++ [ lua # propagate it for its setup-hook ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 8f3cce77ef226..a15bd6e536633 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -121,6 +121,11 @@ with super; sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; }) ]; + + # there is only a rockspec.in in the repo, the actual rockspec must be generated + preConfigure = '' + make rock + ''; }); lrexlib-gnu = super.lrexlib-gnu.override({ @@ -141,10 +146,6 @@ with super; ]; }); - ltermbox = super.ltermbox.override( { - disabled = !isLua51 || isLuaJIT; - }); - lua-iconv = super.lua-iconv.override({ buildInputs = [ pkgs.libiconv @@ -348,6 +349,19 @@ with super; ''; }); + std-_debug = super.std-_debug.overrideAttrs(oa: { + # run make to generate lib/std/_debug/version.lua + preConfigure = '' + make all + ''; + }); + + std-normalize = super.std-normalize.overrideAttrs(oa: { + # run make to generate lib/std/_debug/version.lua + preConfigure = '' + make all + ''; + }); # aliases cjson = super.lua-cjson; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index cb95839d16c03..898bbbba91b73 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -56,5 +56,8 @@ stdenv.mkDerivation { platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; + # See https://github.com/dbuenzli/uunf/issues/15#issuecomment-903151264 + broken = lib.versions.majorMinor ocaml.version == "4.08" + && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index aa65432c15e97..a30c727eaa3cc 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "coqpit"; - version = "0.0.10"; + version = "0.0.13"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = pname; rev = "v${version}"; - sha256 = "1gcj5sffcmlvhhk6wbvmxppjpckb90q1avc07jbnb1vvrb2h9lr0"; + sha256 = "sha256-YzCO/i0SMyXRAgiZ8Y97bHHuGFeSF8GqUjvNoHLwXZQ="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index d1dd4478cf53f..ad7d871385694 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "karton-dashboard"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0qygv9lkd1jad5b4l0zz6hsi7m8q0fmpwaa6hpp7p9x6ql7gnyl8"; + sha256 = "sha256-C1wtpHyuTlNS6Se1rR0RGUl3xht4aphAtddKlIsOAkI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 67c6783a46496..dcb326a05a94f 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "2.3.0"; + version = "2.3.1"; format = "pyproject"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "v${version}"; - sha256 = "1a9v2j9s7niyacglhgp58zg1wcynakacz9zg4zcv2q85hb87m2m9"; + sha256 = "0s4my422cdmjfz787a7697938qfnllxwx004jfp3a8alzw2h30g1"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 07efa604cad00..d8a0022310575 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.21.0"; + version = "1.21.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1msj0vk14fbsis8yfk0my1ygpcli9jz3ivwdi9k6ii5i6330i4f9"; + sha256 = "sha256-HMvuyTtw4uhTLfOr3caQXHghkJyW3Oqu91G1fFKRhpo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index f5b338680bdfc..636a057184209 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.24.0"; + version = "2.25.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vWju0D5O3RtDiv9uYQqd9kEwTIcV9QTHYXM/icB/rM0="; + sha256 = "0mbx5gv6ns896mxzml8q9r9dn5wvnrb7gc5iw49fdwbb0yw9yhyx"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix index 68e4b9821b1e5..30e7289402305 100644 --- a/pkgs/development/python-modules/scramp/default.nix +++ b/pkgs/development/python-modules/scramp/default.nix @@ -2,23 +2,32 @@ , asn1crypto , buildPythonPackage , fetchFromGitHub +, pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "scramp"; - version = "1.4.0"; + version = "1.4.1"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tlocke"; repo = "scramp"; rev = version; - sha256 = "sha256-aXuRIW/3qBzan8z3EzSSxqaZfa3WnPhlviNa2ugIjik="; + sha256 = "sha256-HEt2QxNHX9Oqx+o0++ZtS61SVHra3nLAqv7NbQWVV+E="; }; - propagatedBuildInputs = [ asn1crypto ]; + propagatedBuildInputs = [ + asn1crypto + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; pythonImportsCheck = [ "scramp" ]; diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix new file mode 100644 index 0000000000000..818baf6b36f93 --- /dev/null +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, pythonOlder, fetchPypi, httpx }: + +buildPythonPackage rec { + pname = "youtube-search-python"; + version = "1.4.7"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "7f93d9ecfd9b965dc93782d8174b1c1888f8900e2a303254037ba34e1d0ebed4"; + }; + + propagatedBuildInputs = [ httpx ]; + + pythonImportsCheck = [ "youtubesearchpython" ]; + + # project has no tests + doCheck = false; + + meta = with lib; { + description = "Search for YouTube videos, channels & playlists & get video information using link WITHOUT YouTube Data API v3"; + homepage = "https://github.com/alexmercerind/youtube-search-python"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 4cda57cd9a234..618396a90b423 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.36.0"; + version = "0.36.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-HeqsyAmqCUZ1htTv0tHywqYl3ZZBklTU37qaPV++vhU="; + sha256 = "sha256-3QRrGfyMXiSas70IL19/DQAPf7I6vdg/itiZlD4/pvg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 4af5738d91b5e..a7d9aeda000b1 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.289.3"; + version = "2.303.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "11wb4kqy1hja2fgnqsr6p0khdyvinclprxz9z5m58czrsllzsvcr"; + sha256 = "0rf06axz1hxssg942w2g66avak30jy6rfdwxynhriqv3vrf17bja"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 62db92380ae25..bb8e983fa715f 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -20,13 +20,13 @@ buildPythonApplication rec { pname = "pgcli"; - version = "3.1.0"; + version = "3.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d5b2d803f7e4e7fe679306a000bde5d14d15ec590ddd108f3dc4c0ecad169d2b"; + sha256 = "6cde97e71996bf910a40b579e5285483c10ea04962a08def01c12433d5f7c6b7"; }; propagatedBuildInputs = [ @@ -55,7 +55,7 @@ buildPythonApplication rec { syntax highlighting. ''; homepage = "https://pgcli.com"; - changelog = "https://github.com/dbcli/pgcli/blob/v${version}/changelog.rst"; + changelog = "https://github.com/dbcli/pgcli/raw/v${version}/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ dywedir ]; }; diff --git a/pkgs/development/tools/flawfinder/default.nix b/pkgs/development/tools/flawfinder/default.nix index 36209c5d5aa4c..0129cf73741bf 100644 --- a/pkgs/development/tools/flawfinder/default.nix +++ b/pkgs/development/tools/flawfinder/default.nix @@ -1,16 +1,15 @@ { lib , fetchurl -, installShellFiles , python3 }: python3.pkgs.buildPythonApplication rec { pname = "flawfinder"; - version = "2.0.18"; + version = "2.0.19"; src = fetchurl { url = "https://dwheeler.com/flawfinder/flawfinder-${version}.tar.gz"; - sha256 = "1hk2y13fd2a5gf42a1hk45hw6pbls715wi9k1yh3c3wyhvbyylba"; + sha256 = "sha256-/lUJgdNwq/oKKWcTRswLA4Ipqb2QsjnqsPAfEiEt9hg="; }; # Project is using a combination of bash/Python for the tests diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 6e55292722fd7..22872bdcbfa8d 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -5,7 +5,10 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "nix_v3.5.0-1"; - sha256 = "sha256-jcgshxAuuc8QizpYL/2K3PKYWiKsnF/8BJAUaryvEvQ="; + rev = "test-speedup"; + sha256 = "sha256-WfzLSpIp0V7Ib4sjYvoJHF+/vHaieccvfVAr5W47QsQ="; }; + patches = []; + + meta.mainProgram = "luarocks"; }) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 1403f67abdabe..304ede5214ab3 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-UkNO2uNiyN6xB74dNMiWZUCH6qq6P6u95wTq8xRvxsQ="; + sha256 = "sha256-wDuCmiQzyY/Ydr67fYb0yZaSWvuYwW91j0CoqbUFFpg="; }; - cargoSha256 = "sha256-JTjPdTG8KGYVkiCkTqRiJyTpm7OpZkbW10EKSp9lLJ4="; + cargoSha256 = "sha256-5KCGXJzk5VStby/JzjXJvDSrhFlB8YJHMcQNL8GxkLI="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 55c2d3139e93a..a14bc94e3f614 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z6fL2uvv8E6NDBbbQKZ2Xhc6PI+e0Zl6mUvxIRhduH0="; + sha256 = "sha256-Dr1qVdB/UliZM8gUVibi5vyO3Ni4icUqQXTo3UYmFqQ="; }; - cargoSha256 = "sha256-xGoOVp0Pt6cpCBK8IkyFCIcBNucDo98o3f7T3TQQhZY="; + cargoSha256 = "sha256-XDMxNqWxHDof5L1zX99DH1nSpqqi4NlnjtljQxNWagw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 59a24c1066542..212a3222b7c66 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.15"; + version = "6.16"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-Yf1lo2WDKmK656eEKScMB2+yop8cf0YlldHzVDZRd5s="; + sha256 = "sha256-aVCSBQ2YoSnE1/MVPLDkkjJIuuXz2SBjn6SrGnP4+ug="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,7 +65,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-zT77xmc2gD8xNSk19OPYVJB6nZmh+g6TYRhVW674RFI="; + sha256 = "sha256-TvTx3vSOyudyC7aravQGcj5KGqI8uHkgHroIJww5buQ="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index 7e5f95cb20678..48913e2aef7b8 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --replace depmod \# ''; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KVER=${kernel.modDirVersion}" "KERNEL_MODLIB=$(out)/lib/modules/${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 448e91986fc64..51bd4d725a8bf 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -17,10 +17,8 @@ buildPhase() { # Create the module. echo "Building linux driver against kernel: $kernel"; cd kernel - sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) - sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make IGNORE_PREEMPT_RT_PRESENCE=1 NV_BUILD_SUPPORTS_HMM=1 SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES + make $makeFlags -j $NIX_BUILD_CORES module cd .. fi diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 2d325ab3d5655..282d9728821e7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -75,6 +75,13 @@ let kernel = if libsOnly then null else kernel.dev; kernelVersion = if libsOnly then null else kernel.modDirVersion; + makeFlags = optionals (!libsOnly) (kernel.makeFlags ++ [ + "IGNORE_PREEMPT_RT_PRESENCE=1" + "NV_BUILD_SUPPORTS_HMM=1" + "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]); + hardeningDisable = [ "pic" "format" ]; dontStrip = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 9a3daa3d2705e..5276dfd2aff4b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 ]; buildInputs = [ libtirpc ]; + inherit (nvidia_x11) makeFlags; + installFlags = [ "PREFIX=$(out)" ]; postFixup = '' diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index d5bbf40e2b8a6..873e09df8dfbe 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -24,7 +24,7 @@ let cd src/libXNVCtrl ''; - makeFlags = [ + makeFlags = nvidia_x11.makeFlags ++ [ "OUTPUTDIR=." # src/libXNVCtrl ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation { ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; enableParallelBuilding = true; - makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; + makeFlags = nvidia_x11.makeFlags ++ [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; installFlags = [ "PREFIX=$(out)" ]; postPatch = lib.optionalString nvidia_x11.useProfiles '' @@ -61,7 +61,7 @@ stdenv.mkDerivation { preBuild = '' if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then ( cd src/libXNVCtrl - make + make $makeFlags ) fi ''; diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index 423023512408a..c3f849df11813 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { license = with licenses; [ bsd3 gpl2Only ]; maintainers = with maintainers; [ tvorog ]; platforms = platforms.linux; - broken = kernel.kernelOlder "4.14"; + broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "5.14"; priority = -1; }; } diff --git a/pkgs/os-specific/linux/xmm7360-pci/default.nix b/pkgs/os-specific/linux/xmm7360-pci/default.nix index 115299ff50bdf..221bde981b650 100644 --- a/pkgs/os-specific/linux/xmm7360-pci/default.nix +++ b/pkgs/os-specific/linux/xmm7360-pci/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ flokli hexa ]; platforms = platforms.linux; + broken = kernel.kernelAtLeast "5.14"; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 517e6036e780b..78cced512a488 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -47,6 +47,11 @@ let postPatch = optionalString buildKernel '' patchShebangs scripts + + # https://github.com/openzfs/zfs/issues/10107 + substituteInPlace ./config/kernel.m4 \ + --replace "make modules" "make CC=$CC modules" + # The arrays must remain the same length, so we repeat a flag that is # already part of the command and therefore has no effect. substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \ @@ -210,13 +215,14 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; latestCompatibleLinuxPackages = linuxPackages_5_13; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0"; + version = "unstable-2021-08-30"; + rev = "3b89d9518df2c7fd747e349873a3d4d498beb20e"; - sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; + sha256 = "sha256-wVbjpVrPQmhJmMqdGUf0IwlCIoOsT7Zfj5lxSKcOsgg="; isUnstable = true; }; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index b4c85de84ebc3..801601487913f 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.4.3"; + version = "2.4.4"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z3BVx7gCkls5Hy+H6lA3DOBequRutwa2F34FDt9n+8I="; + sha256 = "sha256-POdDORICDE49BQ5LLTs4GTb1VoSXZD4K4MpRkVoj+AY="; }; - vendorSha256 = "sha256-Zwpakw/vyDVngc1Bn+RdRPECNweruwGxsT4dfvMELkQ="; + vendorSha256 = "sha256-JAQaxEmdX0fpDahe55pEKnUW64k8JjrytkBrXpQJz3I="; passthru.tests = { inherit (nixosTests) caddy; }; diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index c10ea7dd1806f..bc599ebbc2c81 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -1,34 +1,40 @@ -{ lib, stdenv, fetchurl, jdk, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jdk, jre, makeWrapper, runCommand, python3Packages, writeText }: -stdenv.mkDerivation rec { - pname = "elasticmq-server"; - version = "0.14.6"; +let + elasticmq-server = stdenv.mkDerivation rec { + pname = "elasticmq-server"; + version = "1.2.0"; - src = fetchurl { - url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar"; - sha256 = "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz"; - }; + src = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar"; + sha256 = "06bn5ixz0pvvhfvavr6njv8c2i9pgd6gj32wnp2f0fn0z1kypn1f"; + }; - # don't do anything? - unpackPhase = "${jdk}/bin/jar xf $src favicon.png"; + # don't do anything? + unpackPhase = "${jdk}/bin/jar xf $src favicon.png"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - mkdir -p $out/bin $out/share/elasticmq-server + installPhase = '' + mkdir -p $out/bin $out/share/elasticmq-server - cp $src $out/share/elasticmq-server/elasticmq-server.jar + cp $src $out/share/elasticmq-server/elasticmq-server.jar - # TODO: how to add extraArgs? current workaround is to use JAVA_TOOL_OPTIONS environment to specify properties - makeWrapper ${jre}/bin/java $out/bin/elasticmq-server \ - --add-flags "-jar $out/share/elasticmq-server/elasticmq-server.jar" - ''; + # TODO: how to add extraArgs? current workaround is to use JAVA_TOOL_OPTIONS environment to specify properties + makeWrapper ${jre}/bin/java $out/bin/elasticmq-server \ + --add-flags "-jar $out/share/elasticmq-server/elasticmq-server.jar" + ''; - meta = with lib; { - homepage = "https://github.com/softwaremill/elasticmq"; - description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ peterromfeldhk ]; + meta = with lib; { + homepage = "https://github.com/softwaremill/elasticmq"; + description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ peterromfeldhk ]; + }; + }; +in elasticmq-server.overrideAttrs (_: { + passthru.tests.elasticmqTest = import ./elasticmq-test.nix { + inherit elasticmq-server runCommand python3Packages writeText; }; -} +}) diff --git a/pkgs/servers/elasticmq-server-bin/elasticmq-test.nix b/pkgs/servers/elasticmq-server-bin/elasticmq-test.nix new file mode 100644 index 0000000000000..044b745089825 --- /dev/null +++ b/pkgs/servers/elasticmq-server-bin/elasticmq-test.nix @@ -0,0 +1,47 @@ +{ elasticmq-server, python3Packages, runCommand, writeText}: + +runCommand "${elasticmq-server.name}-tests" (let + commonPy = '' + import boto3 + client = boto3.resource( + "sqs", + endpoint_url="http://localhost:9324", + region_name="elasticmq", + aws_secret_access_key="x", + aws_access_key_id="x", + use_ssl=False, + ) + queue = client.get_queue_by_name(QueueName="foobar") + ''; +in { + buildInputs = with python3Packages; [ python boto3 ]; + emqConfig = writeText "emq-test.conf" '' + generate-node-address = true + + queues { + foobar {} + } + ''; + putMessagePy = writeText "put_message.py" '' + ${commonPy} + queue.send_message(MessageBody="bazqux") + ''; + checkMessagePy = writeText "check_message.py" '' + ${commonPy} + messages = queue.receive_messages() + print(f"Received {messages!r}") + assert len(messages) == 1 + assert messages[0].body == "bazqux" + ''; +}) '' + JAVA_TOOL_OPTIONS="-Dconfig.file=$emqConfig" ${elasticmq-server}/bin/elasticmq-server & + SERVER_PID=$! + sleep 10 + + python $putMessagePy + python $checkMessagePy + touch $out + + # needed on darwin + kill $SERVER_PID +'' diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f996ebe139090..e94b05edf9d36 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.41.0"; + version = "1.41.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KLsTr8dKp8k7TcrC598ApDib7P0m9evmfdl8jbsZLdc="; + sha256 = "1vaym6mxnwg2xdqjcigi2sb0kkdi0ly5d5ghakfsysxcfn08d1z8"; }; patches = [ diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index f4131f6338ad4..00b242ef87b34 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -54,8 +54,8 @@ in { }; nextcloud22 = generic { - version = "22.1.0"; - sha256 = "sha256-SCCAj3mRRoU2BOH6J9fykkSQGKRNxzv5KKl7AgKDGLo="; + version = "22.1.1"; + sha256 = "sha256-5VtuuXf7U5CB4zp9jxluOEMOszfMdr8DeaZjpJf73ls="; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 40c2d3310f35e..62247d83ddee9 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.24.0.4930-ab6e1a058"; + version = "1.24.1.4931-1a38e63c6"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0fhbm2ykk2nx1j619kpzgw32rgbh2snh8g25m7k42cpmg4a3zz4m"; + sha256 = "1vsg90rlhynfk8wlbf080fv9wah7w8244pl878hjbi6yrjmz2s7g"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0h1vk8ads1jrb5adcpfrz1qdf60jw4wiss9zzcyamfry1ir94n3r"; + sha256 = "08xai0jcpmj1hwkkkgc87v9xwszd5bvwhn36kp6v73jnv1l5cmqb"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 7dbf4054ef275..41eb08ae75bfc 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.7.2"; + version = "5.8"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-640FIIFZRp0L48szn3tqFQo59QP69nnCVQKEM/UTEhk="; + sha256 = "sha256-0pgTq1U2Exj1GfKo+mYxEmoKj5GsMPYstgAsEIV36H8="; }; installPhase = '' diff --git a/pkgs/shells/bash/yarn-completion/default.nix b/pkgs/shells/bash/yarn-completion/default.nix new file mode 100644 index 0000000000000..fabfc0a1ce23d --- /dev/null +++ b/pkgs/shells/bash/yarn-completion/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "yarn-bash-completion"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "dsifford"; + repo = "yarn-completion"; + rev = "v${version}"; + sha256 = "0xflbrbwskjqv3knvc8jqygpvfxh5ak66q7w22d1ng8gwrfqzcng"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + + installShellCompletion --cmd yarn ./yarn-completion.bash + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/dsifford/yarn-completion/"; + description = "Bash completion for Yarn"; + license = licenses.mit; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 7decd474e1e85..e78c208b56fe7 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-08-18"; + version = "2021-08-27"; pname = "oh-my-zsh"; - rev = "cbb534267aca09fd123635fc39a7d00c0e21a5f7"; + rev = "190325049ef93731ab28295dbedf36d44ab33d7a"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "LbgqdIGVvcTUSDVSyH8uJmfuT0ymJvf04AL91HjNWwQ="; + sha256 = "x+cGlYjTgs7Esb4NNSBcKhoDb1SuEQxONt/sSHeVj0M="; }; installPhase = '' diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index dfc5f66464569..eb1ea2aa5923a 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -16,20 +16,22 @@ python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-FlxR1bPkUZT3SPuWiK0oAuI9dKfurEZurB0NhyDgOyY="; + sha256 = "sha256-7YMNxZ15qQowEE0tE6x/LbtirNGp7h9OLyS1JSl9x2A="; }; postPatch = '' - sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt - sed -i -e 's!numba==[^"]*!numba!' requirements.txt - sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt - sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt + sed -i requirements.txt \ + -e 's!librosa==[^"]*!librosa!' \ + -e 's!mecab-python3==[^"]*!mecab-python3!' \ + -e 's!numba==[^"]*!numba!' \ + -e 's!numpy==[^"]*!numpy!' \ + -e 's!umap-learn==[^"]*!umap-learn!' ''; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index 48ce604cd7177..edea1e4b8634e 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "duplicati"; - version = "2.0.6.1"; + version = "2.0.6.3"; channel = "beta"; - build_date = "2021-05-03"; + build_date = "2021-06-17"; src = fetchzip { url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; - sha256 = "09537hswpicsx47vfdm78j3h7vvjd7nqjd2461jrln57nl7v7dac"; + sha256 = "sha256-usMwlmer6rLgP46wGVkaAIocUW4MjuEpVWdX7rRcghg="; stripRoot = false; }; diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index bd173e7e57130..cd042f701d3af 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.8.20"; + version = "0.8.21"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-X7JsUFL9NkNT7ihE5olrqMUP8RnoVC10KLrQeT/OU3o="; + sha256 = "sha256-oYCL6agif/BklMY5/ub6PExS6D/ZlTxi1QaabMOsEfw="; }; sourceRoot = "source/cmd/tar2ext4"; diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index b18366b057f94..8d74e74cb8ac0 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -1,8 +1,12 @@ { lib, stdenv, fetchurl, fetchpatch -, cmake, perl, go +, cmake, perl, go, python3 , protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2, fmt_7 }: +let + pythonEnv = python3.withPackages(ps: [ ps.protobuf ]); +in + stdenv.mkDerivation rec { pname = "android-tools"; version = "31.0.2"; @@ -23,8 +27,13 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + sed -i -E "0,/import api_pb2/ s//from google.protobuf import api_pb2/" vendor/avb/aftltool.py + ''; + nativeBuildInputs = [ cmake perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 fmt_7 ]; + propagatedBuildInputs = [ pythonEnv ]; # Don't try to fetch any Go modules via the network: GOFLAGS = [ "-mod=vendor" ]; @@ -33,6 +42,12 @@ stdenv.mkDerivation rec { export GOCACHE=$TMPDIR/go-cache ''; + postInstall = '' + install -Dm755 ../vendor/avb/aftltool.py -t $out/bin + install -Dm755 ../vendor/avb/avbtool.py -t $out/bin + install -Dm755 ../vendor/mkbootimg/mkbootimg.py $out/bin/mkbootimg + ''; + meta = with lib; { description = "Android SDK platform tools"; longDescription = '' diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 83a063c125efd..c0c67b19b10a4 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -24,54 +24,55 @@ let x86_64-linux = "sha256-jiV2yGPwPgZ5plo3ftImVDLSOsk/XBzFkeeALSObLhU="; x86_64-darwin = "sha256-UYG+GGr23eAc2GgNX/mXaGU0WKMjiQMPpD1wUvAVz0A="; }; -in -stdenv.mkDerivation rec { - version = elk7Version; - pname = "logstash${optionalString (!enableUnfree) "-oss"}"; + this = stdenv.mkDerivation rec { + version = elk7Version; + pname = "logstash${optionalString (!enableUnfree) "-oss"}"; - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}-${plat}-${arch}.tar.gz"; - sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); - }; + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}-${plat}-${arch}.tar.gz"; + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); + }; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - dontPatchShebangs = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; - buildInputs = [ - makeWrapper - jre - ]; + buildInputs = [ + makeWrapper + jre + ]; - installPhase = '' - runHook preInstall - mkdir -p $out - cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out - patchShebangs $out/bin/logstash - patchShebangs $out/bin/logstash-plugin + patchShebangs $out/bin/logstash + patchShebangs $out/bin/logstash-plugin - wrapProgram $out/bin/logstash \ - --set JAVA_HOME "${jre}" + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" - wrapProgram $out/bin/logstash-plugin \ - --set JAVA_HOME "${jre}" - runHook postInstall - ''; + wrapProgram $out/bin/logstash-plugin \ + --set JAVA_HOME "${jre}" + runHook postInstall + ''; - meta = with lib; { - description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = "https://www.elastic.co/products/logstash"; - license = if enableUnfree then licenses.elastic else licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ wjlroe offline basvandijk ]; + meta = with lib; { + description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; + homepage = "https://www.elastic.co/products/logstash"; + license = if enableUnfree then licenses.elastic else licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ wjlroe offline basvandijk ]; + }; + passthru.tests = + optionalAttrs (!enableUnfree) ( + assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; + { + elk = nixosTests.elk.ELK-7; + } + ); }; - passthru.tests = - optionalAttrs (!enableUnfree) ( - assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; - { - elk = nixosTests.elk.ELK-7; - } - ); -} +in +this diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index e8ebde4ad4d9d..ee6c9776c54b2 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -1,24 +1,25 @@ { lib, stdenv, fetchurl, perl, gd, rrdtool }: stdenv.mkDerivation rec { - - version = "2.17.7"; pname = "mrtg"; + version = "2.17.8"; src = fetchurl { url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz"; - sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v"; + sha256 = "sha256-GsLgr2ng7N73VeeYylmDSreKwYXCpe/9t2hcWPLvAbQ="; }; buildInputs = [ - perl gd rrdtool + perl + gd + rrdtool ]; - meta = { + meta = with lib; { description = "The Multi Router Traffic Grapher"; homepage = "https://oss.oetiker.ch/mrtg/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.robberer ]; - platforms = lib.platforms.unix; + license = licenses.gpl2Only; + maintainers = with maintainers; [ robberer ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index a8203978feea6..9a6c6881f7df5 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkg-config }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "pick"; - version = "2.0.2"; + version = "4.0.0"; src = fetchFromGitHub { - owner = "calleerlandsson"; + owner = "mptre"; repo = "pick"; rev = "v${version}"; - sha256 = "0wm3220gqrwldiq0rjdraq5mw3i7d58zwzls8234sx9maf59h0k0"; + sha256 = "8cgt5KpLfnLwhucn4DQYC/7ot1u24ahJxWG+/1SL584="; }; buildInputs = [ ncurses ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + PREFIX = placeholder "out"; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index ff4e15c9cc863..4ac9d972a9a74 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "4.5.0"; + version = "5.3.4"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-RWezBNqjKybMtfpxPhDg2ysb4ksKphTPdTNTwCe4pas="; + sha256 = "sha256-wju69kC6koYy2yABjx7/rWsuJXV1vjwSBztNlu13TJs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/tools/misc/tea/default.nix index a7af4fec7ba4a..c968b57c60ad2 100644 --- a/pkgs/tools/misc/tea/default.nix +++ b/pkgs/tools/misc/tea/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tea"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "tea"; rev = "v${version}"; - sha256 = "sha256-Kq+A6YELfBJ04t7pPnX8Ulh4NSMFn3AHggplLD9J8MY="; + sha256 = "sha256-Y/Znj8vVjVt+rs+n8JRQsptq5u17G2D7r98PDxPLyd4="; }; vendorSha256 = null; diff --git a/pkgs/tools/misc/ytmdl/default.nix b/pkgs/tools/misc/ytmdl/default.nix index 43f46bc052314..90a0590b8d955 100644 --- a/pkgs/tools/misc/ytmdl/default.nix +++ b/pkgs/tools/misc/ytmdl/default.nix @@ -1,44 +1,32 @@ { lib -, fetchFromGitHub -, python3 -, fetchpatch +, python3Packages , ffmpeg }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ytmdl"; - version = "2021.06.26"; + version = "2021.08.01"; - src = fetchFromGitHub { - owner = "deepjyoti30"; - repo = pname; - rev = version; - sha256 = "1jpd5zhqg2m9vjjjw4mgzb594q1v1pq1yl65py6kw42bq9w5yl5p"; + src = python3Packages.fetchPypi { + inherit pname; + version = builtins.replaceStrings [ ".0" ] [ "." ] version; + sha256 = "f5ef23dcba89aaf2307baf4ffc2326dc5c02324f646e5e5748219ed328202af4"; }; - patches = [ - # Fixes https://github.com/deepjyoti30/ytmdl/issues/188 - # Only needed until the next major release after 2021.06.26 - (fetchpatch { - url = "https://github.com/deepjyoti30/ytmdl/commit/37ba821d9692249c1fa563505cf60bd11b8e209e.patch"; - includes = [ "bin/ytmdl" ]; - sha256 = "sha256-VqtthpUL0Oub3DK7tSvAnemOzPPTcLvXXeebZIGOgdc="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" + --replace "bs4" "beautifulsoup4" \ + --replace "/etc/bash_completion.d" "share/bash-completion/completions" \ + --replace "/usr/share/zsh/functions/Completion/Unix" "share/zsh/site-functions" ''; - - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ ffmpeg-python musicbrainzngs rich simber pydes - youtube-search + youtube-search-python unidecode pyxdg downloader-cli @@ -48,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { pysocks youtube-dl ytmusicapi + spotipy ]; makeWrapperArgs = [ diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 26cdfe7c0dbf4..97f0d1823af2d 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -1,79 +1,42 @@ -{ writeText, lib, stdenv, fetchurl, ncurses }: +{ lib +, stdenv +, autoreconfHook +, fetchurl +, ncurses +}: -let - version = "0.6.1"; -in stdenv.mkDerivation rec { pname = "bwm-ng"; - inherit version; + version = "0.6.3"; src = fetchurl { url = "https://www.gropp.org/bwm-ng/${pname}-${version}.tar.gz"; - sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; + sha256 = "0ikzyvnb73msm9n7ripg1dsw9av1i0c7q2hi2173xsj8zyv559f1"; }; - buildInputs = [ ncurses ]; - - # gcc7 has some issues with inline functions - patches = [ - (writeText "gcc7.patch" - '' - --- a/src/bwm-ng.c - +++ b/src/bwm-ng.c - @@ -27,5 +27,5 @@ - /* handle interrupt signal */ - void sigint(int sig) FUNCATTR_NORETURN; - -inline void init(void); - +static inline void init(void); - - /* clear stuff and exit */ - --- a/src/options.c - +++ b/src/options.c - @@ -35,5 +35,5 @@ - inline int str2output_type(char *optarg); - #endif - -inline int str2out_method(char *optarg); - +static inline int str2out_method(char *optarg); - inline int str2in_method(char *optarg); - - '') + nativeBuildInputs = [ + autoreconfHook ]; - - # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=gnu89"; + buildInputs = [ + ncurses + ]; meta = with lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; - + maintainers = with maintainers; [ ]; longDescription = '' - Features - - supports /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats /proc/partitions, IOKit, devstat and libstatgrab - unlimited number of interfaces/devices supported - interfaces/devices are added or removed dynamically from list - white-/blacklist of interfaces/devices - output of KB/s, Kb/s, packets, errors, average, max and total sum - output in curses, plain console, CSV or HTML - configfile - - Short list of changes since 0.5 (for full list read changelog): - - curses2 output, a nice bar chart - disk input for bsd/macosx/linux/solaris - win32 network bandwidth support - moved to autotools - alot fixes - - Info - This was influenced by the old bwm util written by Barney (barney@freewill.tzo.com) which had some issues with faster interfaces and was very simple. Since i had almost all code done anyway for other projects, i decided to create my own version. - - I actually don't know if netstat input is useful at all. I saw this elsewhere, so i added it. Its target is "netstat 1.42 (2001-04-15)" linux or Free/Open/netBSD. If there are other formats i would be happy to add them. - - (from homepage) + bwm-ng supports: + - /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats /proc/partitions, IOKit, + devstat and libstatgrab + - unlimited number of interfaces/devices + - interfaces/devices are added or removed dynamically from list + - white-/blacklist of interfaces/devices + - output of KB/s, Kb/s, packets, errors, average, max and total sum + - output in curses, plain console, CSV or HTML ''; }; } diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index 5f83ffae055f9..e6cf8d0e09cc5 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xw2AtI1AqcuZ7JZ8xDifZ+fwMBUopp1IFXIEEzGmRr4="; + sha256 = "sha256-ufS8pdA1Jxjge3OF+xlam7yP1oa3lZt0E3hU1SqrnFg="; }; mesonFlags = [ diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 0de96169769a0..5dc789e0dc589 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,17 +1,40 @@ -{ lib, fetchFromGitHub, python2Packages, - asciidoc, cacert, libxml2, libxslt, docbook_xsl }: +{ lib +, fetchFromGitHub +, python2Packages +, asciidoc +, cacert +, docbook_xsl +, installShellFiles +, libxml2 +, libxslt +}: python2Packages.buildPythonApplication rec { - version = "7.3.3"; + version = "7.3.4"; pname = "offlineimap"; src = fetchFromGitHub { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "1gg8ry67i20qapj4z20am9bm67m2q28kixcj7ja75m897vhzarnq"; + sha256 = "sha256-sra2H0+5+LAIU3+uJnii+AYA05nuDyKVMW97rbaFOfI="; }; + nativeBuildInputs = [ + asciidoc + docbook_xsl + installShellFiles + libxml2 + libxslt + ]; + + propagatedBuildInputs = with python2Packages; [ + six + kerberos + rfc6555 + pysocks + ]; + postPatch = '' # Skip xmllint to stop failures due to no network access sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |" @@ -20,21 +43,19 @@ python2Packages.buildPythonApplication rec { sed -i offlineimap/utils/distro.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"' ''; - doCheck = false; - - nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ]; - propagatedBuildInputs = with python2Packages; [ six kerberos rfc6555 pysocks ]; - postInstall = '' make -C docs man - install -D -m 644 docs/offlineimap.1 ''${!outputMan}/share/man/man1/offlineimap.1 - install -D -m 644 docs/offlineimapui.7 ''${!outputMan}/share/man/man7/offlineimapui.7 + installManPage docs/offlineimap.1 + installManPage docs/offlineimapui.7 ''; - meta = { + # Test requires credentials + doCheck = false; + + meta = with lib; { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; homepage = "http://offlineimap.org"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ endocrimes ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ endocrimes ]; }; } diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index f5c8317d89b80..c28293c570aaa 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "spoofer"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-+4FNC+rMxIoVXlW7HnBXUg0P4FhNvMTAqJ9c7lXQ6vE="; + sha256 = "sha256-6ov1dZbxmBRIhfIzUaxiaHUeiU6SbNKhiQX1W4lmhD8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index fc92f43981b61..0d3e5ccf07e6b 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -1,30 +1,52 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libpcap }: +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, json_c +, libnet +, libpcap +, openssl +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ssldump"; - version = "1.1"; + version = "1.4"; src = fetchFromGitHub { owner = "adulau"; repo = "ssldump"; - rev = "7491b9851505acff95b2c68097e9b9f630d418dc"; - sha256 = "1j3rln86khdnc98v50hclvqaq83a24c1rfzbcbajkbfpr4yxpnpd"; + rev = "v${version}"; + sha256 = "1xnlfqsl93nxbcv4x4xsgxa6mnhcx37hijrpdb7vzla6q7xvg8qr"; }; - buildInputs = [ libpcap openssl ]; + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + json_c + libnet + libpcap + openssl + ]; + prePatch = '' sed -i -e 's|#include.*net/bpf.h|#include <pcap/bpf.h>|' \ base/pcap-snoop.c ''; - configureFlags = [ "--with-pcap-lib=${libpcap}/lib" - "--with-pcap-inc=${libpcap}/include" - "--with-openssl-lib=${openssl}/lib" - "--with-openssl-inc=${openssl}/include" ]; - meta = { + + configureFlags = [ + "--with-pcap-lib=${libpcap}/lib" + "--with-pcap-inc=${libpcap}/include" + "--with-openssl-lib=${openssl}/lib" + "--with-openssl-inc=${openssl}/include" + ]; + + meta = with lib; { description = "An SSLv3/TLS network protocol analyzer"; homepage = "http://ssldump.sourceforge.net"; license = "BSD-style"; - maintainers = with lib.maintainers; [ aycanirican ]; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ aycanirican ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/nix/nixos-install-tools/default.nix b/pkgs/tools/nix/nixos-install-tools/default.nix index a129fb3452151..8a00c15d905ca 100644 --- a/pkgs/tools/nix/nixos-install-tools/default.nix +++ b/pkgs/tools/nix/nixos-install-tools/default.nix @@ -7,6 +7,7 @@ # https://github.com/NixOS/nixpkgs/pull/119942 nixos-install-tools, runCommand, + nixosTests, }: let inherit (nixos {}) config; @@ -40,6 +41,7 @@ in }; passthru.tests = { + nixos-tests = lib.recurseIntoAttrs nixosTests.installer; nixos-install-help = runCommand "test-nixos-install-help" { nativeBuildInputs = [ man diff --git a/pkgs/tools/package-management/akku/default.nix b/pkgs/tools/package-management/akku/default.nix new file mode 100644 index 0000000000000..e1baf2e0b1eb7 --- /dev/null +++ b/pkgs/tools/package-management/akku/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, guile, curl, substituteAll }: + +stdenv.mkDerivation rec { + pname = "akku"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "akkuscm"; + repo = "akku"; + rev = "v${version}"; + sha256 = "1pi18aamg1fd6f9ynfl7zx92052xzf0zwmhi2pwcwjs1kbah19f5"; + }; + + patches = [ + # substitute libcurl path + (substituteAll { + src = ./hardcode-libcurl.patch; + libcurl = "${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ guile ]; + + # Use a dummy package index to boostrap Akku + preBuild = '' + touch bootstrap.db + ''; + + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + meta = with lib; { + homepage = "https://akkuscm.org/"; + description = "Language package manager for Scheme"; + changelog = "https://gitlab.com/akkuscm/akku/-/raw/v${version}/NEWS.md"; + platforms = platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/tools/package-management/akku/hardcode-libcurl.patch b/pkgs/tools/package-management/akku/hardcode-libcurl.patch new file mode 100644 index 0000000000000..7c5b8b50c320a --- /dev/null +++ b/pkgs/tools/package-management/akku/hardcode-libcurl.patch @@ -0,0 +1,18 @@ +--- old/private/http.scm ++++ new/private/http.scm +@@ -101,14 +101,7 @@ + ;; shouldn't, but it's an old issue. + (log/error "Could not load libcurl. Please install the curl development(!) package.") + (exit 1))) +- (case (os-name) +- ((darwin) (set! libcurl (open-shared-object "libcurl.dylib"))) +- ((msys) (set! libcurl (open-shared-object "msys-curl-4"))) +- (else +- (guard (exn +- (else +- (set! libcurl (open-shared-object "libcurl.so.3")))) +- (set! libcurl (open-shared-object "libcurl.so.4")))))) ++ (set! libcurl (open-shared-object "@libcurl@"))) + (letrec () + (define %curl_global_init (foreign-procedure libcurl int curl_global_init (long))) + (call %curl_global_init #b11))) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 273e2837e06a3..c45724e80e0a5 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "hashcat"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "sha256-wL4cZpPuHzXHvvH3m/njCpVPcX70LQDjd4eq7/MnHlE="; + sha256 = "sha256-kCA5b/kzaT4xC0ebZB6G8Xg9mBnWDR2Qd1KtjSSmDDE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index a6d2ab1436216..ff416f793e1c2 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -12,11 +12,11 @@ with lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.91"; + version = "7.92"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q"; + sha256 = "sha256-pUefL4prCyUWdn0vcYnDhsHchY2ZcWfX7Fz8eYx1caE="; }; patches = [ ./zenmap.patch ] diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index d84f6f2990050..18db48dfb2490 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -102,7 +102,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cool new OpenPGP implementation"; homepage = "https://sequoia-pgp.org/"; - license = licenses.gpl3; + license = licenses.gpl2Plus; maintainers = with maintainers; [ minijackson doronbehar ]; }; } diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index c91a83c0a0d71..c1d5e0ec5b2c1 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.16.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gMXvHPqWvaZmzWiWrxlknaMkUraS64yrKl+RzAF7c4I="; + sha256 = "sha256-w+1iL/Y1OKksIqGJvft734NmjLbxm2yebV/xjhzOubM="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-WF2UD0LwzCMkoW1EfcjV+9ZboPp1oWhmsSEryj13Kg0="; + vendorSha256 = "sha256-71DH7/kU/nZqbsrRWkxa3JV3pevGjjOKDjn8gIWSDkE="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 52d0f261d4be4..0540468df69de 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.8.1"; + version = "1.8.2"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-u0EfK7rXnC5PBkDx09XvUOK9p9T0CHWlaRfJX/eDwts="; + sha256 = "sha256-10ck1swivx4cfFGQCbAXaAms9vHCDuVhB94Mq1TNhGM="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "11khjx5lrb7zmrahkniqwn4ad98yjy2fm0miz63nzpq85c0yrjdn"; + sha256 = "0v8l056xs88mjpcfpi9k8chv0zk7lf80gkj580z3d37h2yr2b1gg"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "02gqavhg3pk6jkdmn1yp9pl3pv4ni2sg56q218gs8gbbypj22wpq"; + sha256 = "1xabbndnx85zbhbwid30q0jii41hmwwlqrxz4a0rllqshvmq4fg3"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0500nc8v7hwnrckz4fkf5fpqcg3i45q25lz4lghzkcabnss4qand"; + sha256 = "00p2540bdhw46licab401vbwdyvp1hkngssx6nh99igj14sl60qa"; }; }; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 8065355383a81..0b11f1d918904 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.12.11"; + version = "0.13.00"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lxOTB1Mhwkw9V2ms+rtwWRHR9BHO1ZN7fP6lhSjBtOY="; + sha256 = "sha256-HO/kowV8FSKxRuYvYbgM5uLpnaLYXr4lvAP8RSKOWM0="; }; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 730fa1f35f4af..d6734ea7e7be0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -867,6 +867,8 @@ with pkgs; inherit (plasma5Packages) kdialog; }; + akku = callPackage ../tools/package-management/akku { }; + albert = libsForQt5.callPackage ../applications/misc/albert {}; arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {}; @@ -2180,9 +2182,7 @@ with pkgs; ''; }); - caddy = callPackage ../servers/caddy { - buildGoModule = buildGo115Module; - }; + caddy = callPackage ../servers/caddy { }; traefik = callPackage ../servers/traefik { }; @@ -4130,6 +4130,8 @@ with pkgs; daemonize = callPackage ../tools/system/daemonize { }; + danger-gitlab = callPackage ../applications/version-management/danger-gitlab { }; + daq = callPackage ../applications/networking/ids/daq { }; dar = callPackage ../tools/backup/dar { }; @@ -5255,7 +5257,9 @@ with pkgs; git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { }; - git-branchless = callPackage ../applications/version-management/git-and-tools/git-branchless { }; + git-branchless = callPackage ../applications/version-management/git-and-tools/git-branchless { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; inherit (haskellPackages) git-brunch; @@ -10607,6 +10611,8 @@ with pkgs; nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { }; + yarn-bash-completion = callPackage ../shells/bash/yarn-completion { }; + undistract-me = callPackage ../shells/bash/undistract-me { }; dash = callPackage ../shells/dash { }; @@ -10818,6 +10824,7 @@ with pkgs; bluespec = callPackage ../development/compilers/bluespec { gmp-static = gmp.override { withStatic = true; }; + tex = texlive.combined.scheme-full; }; cakelisp = callPackage ../development/compilers/cakelisp { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index f16917a943946..246d62b903b35 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -99,8 +99,8 @@ with self; { luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; - luxio = buildLuaPackage rec { - name = "luxio-${version}"; + luxio = buildLuaPackage { + pname = "luxio"; version = "13"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ef3b52af0a4c..19ca4df0d28dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9610,6 +9610,8 @@ in { youtube-search = callPackage ../development/python-modules/youtube-search { }; + youtube-search-python = callPackage ../development/python-modules/youtube-search-python { }; + youtube-transcript-api = callPackage ../development/python-modules/youtube-transcript-api { }; yowsup = callPackage ../development/python-modules/yowsup { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index b01ef584d206e..84c4d8fc40591 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -15,7 +15,7 @@ # Utility functions, could just import but passing in for efficiency lib -, # Use to reevaluate Nixpkgs; a dirty hack that should be removed +, # Use to reevaluate Nixpkgs nixpkgsFun ## Other parameters @@ -218,7 +218,7 @@ let appendOverlays = extraOverlays: if extraOverlays == [] then self - else import ./stage.nix (args // { overlays = args.overlays ++ extraOverlays; }); + else nixpkgsFun { overlays = args.overlays ++ extraOverlays; }; # NOTE: each call to extend causes a full nixpkgs rebuild, adding ~130MB # of allocations. DO NOT USE THIS IN NIXPKGS. |