From 83eb83e70e8b05757cd291963e0aa851a6cbc813 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sat, 26 Jun 2021 23:51:48 +0100 Subject: [PATCH 001/138] houdini: remove unnecessary build steps --- pkgs/applications/misc/houdini/default.nix | 4 ---- pkgs/applications/misc/houdini/runtime.nix | 9 --------- 2 files changed, 13 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index db06efd6a2a2..3a63883c6989 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -5,10 +5,6 @@ let in buildFHSUserEnv { name = "houdini-${houdini-runtime.version}"; - extraBuildCommands = '' - mkdir -p $out/usr/lib/sesi - ''; - passthru = { unwrapped = houdini-runtime; }; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 8436b66719f7..fdf50cbe0eec 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -68,15 +68,6 @@ stdenv.mkDerivation rec { echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh ''; - postFixup = '' - INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)" - for BIN in $(find $out/bin -type f -executable); do - if patchelf $BIN 2>/dev/null ; then - echo "Patching ELF $BIN" - patchelf --set-interpreter "$INTERPRETER" "$BIN" - fi - done - ''; meta = { description = "3D animation application software"; homepage = "https://www.sidefx.com"; From d9f81d9bf62f9c0f28aa17856256a68c3a39775c Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 27 Jun 2021 21:47:50 +0100 Subject: [PATCH 002/138] Switch to pure FHS env --- pkgs/applications/misc/houdini/default.nix | 18 ++++--- pkgs/applications/misc/houdini/runtime.nix | 55 ++++------------------ 2 files changed, 20 insertions(+), 53 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 3a63883c6989..e681854de07a 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,14 +1,18 @@ { callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: -let - houdini-runtime = callPackage ./runtime.nix { }; -in buildFHSUserEnv { - name = "houdini-${houdini-runtime.version}"; +buildFHSUserEnv { + name = "houdini-${unwrapped.version}"; + + targetPkgs = pkgs: with pkgs; [ + libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils libxkbcommon + ] ++ (with xorg; [ + libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes + libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver + ]); passthru = { - unwrapped = houdini-runtime; + inherit unwrapped; }; - runScript = "${undaemonize}/bin/undaemonize ${houdini-runtime}/bin/houdini"; + runScript = "${undaemonize}/bin/undaemonize ${unwrapped}/bin/houdini"; } - diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index fdf50cbe0eec..452c763338f2 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,50 +1,17 @@ -{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib -, dbus, xkeyboardconfig, nss, nspr, expat, pciutils, libxkbcommon, bc, addOpenGLRunpath -}: +{ lib, stdenv, requireFile, bc }: let - # NOTE: Some dependencies only show in errors when run with QT_DEBUG_PLUGINS=1 - ld_library_path = builtins.concatStringsSep ":" [ - "${stdenv.cc.cc.lib}/lib64" - (lib.makeLibraryPath [ - libGLU - libGL - xorg.libXmu - xorg.libXi - xorg.libXext - xorg.libX11 - xorg.libXrender - xorg.libXcursor - xorg.libXfixes - xorg.libXrender - xorg.libXcomposite - xorg.libXdamage - xorg.libXtst - xorg.libxcb - xorg.libXScrnSaver - alsa-lib - fontconfig - libSM - libICE - zlib - libpng - dbus - addOpenGLRunpath.driverLink - nss - nspr - expat - pciutils - libxkbcommon - ]) - ]; license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { version = "18.0.460"; pname = "houdini-runtime"; src = requireFile rec { + #name = "houdini-py3-${version}-linux_x86_64_gcc6.3.tar.gz"; + #sha256 = "10qp8nml1ivl0syh0iwzx3zdwdpilnwakax50wydcrzdzyxza7xw"; # 18.5.621 + #sha256 = "1b1k7rkn7svmciijqdwvi9p00srsf81vkb55grjg6xa7fgyidjx1"; # 18.5.596 name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz"; - sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd"; + sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd"; # 18.0.460 url = meta.homepage; }; @@ -63,17 +30,13 @@ stdenv.mkDerivation rec { echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup - echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh - echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/bin/app_init.sh - echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh - echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh ''; - meta = { + meta = with lib; { description = "3D animation application software"; homepage = "https://www.sidefx.com"; - license = lib.licenses.unfree; - platforms = lib.platforms.linux; + license = licenses.unfree; + platforms = platforms.linux; hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = with lib.maintainers; [ canndrew kwohlfahrt ]; + maintainers = with maintainers; [ canndrew kwohlfahrt ]; }; } From 6fb4874a07ee098489a035bee2325ba5a55def45 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 27 Jun 2021 22:58:58 +0100 Subject: [PATCH 003/138] houdini: 18.0 -> 18.5 sesinetd must be started manually for licensing to succeed. Also add individual tools to the output. hkey requires libudev, and something requires tbb. --- pkgs/applications/misc/houdini/default.nix | 27 ++++++++++++++++++---- pkgs/applications/misc/houdini/runtime.nix | 20 ++++++++-------- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index e681854de07a..81a5eddaf6ed 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,10 +1,11 @@ -{ callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: +{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: -buildFHSUserEnv { +buildFHSUserEnv rec { name = "houdini-${unwrapped.version}"; targetPkgs = pkgs: with pkgs; [ - libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils libxkbcommon + libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils + libxkbcommon libudev tbb ] ++ (with xorg; [ libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver @@ -14,5 +15,23 @@ buildFHSUserEnv { inherit unwrapped; }; - runScript = "${undaemonize}/bin/undaemonize ${unwrapped}/bin/houdini"; + extraInstallCommands = let + executables = [ "bin/houdini" "bin/hkey" "houdini/sbin/sesinetd" ]; + in '' + WRAPPER=$out/bin/${name} + EXECUTABLES="${lib.concatStringsSep " " executables}" + for executable in $EXECUTABLES; do + mkdir -p $out/$(dirname $executable) + + echo "#!${stdenv.shell}" >> $out/$executable + echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable + done + + cd $out + chmod +x $EXECUTABLES + ''; + + runScript = writeScript "${name}-wrapper" '' + exec $@ + ''; } diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 452c763338f2..4fb2d91b99f4 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -4,14 +4,11 @@ let license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { - version = "18.0.460"; + version = "18.5.596"; pname = "houdini-runtime"; src = requireFile rec { - #name = "houdini-py3-${version}-linux_x86_64_gcc6.3.tar.gz"; - #sha256 = "10qp8nml1ivl0syh0iwzx3zdwdpilnwakax50wydcrzdzyxza7xw"; # 18.5.621 - #sha256 = "1b1k7rkn7svmciijqdwvi9p00srsf81vkb55grjg6xa7fgyidjx1"; # 18.5.596 - name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz"; - sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd"; # 18.0.460 + name = "houdini-py3-${version}-linux_x86_64_gcc6.3.tar.gz"; + sha256 = "1b1k7rkn7svmciijqdwvi9p00srsf81vkb55grjg6xa7fgyidjx1"; url = meta.homepage; }; @@ -19,18 +16,19 @@ stdenv.mkDerivation rec { installPhase = '' patchShebangs houdini.install mkdir -p $out - sed -i "s|/usr/lib/sesi|${license_dir}|g" houdini.install ./houdini.install --install-houdini \ + --install-license \ --no-install-menus \ --no-install-bin-symlink \ --auto-install \ --no-root-check \ - --accept-EULA \ + --accept-EULA 2020-05-05 \ $out - echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt - sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe - sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup + echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt ''; + + dontFixup = true; + meta = with lib; { description = "3D animation application software"; homepage = "https://www.sidefx.com"; From eea9d67bb189d9a241384ce667914539bb4579e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 15:37:36 +0000 Subject: [PATCH 004/138] liburcu: 0.12.2 -> 0.13.0 --- pkgs/development/libraries/liburcu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 6eb1bb93f6b8..b00b4cf9ac85 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 ]; From f6b44b88ccad7e5ef24978e865bf7ac64b1675f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 15:29:11 +0000 Subject: [PATCH 005/138] pspg: 4.5.0 -> 5.3.4 --- pkgs/tools/misc/pspg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index ff4e15c9cc86..4ac9d972a9a7 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 ]; From aa2dfca483d6d19496149aee60f6f8716fa3deec Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 18 Aug 2021 14:10:53 -0500 Subject: [PATCH 006/138] duplicati: 2.0.6.1 -> 2.0.6.3 --- pkgs/tools/backup/duplicati/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index 48ce604cd717..edea1e4b8634 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; }; From b0d44b3f3a9c14884e2cd336cdbad1b6860047f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 20:43:37 +0000 Subject: [PATCH 007/138] tclap: 1.2.3 -> 1.2.4 --- pkgs/development/libraries/tclap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index 8cd9900b65bf..eb49efa6c871 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; { From 39c2e364164c5061155857cadeaf79d8620d94f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 05:30:33 +0000 Subject: [PATCH 008/138] stress-ng: 0.12.11 -> 0.13.00 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 8065355383a8..0b11f1d91890 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 = '' From 9bb81609bed4d1863b8e3e61c59fd613a1787006 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 06:31:14 +0000 Subject: [PATCH 009/138] spoofer: 1.4.6 -> 1.4.7 --- pkgs/tools/networking/spoofer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index f5c8317d89b8..c28293c570aa 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 ]; From d7ac07cdbbba71cdd8a5f6a762595f1e7082c9a9 Mon Sep 17 00:00:00 2001 From: Phil Dyer Date: Fri, 25 Jun 2021 12:33:54 +1000 Subject: [PATCH 010/138] r-modules: fix r package build failures r-modules: fix r package system dependencies r-modules: fix terra package dependencies r-modules: fix edge case for R package import The R package "import" has a name that clashes with the nix function "import". The package name in nixpkgs is correctly modified to avoid the clash, but the name of the R package was also being changed in cran-packages.nix, which broke downloading of the package. cran-packages.nix has been manually patched, and genreate-r-packages.R has been fixed so future automatic updates will succeed. r-modules: fix repeated `pkgs.` and svglite --- pkgs/development/r-modules/cran-packages.nix | 2 +- pkgs/development/r-modules/default.nix | 112 ++++++++++-------- .../r-modules/generate-r-packages.R | 3 +- 3 files changed, 66 insertions(+), 51 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 25c945c29f72..a09fa4af80a6 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -10268,7 +10268,7 @@ in with self; { implicitMeasures = derive2 { name="implicitMeasures"; version="0.2.0"; sha256="0w0dwnzfhw5v5j7q3zpfsca4ydmq7b9fzspvyf9sibyh587isb9c"; depends=[ggplot2 stringr tidyr xtable]; }; implied = derive2 { name="implied"; version="0.3.1"; sha256="11mrvpsh9qc5a5s5mpbsksri6vx36ij1gvpli6lyz6dkg48a9kdn"; depends=[]; }; implyr = derive2 { name="implyr"; version="0.4.0"; sha256="0rblsmx1z2n4g3fims5wa3wyf5znr0gkwd2yfz3130bcm6346da0"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; - r_import = derive2 { name="r_import"; version="1.2.0"; sha256="018s0x224gqnv4cjfh0fwliyfg6ma9vslmwybrlizfsmqcc5wp37"; depends=[]; }; + r_import = derive2 { name="import"; version="1.2.0"; sha256="018s0x224gqnv4cjfh0fwliyfg6ma9vslmwybrlizfsmqcc5wp37"; depends=[]; }; importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; importinegi = derive2 { name="importinegi"; version="1.1.3"; sha256="1r0p01mc9wb24ifldn3dmi0fqxwkp0290h0qrgr72grd34v2xszc"; depends=[data_table dplyr foreign haven rgdal]; }; impressionist_colors = derive2 { name="impressionist.colors"; version="1.0"; sha256="03z5w7y7vbvlnn30r9y3ip93h364f87nhwdb9hcki26csiq2bnlv"; depends=[]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index eb244ae91df8..cc8a840eda25 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -237,54 +237,56 @@ let audio = [ pkgs.portaudio ]; BayesSAE = [ pkgs.gsl_1 ]; BayesVarSel = [ pkgs.gsl_1 ]; - BayesXsrc = [ pkgs.readline.dev pkgs.ncurses ]; + BayesXsrc = with pkgs; [ readline.dev ncurses ]; bigGP = [ pkgs.mpi ]; bio3d = [ pkgs.zlib ]; BiocCheck = [ pkgs.which ]; Biostrings = [ pkgs.zlib ]; bnpmr = [ pkgs.gsl_1 ]; cairoDevice = [ pkgs.gtk2.dev ]; - Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ]; + Cairo = with pkgs; [ libtiff libjpeg cairo.dev x11 fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw ]; - ChemmineOB = [ pkgs.openbabel pkgs.pkg-config ]; + ChemmineOB = with pkgs; [ openbabel pkg-config ]; curl = [ pkgs.curl.dev ]; - data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; - devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ]; - diversitree = [ pkgs.gsl_1 pkgs.fftw ]; + data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; + devEMF = with pkgs; [ xorg.libXft.dev x11 ]; + diversitree = with pkgs; [ gsl_1 fftw ]; + exactextractr = [ pkgs.geos ]; EMCluster = [ pkgs.lapack ]; fftw = [ pkgs.fftw.dev ]; - fftwtools = [ pkgs.fftw.dev ]; + fftwtools = with pkgs; [ fftw.dev pkg-config ]; Formula = [ pkgs.gmp ]; - gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; - git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkg-config ]; + gdtools = with pkgs; [ cairo.dev fontconfig.lib freetype.dev ]; + git2r = with pkgs; [ zlib.dev openssl.dev libssh2.dev libgit2 pkg-config ]; GLAD = [ pkgs.gsl_1 ]; - glpkAPI = [ pkgs.gmp pkgs.glpk ]; + glpkAPI = with pkgs; [ gmp glpk ]; gmp = [ pkgs.gmp.dev ]; graphscan = [ pkgs.gsl_1 ]; gsl = [ pkgs.gsl_1 ]; gert = [ pkgs.libgit2 ]; - haven = [ pkgs.libiconv pkgs.zlib.dev ]; + haven = with pkgs; [ libiconv zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; imager = [ pkgs.x11 ]; iBMQ = [ pkgs.gsl_1 ]; - igraph = [ pkgs.gmp pkgs.libxml2.dev ]; + igraph = with pkgs; [ gmp libxml2.dev ]; JavaGD = [ pkgs.jdk ]; jpeg = [ pkgs.libjpeg.dev ]; jqr = [ pkgs.jq.dev ]; KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; - lwgeom = [ pkgs.gdal pkgs.geos pkgs.proj ]; + lpsymphony = with pkgs; [ pkg-config gfortran gettext ]; + lwgeom = with pkgs; [pkgs.proj.dev proj pkg-config geos sqlite gdal ]; magick = [ pkgs.imagemagick.dev ]; ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl_1 ]; mwaved = [ pkgs.fftw.dev ]; ncdf4 = [ pkgs.netcdf ]; - nloptr = [ pkgs.nlopt pkgs.pkg-config ]; + nloptr = with pkgs; [ nlopt pkg-config ]; n1qn1 = [ pkgs.gfortran ]; odbc = [ pkgs.unixODBC ]; - pander = [ pkgs.pandoc pkgs.which ]; + pander = with pkgs; [ pandoc which ]; pbdMPI = [ pkgs.mpi ]; pbdPROF = [ pkgs.mpi ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; @@ -294,7 +296,7 @@ let png = [ pkgs.libpng.dev ]; proj4 = [ pkgs.proj ]; protolite = [ pkgs.protobuf ]; - R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ]; + R2SWF = with pkgs; [ zlib libpng freetype.dev ]; RAppArmor = [ pkgs.libapparmor ]; rapportools = [ pkgs.which ]; rapport = [ pkgs.which ]; @@ -304,42 +306,43 @@ let RcppGSL = [ pkgs.gsl_1 ]; RcppZiggurat = [ pkgs.gsl_1 ]; reprex = [ pkgs.which ]; - rgdal = [ pkgs.proj.dev pkgs.gdal ]; + rgdal = with pkgs; [ proj.dev gdal ]; rgeos = [ pkgs.geos ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; Rhdf5lib = [ pkgs.zlib.dev ]; - Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.mpi pkgs.pcre.dev ]; - Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.xz.dev pkgs.curl.dev ]; + Rhpc = with pkgs; [ zlib bzip2.dev icu xz.dev mpi pcre.dev ]; + Rhtslib = with pkgs; [ zlib.dev automake autoconf bzip2.dev xz.dev curl.dev ]; rjags = [ pkgs.jags ]; - rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ]; + rJava = with pkgs; [ zlib bzip2.dev icu xz.dev pcre.dev jdk libzip ]; Rlibeemd = [ pkgs.gsl_1 ]; rmatio = [ pkgs.zlib.dev ]; - Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; + Rmpfr = with pkgs; [ gmp mpfr.dev ]; Rmpi = [ pkgs.mpi ]; - RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ]; - RNetCDF = [ pkgs.netcdf pkgs.udunits ]; + RMySQL = with pkgs; [ zlib libmysqlclient openssl.dev ]; + RNetCDF = with pkgs; [ netcdf udunits ]; RODBC = [ pkgs.libiodbc ]; rpanel = [ pkgs.bwidget ]; Rpoppler = [ pkgs.poppler ]; - RPostgreSQL = [ pkgs.postgresql pkgs.postgresql ]; + RPostgreSQL = with pkgs; [ postgresql postgresql ]; RProtoBuf = [ pkgs.protobuf ]; RSclient = [ pkgs.openssl.dev ]; Rserve = [ pkgs.openssl ]; Rssa = [ pkgs.fftw.dev ]; rsvg = [ pkgs.pkg-config ]; runjags = [ pkgs.jags ]; - RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; - rzmq = [ pkgs.zeromq pkgs.pkg-config ]; + RVowpalWabbit = with pkgs; [ zlib.dev boost ]; + rzmq = with pkgs; [ zeromq pkg-config ]; clustermq = [ pkgs.zeromq ]; - SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.xz pkgs.pcre ]; - sdcTable = [ pkgs.gmp pkgs.glpk ]; - seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; + SAVE = with pkgs; [ zlib bzip2 icu xz pcre ]; + sdcTable = with pkgs; [ gmp glpk ]; + seewave = with pkgs; [ fftw.dev libsndfile.dev ]; seqinr = [ pkgs.zlib.dev ]; - seqminer = [ pkgs.zlib.dev pkgs.bzip2 ]; - sf = [ pkgs.gdal pkgs.proj pkgs.geos ]; - showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ]; + seqminer = with pkgs; [ zlib.dev bzip2 ]; + sf = with pkgs; [ gdal proj geos ]; + terra = with pkgs; [ gdal proj geos ]; + showtext = with pkgs; [ zlib libpng icu freetype.dev ]; simplexreg = [ pkgs.gsl_1 ]; spate = [ pkgs.fftw.dev ]; ssanv = [ pkgs.proj ]; @@ -347,19 +350,19 @@ let stringi = [ pkgs.icu.dev ]; survSNP = [ pkgs.gsl_1 ]; svglite = [ pkgs.libpng.dev ]; - sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ]; - systemfonts = [ pkgs.fontconfig.dev pkgs.freetype.dev ]; + sysfonts = with pkgs; [ zlib libpng freetype.dev ]; + systemfonts = with pkgs; [ fontconfig.dev freetype.dev ]; TAQMNGR = [ pkgs.zlib.dev ]; - tesseract = [ pkgs.tesseract pkgs.leptonica ]; + tesseract = with pkgs; [ tesseract leptonica ]; tiff = [ pkgs.libtiff.dev ]; - tkrplot = [ pkgs.xorg.libX11 pkgs.tk.dev ]; + tkrplot = with pkgs; [ xorg.libX11 tk.dev ]; topicmodels = [ pkgs.gsl_1 ]; - udunits2 = [ pkgs.udunits pkgs.expat ]; + udunits2 = with pkgs; [ udunits expat ]; units = [ pkgs.udunits ]; V8 = [ pkgs.v8 ]; - XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; + XBRL = with pkgs; [ zlib libxml2.dev ]; xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; - XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ]; + XML = with pkgs; [ libtool libxml2.dev xmlsec libxslt ]; affyPLM = [ pkgs.zlib.dev ]; bamsignals = [ pkgs.zlib.dev ]; BitSeq = [ pkgs.zlib.dev ]; @@ -369,10 +372,10 @@ let gmapR = [ pkgs.zlib.dev ]; Rsubread = [ pkgs.zlib.dev ]; XVector = [ pkgs.zlib.dev ]; - Rsamtools = [ pkgs.zlib.dev pkgs.curl.dev ]; + Rsamtools = with pkgs; [ zlib.dev curl.dev ]; rtracklayer = [ pkgs.zlib.dev ]; affyio = [ pkgs.zlib.dev ]; - VariantAnnotation = [ pkgs.zlib.dev pkgs.curl.dev ]; + VariantAnnotation = with pkgs; [ zlib.dev curl.dev ]; snpStats = [ pkgs.zlib.dev ]; hdf5r = [ pkgs.hdf5.dev ]; }; @@ -396,7 +399,7 @@ let RcppEigen = [ pkgs.libiconv ]; RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkg-config ]; - rgl = [ pkgs.libGLU pkgs.libGLU.dev pkgs.libGL pkgs.xlibsWrapper ]; + rgl = with pkgs; [ libGLU libGLU.dev libGL xlibsWrapper ]; RGtk2 = [ pkgs.pkg-config ]; RProtoBuf = [ pkgs.pkg-config ]; Rpoppler = [ pkgs.pkg-config ]; @@ -407,13 +410,14 @@ let gdtools = [ pkgs.pkg-config ]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkg-config ]; - lwgeom = [ pkgs.pkg-config pkgs.proj.dev pkgs.sqlite.dev ]; + lwgeom = with pkgs; [ pkg-config proj.dev sqlite.dev ]; magick = [ pkgs.pkg-config ]; mwaved = [ pkgs.pkg-config ]; odbc = [ pkgs.pkg-config ]; openssl = [ pkgs.pkg-config ]; pdftools = [ pkgs.pkg-config ]; - sf = [ pkgs.pkg-config pkgs.sqlite.dev pkgs.proj.dev ]; + sf = with pkgs; [ pkg-config sqlite.dev proj.dev ]; + terra = with pkgs; [ pkg-config sqlite.dev proj.dev ]; showtext = [ pkgs.pkg-config ]; spate = [ pkgs.pkg-config ]; stringi = [ pkgs.pkg-config ]; @@ -426,11 +430,11 @@ let mashr = [ pkgs.gsl ]; hadron = [ pkgs.gsl ]; AMOUNTAIN = [ pkgs.gsl ]; - Rsymphony = [ pkgs.pkg-config pkgs.doxygen pkgs.graphviz pkgs.subversion ]; - tcltk2 = [ pkgs.tcl pkgs.tk ]; - tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ]; + Rsymphony = with pkgs; [ pkg-config doxygen graphviz subversion ]; + tcltk2 = with pkgs; [ tcl tk ]; + tikzDevice = with pkgs; [ which texlive.combined.scheme-medium ]; gridGraphics = [ pkgs.which ]; - adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; + adimpro = with pkgs; [ which xorg.xdpyinfo ]; mzR = [ pkgs.netcdf ]; cluster = [ pkgs.libiconv ]; KernSmooth = [ pkgs.libiconv ]; @@ -951,6 +955,18 @@ let ''; }); + R_cache = old.R_cache.overrideDerivation (attrs: { + preConfigure = '' + export R_CACHE_ROOTPATH=$TMP + ''; + }); + + lpsymphony = old.lpsymphony.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + }; in self diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R index da9e0970b0f4..1ac15ef79e79 100755 --- a/pkgs/development/r-modules/generate-r-packages.R +++ b/pkgs/development/r-modules/generate-r-packages.R @@ -48,8 +48,7 @@ escapeName <- function(name) { } formatPackage <- function(name, version, sha256, depends, imports, linkingTo) { - name <- escapeName(name) - attr <- gsub(".", "_", name, fixed=TRUE) + attr <- gsub(".", "_", escapeName(name), fixed=TRUE) options(warn=5) depends <- paste( if (is.na(depends)) "" else gsub("[ \t\n]+", "", depends) , if (is.na(imports)) "" else gsub("[ \t\n]+", "", imports) From 174c5e166e2e16919ad399316f1efaf194f30c0f Mon Sep 17 00:00:00 2001 From: Phil Dyer Date: Tue, 24 Aug 2021 21:16:51 +1000 Subject: [PATCH 011/138] r-modules: revert changes to lwgeom --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index cc8a840eda25..4341e659bed0 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -277,7 +277,7 @@ let KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; lpsymphony = with pkgs; [ pkg-config gfortran gettext ]; - lwgeom = with pkgs; [pkgs.proj.dev proj pkg-config geos sqlite gdal ]; + lwgeom = with pkgs; [ proj geos gdal ]; magick = [ pkgs.imagemagick.dev ]; ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl_1 ]; From 2321949d1f8ed0372dd2bf26d247a1fc58bf75b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 01:52:58 +0000 Subject: [PATCH 012/138] cargo-expand: 1.0.8 -> 1.0.9 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 1403f67abdab..304ede5214ab 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; From 8e532326dd909519b9623ff857717590cf42851d Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Fri, 27 Aug 2021 10:46:42 +0200 Subject: [PATCH 013/138] plex: 1.24.0.4930-ab6e1a058 -> 1.24.1.4931-1a38e63c6 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 40c2d3310f35..62247d83ddee 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" ]; From 690712624175de2f5856fcdcf43681792410e609 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 27 Aug 2021 17:50:41 +0200 Subject: [PATCH 014/138] nextcloud22: 22.1.0 -> 22.1.1 Changes: https://github.com/nextcloud/server/compare/v22.1.0...v22.1.1 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index f4131f6338ad..00b242ef87b3 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' From 561418f996fc015f4db48b1c9b7c31338cb280d9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 27 Aug 2021 22:36:45 +0200 Subject: [PATCH 015/138] nixos/nextcloud: add some notes for `Error: Command "upgrade" is not defined.` This error occurs if `nextcloud-occ maintenance:install` fails and the `upgrade` command is attempted to be executed afterwards. Due to the nature of the installer we can't do much about it, so I guess it makes sense to add some notes about it. The other notes in the `Pitfalls`-section are semantically a list of different topics, so I changed that accordingly now. Closes #111175 --- nixos/modules/services/web-apps/nextcloud.xml | 124 ++++++++++++------ 1 file changed, 85 insertions(+), 39 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 3af37b15dd56..0d5634e93bfe 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -84,47 +84,93 @@ +
- Pitfalls + Common problems + + + + General notes + + Unfortunately Nextcloud appears to be very stateful when it comes to + managing its own configuration. The config file lives in the home directory + of the nextcloud user (by default + /var/lib/nextcloud/config/config.php) and is also used to + track several states of the application (e.g. whether installed or not). + + + + All configuration parameters are also stored in + /var/lib/nextcloud/config/override.config.php which is generated by + the module and linked from the store to ensure that all values from + config.phpcan be modified by the module. + However config.php manages the application's state and shouldn't be + touched manually because of that. + + + Don't delete config.php! This file + tracks the application's state and a deletion can cause unwanted + side-effects! + - - Unfortunately Nextcloud appears to be very stateful when it comes to - managing its own configuration. The config file lives in the home directory - of the nextcloud user (by default - /var/lib/nextcloud/config/config.php) and is also used to - track several states of the application (e.g. whether installed or not). - - - - All configuration parameters are also stored in - /var/lib/nextcloud/config/override.config.php which is generated by - the module and linked from the store to ensure that all values from config.php - can be modified by the module. - However config.php manages the application's state and shouldn't be touched - manually because of that. - - - - Don't delete config.php! This file - tracks the application's state and a deletion can cause unwanted - side-effects! - - - - Don't rerun nextcloud-occ - maintenance:install! This command tries to install the application - and can cause unwanted side-effects! - - - - Nextcloud doesn't allow to move more than one major-version forward. If you're e.g. on - v16, you cannot upgrade to v18, you need to upgrade to - v17 first. This is ensured automatically as long as the - stateVersion is declared properly. In that case - the oldest version available (one major behind the one from the previous NixOS - release) will be selected by default and the module will generate a warning that reminds - the user to upgrade to latest Nextcloud after that deploy. - + + Don't rerun nextcloud-occ + maintenance:install! This command tries to install the application + and can cause unwanted side-effects! + + + + + Multiple version upgrades + + Nextcloud doesn't allow to move more than one major-version forward. If you're e.g. on + v16, you cannot upgrade to v18, you need to upgrade to + v17 first. This is ensured automatically as long as the + stateVersion is declared properly. In that case + the oldest version available (one major behind the one from the previous NixOS + release) will be selected by default and the module will generate a warning that reminds + the user to upgrade to latest Nextcloud after that deploy. + + + + + + <literal>Error: Command "upgrade" is not defined.</literal> + + This error usually occurs if the initial installation + (nextcloud-occ maintenance:install) has failed. After that, the application + is not installed, but the upgrade is attempted to be executed. Further context can + be found in NixOS/nixpkgs#111175. + + + + First of all, it makes sense to find out what went wrong by looking at the logs + of the installation via journalctl -u nextcloud-setup and try to fix + the underlying issue. + + + + + If this occurs on an existing setup, this is most likely because + the maintenance-mode is active. It can be deactivated by running + nextcloud-occ maintenance:mode --off. It's advisable though to + check the logs first on why the maintenance mode was activated. + + + + Only perform the following measures on + freshly installed instances! + + A re-run of the installer can be forced by deleting + /var/lib/nextcloud/config/config.php. This is the only time + where this is advisable because the fresh install doesn't have any state that can be lost. + In case that doesn't help, an entire re-creation can be forced via + rm -rf ~nextcloud/. + + + + +
From 2fe26c0ca9d7f2794deb9287209c7879431ed631 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Aug 2021 12:12:04 +0200 Subject: [PATCH 016/138] ssldump: 1.1 -> 1.4 --- pkgs/tools/networking/ssldump/default.nix | 48 +++++++++++++++++------ 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index fc92f43981b6..0d3e5ccf07e6 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 |' \ 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; }; } From e8d2c73f6e8e970a9fd8b0ca9aa610a486eea343 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 29 Aug 2021 10:08:55 +0200 Subject: [PATCH 017/138] anki-bin: passthru sources It wasn't possible to access the actual source on linux or that of the other OS --- pkgs/games/anki/bin.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index a3867c9390d6..089f141f7664 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -5,13 +5,21 @@ let # Update hashes for both Linux and Darwin! version = "2.1.46"; - unpacked = stdenv.mkDerivation { - inherit pname version; - - src = fetchurl { + sources = { + linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; sha256 = "1jzpf42fqhfbjr95k7bpsnf34sfinamp6v828y0sapa4gzfvwkkz"; }; + darwin = fetchurl { + url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; + sha256 = "003cmh5qdj5mkrpm51n0is872faj99dqfkaaxyyrn6x03s36l17y"; + }; + }; + + unpacked = stdenv.mkDerivation { + inherit pname version; + + src = sources.linux; installPhase = '' runHook preInstall @@ -32,6 +40,8 @@ let platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ atemu ]; }; + + passthru = { inherit sources; }; in if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { @@ -51,14 +61,11 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { $out/share/ ''; - inherit meta; + inherit meta passthru; }) else stdenv.mkDerivation { - inherit pname version; + inherit pname version passthru; - src = fetchurl { - url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "003cmh5qdj5mkrpm51n0is872faj99dqfkaaxyyrn6x03s36l17y"; - }; + src = sources.darwin; nativeBuildInputs = [ undmg ]; sourceRoot = "."; From 75d580619de8fe7b8d7771a53113b078343787ff Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 29 Aug 2021 10:11:47 +0200 Subject: [PATCH 018/138] anki-bin: 2.1.46 -> 2.1.47 --- pkgs/games/anki/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 089f141f7664..81de4f859683 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,16 +3,16 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.46"; + version = "2.1.47"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; - sha256 = "1jzpf42fqhfbjr95k7bpsnf34sfinamp6v828y0sapa4gzfvwkkz"; + sha256 = "sha256-cObvjXeDUDslfAhMOrlqyjidri6N7xLR2+LRz3hTdfg="; }; darwin = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "003cmh5qdj5mkrpm51n0is872faj99dqfkaaxyyrn6x03s36l17y"; + sha256 = "sha256-TwYrI9gSabJ5icOsygtEJRymkrSgCD8jDXMtpaJXgWg="; }; }; From 5b73af6f5b142b0a926492427c0dd7891915ccf4 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 15 Aug 2021 23:11:32 +0200 Subject: [PATCH 019/138] update-luarocks-packages: support in-repo rockspecs to handle derivations that are not registered or updated on luarocks.org, for instance neovim plugins. --- .../interpreters/lua-5/build-lua-package.nix | 38 +++++++++++++------ .../lua-modules/generated-packages.nix | 29 ++++++++------ .../lua-modules/generic/default.nix | 2 +- pkgs/top-level/lua-packages.nix | 4 +- 4 files changed, 46 insertions(+), 27 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 74f5b2b7b395..02c92cc51170 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -7,9 +7,10 @@ }: { -name ? "${attrs.pname}-${attrs.version}" +# name ? "${attrs.pname}-${attrs.version}" +pname, -, version +version # by default prefix `name` e.g. "lua5.2-${name}" , namePrefix ? if lua.pkgs.isLuaJIT @@ -60,7 +61,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 + # "../*.rockspec" +, rockspecDir ? "." # must be set for packages that don't have a rock , knownRockspec ? null @@ -71,6 +74,9 @@ name ? "${attrs.pname}-${attrs.version}" # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. let + generatedRockspecFilename = "${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 +150,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,12 +165,13 @@ 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 rockspecFilename; inherit rocksSubdir; # enabled only for src.rock setSourceRoot= let - name_only= lib.getName name; + # name_only= lib.getName name; + name_only= pname; in lib.optionalString (knownRockspec == null) '' # format is rockspec_basename/source_basename @@ -180,18 +187,23 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab ${luarocks_content} EOF export LUAROCKS_CONFIG="$PWD/${luarocks_config}"; - '' - + lib.optionalString (knownRockspec != null) '' - # prevents the following type of error: - # Inconsistency between rockspec filename (42fm1b3d7iv6fcbhgm9674as3jh6y2sh-luv-1.22.0-1.rockspec) and its contents (luv-1.22.0-1.rockspec) - rockspecFilename="$TMP/$(stripHash ''${knownRockspec})" - cp ''${knownRockspec} "$rockspecFilename" '' + + lib.optionalString (rockspecFilename == null) '' + rockspecFilename="${generatedRockspecFilename}" + '' + # + lib.optionalString (knownRockspec != null) '' + + # # prevents the following type of error: + # # Inconsistency between rockspec filename (42fm1b3d7iv6fcbhgm9674as3jh6y2sh-luv-1.22.0-1.rockspec) and its contents (luv-1.22.0-1.rockspec) + # rockspecFilename="$TMP/$(stripHash ''${knownRockspec})" + # cp ''${knownRockspec} "$rockspecFilename" + # '' + '' runHook postConfigure ''; + # TODO could be moved to configurePhase buildPhase = '' runHook preBuild @@ -225,7 +237,9 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab nix_debug "ROCKSPEC $rockspecFilename" nix_debug "cwd: $PWD" + set -x $LUAROCKS make --deps-mode=all --tree=$out ''${rockspecFilename} + set +x runHook postInstall ''; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d7a146ad4242..775d31cffb49 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -69,10 +69,11 @@ basexx = buildLuarocksPackage { pname = "basexx"; version = "0.4.1-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/basexx-0.4.1-1.rockspec"; - sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; - }).outPath; + # knownRockspec = (fetchurl { + # url = "https://luarocks.org/basexx-0.4.1-1.rockspec"; + # sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; + # }).outPath; + rockspecDir = "dist"; src = fetchurl { url = "https://github.com/aiq/basexx/archive/v0.4.1.tar.gz"; @@ -112,6 +113,8 @@ bit32 = buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; + NIX_DEBUG=3; + src = fetchurl { url = "https://luarocks.org/bit32-5.3.0-1.src.rock"; sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; @@ -1617,10 +1620,12 @@ plenary-nvim = buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/plenary.nvim-scm-1.rockspec"; - sha256 = "1xgqq0skg3vxahlnh1libc5dvhafp11k6k8cs65jcr9sw6xjycwh"; - }).outPath; + # knownRockspec = (fetchurl { + # url = "https://luarocks.org/plenary.nvim-scm-1.rockspec"; + # sha256 = "1xgqq0skg3vxahlnh1libc5dvhafp11k6k8cs65jcr9sw6xjycwh"; + # }).outPath; + # shouldn't this be the default ? + rockspecPath="."; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "git://github.com/nvim-lua/plenary.nvim", @@ -1684,10 +1689,10 @@ say = buildLuarocksPackage { pname = "say"; version = "1.3-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/say-1.3-1.rockspec"; - sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; - }).outPath; + # 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"; diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index de21d3d6a3e6..183a958b4e1f 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/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index f16917a94394..246d62b903b3 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 { From 7292ed91df14abc1d9b55322b5d112a9b34af6c7 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 16 Aug 2021 15:53:07 +0200 Subject: [PATCH 020/138] update-luarocks-packages: use the current nixpkgs restore the behavior of the previous updater that was using the current revision of nixpkgs instead of an outer one --- maintainers/scripts/update-luarocks-packages | 3 ++- maintainers/scripts/update-luarocks-shell.nix | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 6de97799846d..e0bdfec53bf9 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell -#!nix-shell -p nix-prefetch-git luarocks-nix python3 python3Packages.GitPython nix -i python3 +#!nix-shell update-luarocks-shell.nix -i python3 + # format: # $ nix run nixpkgs.python3Packages.black -c black update.py diff --git a/maintainers/scripts/update-luarocks-shell.nix b/maintainers/scripts/update-luarocks-shell.nix index d3f342b07a96..a58674fca8d3 100644 --- a/maintainers/scripts/update-luarocks-shell.nix +++ b/maintainers/scripts/update-luarocks-shell.nix @@ -1,12 +1,13 @@ { nixpkgs ? import ../.. { } }: with nixpkgs; +let + pyEnv = python3.withPackages(ps: [ ps.GitPython ]); +in mkShell { packages = [ - bash + pyEnv luarocks-nix nix-prefetch-scripts - parallel ]; - LUAROCKS_NIXPKGS_PATH = toString nixpkgs.path; } From a461d064cbfdcd69d8c904faf0e4e62f279e51b9 Mon Sep 17 00:00:00 2001 From: Joshua Trees Date: Sun, 29 Aug 2021 22:36:44 +0200 Subject: [PATCH 021/138] kakoune: 2020.09.01 -> 2021.08.28 --- pkgs/applications/editors/kakoune/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 1f3b2685feeb..45e65efaf5d4 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkg-config }: +{ lib, stdenv, fetchFromGitHub, asciidoc, docbook_xsl, libxslt, pkg-config }: 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 ]; + buildInputs = [ asciidoc docbook_xsl libxslt ]; makeFlags = [ "debug=no" ]; postPatch = '' From f432f3c4a470bc6af831945e5f7e719eeec9d5c4 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 29 Aug 2021 23:11:53 +0200 Subject: [PATCH 022/138] nixos-install-tools: Add tests.nixos-tests --- pkgs/tools/nix/nixos-install-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/nix/nixos-install-tools/default.nix b/pkgs/tools/nix/nixos-install-tools/default.nix index a129fb345215..8a00c15d905c 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 From 71af4f6ab199275e1a43d37875f12dd88ed3580c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 27 Aug 2021 01:31:00 -0300 Subject: [PATCH 023/138] uxn: init at 0.0.0+unstable=2021-08-27 --- pkgs/misc/emulators/uxn/default.nix | 54 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/misc/emulators/uxn/default.nix diff --git a/pkgs/misc/emulators/uxn/default.nix b/pkgs/misc/emulators/uxn/default.nix new file mode 100644 index 000000000000..3e4928412b11 --- /dev/null +++ b/pkgs/misc/emulators/uxn/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromSourcehut +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "uxn"; + version = "0.0.0+unstable=2021-08-30"; + + src = fetchFromSourcehut { + owner = "~rabbits"; + repo = pname; + rev = "a2e40d9d10c11ef48f4f93d0dc86f5085b4263ce"; + hash = "sha256-/hxDYi814nQydm2iQk4NID4vpJ3BcBcM6NdL0iuZk5M="; + }; + + buildInputs = [ + SDL2 + ]; + + dontConfigure = true; + + # It is easier to emulate build.sh script + buildPhase = '' + runHook preBuild + + cc -std=c89 -Wall -Wno-unknown-pragmas src/uxnasm.c -o uxnasm + cc -std=c89 -Wall -Wno-unknown-pragmas src/uxn.c src/uxncli.c -o uxncli + cc -std=c89 -Wall -Wno-unknown-pragmas src/uxn.c src/devices/ppu.c \ + src/devices/apu.c src/uxnemu.c $(sdl2-config --cflags --libs) -o uxnemu + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -d $out/bin/ $out/share/${pname}/ + + cp uxnasm uxncli uxnemu $out/bin/ + cp -r projects $out/share/${pname}/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://wiki.xxiivv.com/site/uxn.html"; + description = "An assembler and emulator for the Uxn stack machine"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fb2cc738db6..8aeaacbc3326 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -228,6 +228,8 @@ with pkgs; cen64 = callPackage ../misc/emulators/cen64 { }; + uxn = callPackage ../misc/emulators/uxn { }; + cereal = callPackage ../development/libraries/cereal { }; cewl = callPackage ../tools/security/cewl { }; From a748e65c121d072e2443b0f8c0773d2fc1ccfd86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 09:22:16 +0200 Subject: [PATCH 024/138] msgpack: 3.2.0 -> 3.3.0 --- pkgs/development/libraries/msgpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/msgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix index f94bd35c3019..d040eff11a32 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"; }; }) From 1cf45a505f6b4a95bf8463a32bc649d25c7eb668 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 10:35:09 +0200 Subject: [PATCH 025/138] mrtg: 2.17.7 -> 2.17.8 --- pkgs/tools/misc/mrtg/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index e8ebde4ad4d9..ee6c9776c54b 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; }; } From 85b532dad3c4b8e2f21c895fe07f17ec68f2243d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 11:03:31 +0200 Subject: [PATCH 026/138] bwm_ng: 0.6.1 -> 0.6.3 --- pkgs/tools/networking/bwm-ng/default.nix | 83 +++++++----------------- 1 file changed, 23 insertions(+), 60 deletions(-) diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 26cdfe7c0dbf..97f0d1823af2 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 ''; }; } From f4153fb02c10e63a6fbb501876f609c8a55f262d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 30 Aug 2021 11:43:07 +0100 Subject: [PATCH 027/138] grilo: add patch for CVE-2021-39365 --- pkgs/development/libraries/grilo/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 1b8c46394da3..172ae39536e6 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 = [ From 12d7e03f566dabd3ded953f5607692ad5c5cbf25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 13:45:35 +0200 Subject: [PATCH 028/138] python3Packages.pyupgrade: 2.24.0 -> 2.25.0 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index f5b338680bdf..636a05718420 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 ]; From ea4b2dbcbce077a47953522ad78d764b22a438a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Mon, 30 Aug 2021 14:53:07 +0300 Subject: [PATCH 029/138] android-tools: install missing tools --- pkgs/tools/misc/android-tools/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index b18366b057f9..8d74e74cb8ac 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 = '' From e9f8f75afc04dffb7c5d071d73d5f21037e1b136 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Aug 2021 07:58:39 -0400 Subject: [PATCH 030/138] rubygems: 3.2.24 -> 3.2.26 --- pkgs/development/interpreters/ruby/rubygems/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 6f089e51221f..4150f7683d5d 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rubygems"; - version = "3.2.24"; + version = "3.2.26"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "09ff830a043y6s7390hsg3k55ffpifb1zsvs0dhz8z8pypwgiscl"; + sha256 = "sha256-9wa6lOWnua8zBblQKRgjjiTVPYp2TW0n7XOvgW7u1e8="; }; patches = [ From b544112862fa347add65acced4466c3aaa620c7b Mon Sep 17 00:00:00 2001 From: Joshua Trees Date: Mon, 30 Aug 2021 16:38:33 +0200 Subject: [PATCH 031/138] kakoune: simplify derivation The dependencies and the sed patch appear to be redundant by now. --- pkgs/applications/editors/kakoune/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 45e65efaf5d4..dc91630b5cd2 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, asciidoc, docbook_xsl, libxslt, pkg-config }: +{ lib, stdenv, fetchFromGitHub, pkg-config }: with lib; @@ -12,17 +12,11 @@ stdenv.mkDerivation rec { sha256 = "13kc68vkrzg89khir6ayyxgbnmz16dhippcnw09hhzxivf5ayzpy"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ 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 - ''; - preConfigure = '' export version="v${version}" + export PREFIX=$out ''; enableParallelBuilding = true; From 9ec4fb0cd10d91831ba801ee675d6134f880c9f0 Mon Sep 17 00:00:00 2001 From: schotts-fired Date: Mon, 30 Aug 2021 18:24:42 +0200 Subject: [PATCH 032/138] R: add memory profiling compile option --- pkgs/applications/science/math/R/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 5de644dfdfac..a8fdfe8571a6 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -4,6 +4,7 @@ , curl, Cocoa, Foundation, libobjc, libcxx, tzdata , withRecommendedPackages ? true , enableStrictBarrier ? false +, enableMemoryProfiling ? false # R as of writing does not support outputting both .so and .a files; it outputs: # --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored , static ? false @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { --with-libtiff --with-ICU ${lib.optionalString enableStrictBarrier "--enable-strict-barrier"} + ${lib.optionalString enableMemoryProfiling "--enable-memory-profiling"} ${if static then "--enable-R-static-lib" else "--enable-R-shlib"} AR=$(type -p ar) AWK=$(type -p gawk) From 15937fa4b57204ab3caf2f3175f2cfcde4552c88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 18:57:03 +0200 Subject: [PATCH 033/138] python3Packages.scramp: 1.4.0 -> 1.4.1 --- .../python-modules/scramp/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix index 68e4b9821b1e..30e728940230 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" ]; From 008b192dd9642ef96cc2c240522fc729b2765d72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 19:00:04 +0200 Subject: [PATCH 034/138] python3Packages.pg8000: 1.21.0 -> 1.21.1 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 07efa604cad0..d8a002231057 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 = [ From e477127df0735afe24e4f53a382c8d39530a9506 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 30 Aug 2021 20:06:25 +0200 Subject: [PATCH 035/138] vault-bin: 1.8.1 -> 1.8.2 - https://github.com/hashicorp/vault/releases/tag/v1.8.2 --- pkgs/tools/security/vault/vault-bin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 52d0f261d4be..0540468df69d 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"; }; }; From 300b61c5944b72ed6e8b9d94aac2334b2f000c0c Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 30 Aug 2021 20:07:19 +0200 Subject: [PATCH 036/138] consul: 1.10.1 -> 1.10.2 - https://github.com/hashicorp/consul/releases/tag/v1.10.2 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 0b94528164c1..be6259e9559b 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.10.1"; + version = "1.10.2"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-oap0pXqtIbT9wMfD/RuJ2tTRynSvfzsgL8TyY4nj3sM="; + sha256 = "sha256-mA/s3J0ylE3C3IGaYfadeZV6PQ5Ooth6iQ4JEgPl44Q="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-DloQGxeooVhYWA5/ICkL2UEQvNPilb2F5pst78UzWPI="; + vendorSha256 = "sha256-MWQ1m2nvKdP8ZCDs0sjZCiW4DSGe3NnVl4sQ448cu5M="; doCheck = false; From 2fcc338369c6cd5399641c3281ae3cef444ab8d5 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 30 Aug 2021 20:09:05 +0200 Subject: [PATCH 037/138] nomad_1_0: 1.0.9 -> 1.0.10 - https://github.com/hashicorp/nomad/releases/tag/v1.0.10 --- pkgs/applications/networking/cluster/nomad/1.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 4966c42b9a42..62034a39bbc0 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"; } From 00d1b4f193401c05382c7cd67c9dd5525c043e9d Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 30 Aug 2021 20:09:50 +0200 Subject: [PATCH 038/138] nomad_1_1: 1.1.3 -> 1.1.4 - https://github.com/hashicorp/nomad/releases/tag/v1.1.4 --- pkgs/applications/networking/cluster/nomad/1.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix index e9c4ff8c9679..3d34331b57d1 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"; } From 27e4ca6ff1446d9e8eb087d7cc28e253264e8422 Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Mon, 30 Aug 2021 09:53:41 -0500 Subject: [PATCH 039/138] vimPlugins.neon: init at 2021-07-30 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 25804216adf0..f7bd56c5c9bf 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3442,6 +3442,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/neomru.vim/"; }; + neon = buildVimPluginFrom2Nix { + pname = "neon"; + version = "2021-07-30"; + src = fetchFromGitHub { + owner = "rafamadriz"; + repo = "neon"; + rev = "5c6d24504e2177a709ad16ae9e89ab5732327ad8"; + sha256 = "1p7g3204hjj52qnm5vdvh425r4xh0y8bsyfivpnp4zgz44rqd6v3"; + }; + meta.homepage = "https://github.com/rafamadriz/neon/"; + }; + neorg = buildVimPluginFrom2Nix { pname = "neorg"; version = "2021-08-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b3a956aa78a5..7b3731d0b6ac 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -573,6 +573,7 @@ Quramy/tsuquyomi racer-rust/vim-racer radenling/vim-dispatch-neovim rafamadriz/friendly-snippets@main +rafamadriz/neon@main rafaqz/ranger.vim rafi/awesome-vim-colorschemes raghur/fruzzy From 01b534e8884a6a997a1f382297c513d5c8a0d9b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 20:58:16 +0200 Subject: [PATCH 040/138] firefox: 91.0.1 -> 91.0.2 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4bbb98d7a834..70b8beb6fcea 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 = { From f6187a43a06b76ffd467646ab49ac0421d50d22c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 21:00:20 +0200 Subject: [PATCH 041/138] firefox-bin: 91.0.1 -> 91.0.2 --- .../browsers/firefox-bin/release_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 8d51e7a2c79a..20f0a0f64a6a 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"; } ]; } From 7484cbf58e201d57a1cfafb26e08efeb50a07d2d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Aug 2021 21:07:09 +0200 Subject: [PATCH 042/138] markdown-anki-decks: jailbreak more dependencies --- pkgs/tools/misc/markdown-anki-decks/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix index d74eb84dc340..01a6d2933222 100644 --- a/pkgs/tools/misc/markdown-anki-decks/default.nix +++ b/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -29,7 +29,10 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # No API changes. - substituteInPlace pyproject.toml --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' + substituteInPlace pyproject.toml \ + --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' \ + --replace 'genanki = "^0.10.1"' 'genanki = "^0.11.0"' \ + --replace 'typer = "^0.3.2"' 'typer = "^0.4.0"' ''; # No tests available on Pypi and there is only a failing version assertion test in the repo. From 5ad9e2a74b1cfc4a0816f358a621562795638be0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 12:50:35 +0000 Subject: [PATCH 043/138] linuxPackages.akvcam: 1.2.0 -> 1.2.2 The qmake-based build didn't seem to work any more, but there's a Kbuild-based build system available anyway, so let's just switch to that and save a dependency. Also clarify license. --- pkgs/os-specific/linux/akvcam/default.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 815dc6a2ee3c..700389a4a183 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -1,32 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, kernel, qmake }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { pname = "akvcam"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "webcamoid"; repo = "akvcam"; rev = version; - sha256 = "0r5xg7pz0wl6pq5029rpzm9fn978vq0md31xjkp2amny7rrgxw72"; + sha256 = "1f0vjia2d7zj3y5c63lx1r537bdjx6821yxy29ilbrvsbjq2szj8"; }; + sourceRoot = "source/src"; - nativeBuildInputs = [ qmake ]; - dontWrapQtApps = true; - - qmakeFlags = [ + makeFlags = [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; installPhase = '' - install -m644 -b -D src/akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko + install -m644 -b -D akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko ''; + enableParallelBuilding = true; + meta = with lib; { description = "Virtual camera driver for Linux"; homepage = "https://github.com/webcamoid/akvcam"; maintainers = with maintainers; [ freezeboy ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 709e8a2054ce..d6c75d3ee6d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21341,9 +21341,7 @@ with pkgs; acpi_call = callPackage ../os-specific/linux/acpi-call {}; - akvcam = callPackage ../os-specific/linux/akvcam { - inherit (qt5) qmake; - }; + akvcam = callPackage ../os-specific/linux/akvcam { }; amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; From 7032ab6d616e3ce6092d2231f1e718ec98f8424a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 13:46:53 +0000 Subject: [PATCH 044/138] linuxPackages.isgx: enable parallel building Tested at -j48. --- pkgs/os-specific/linux/isgx/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/isgx/default.nix b/pkgs/os-specific/linux/isgx/default.nix index 3e551e559170..fb6caf3bacbe 100644 --- a/pkgs/os-specific/linux/isgx/default.nix +++ b/pkgs/os-specific/linux/isgx/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + enableParallelBuilding = true; + meta = with lib; { description = "Intel SGX Linux Driver"; longDescription = '' From 0afbe1f28b46e8de86a47c6bfed8cd96466c7f9d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 21:43:10 +0200 Subject: [PATCH 045/138] tfsec: 0.58.5 -> 0.58.6 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 5c4f07482c90..5ded1e5cab25 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.5"; + version = "0.58.6"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-awTRECHHNGebzV08Qy2I6rX4eS2z07NZLsQFPoA0UXA="; + sha256 = "sha256-FTrzEVTmMxXshDOvlSmQEwekde621KIclpFm1oEduEo="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From a7432ad3115c153a901cd49da24e7b766cce1e21 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 30 Aug 2021 14:56:52 -0500 Subject: [PATCH 046/138] qt5.qt3d: init module --- pkgs/development/libraries/qt-5/5.12/default.nix | 3 ++- pkgs/development/libraries/qt-5/5.14/default.nix | 3 ++- pkgs/development/libraries/qt-5/5.15/default.nix | 3 ++- pkgs/development/libraries/qt-5/modules/qt3d.nix | 7 +++++++ 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/modules/qt3d.nix diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 680debc164f7..3adb46cd4ee6 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -144,6 +144,7 @@ let inherit (darwin) libobjc; }; + qt3d = callPackage ../modules/qt3d.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; @@ -192,7 +193,7 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects + qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index eaf7998047f0..4662e45fdfdc 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -156,6 +156,7 @@ let inherit (darwin) libobjc; }; + qt3d = callPackage ../modules/qt3d.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; @@ -202,7 +203,7 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 59c2c7048044..d835ee63dc46 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -182,6 +182,7 @@ let inherit (darwin) libobjc; }; + qt3d = callPackage ../modules/qt3d.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; @@ -231,7 +232,7 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets diff --git a/pkgs/development/libraries/qt-5/modules/qt3d.nix b/pkgs/development/libraries/qt-5/modules/qt3d.nix new file mode 100644 index 000000000000..63a516476f27 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -0,0 +1,7 @@ +{ qtModule, qtbase, qtdeclarative }: + +qtModule { + pname = "qt3d"; + qtInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; +} From a8dc11b757e2f89829eb7a377e9f8cd37a9a7d0b Mon Sep 17 00:00:00 2001 From: GTrunSec Date: Mon, 30 Aug 2021 13:10:59 -0700 Subject: [PATCH 047/138] onlyoffice-bin: 6.2.0 -> 6.3.1 --- pkgs/applications/office/onlyoffice-bin/default.nix | 13 ++++++++----- pkgs/applications/office/onlyoffice-bin/update.sh | 5 +++++ 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/office/onlyoffice-bin/update.sh diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index 75e6924db9c5..121a65f941c8 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 000000000000..d7b0bc106fa2 --- /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" From 20ce363de43e45cc636c1bee04e0d97a424e08e7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 30 Aug 2021 15:15:44 -0500 Subject: [PATCH 048/138] qt5: Expose internal variables to facilitate out-of-tree building of modules As it is currently it's almost impossible to accomplish something like: ```nix ... (qt5.callPackage ( { qtModule, qtbase, qtdeclarative }: qtModule { pname = "qt3d"; qtInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } ) { }) ... ``` because all the required variables such as qtModule are internal-only. By exposing these it's easier for external projects not to be bound exactly by the module definitions explicitly listed in nixpkgs. --- pkgs/development/libraries/qt-5/5.12/default.nix | 2 ++ pkgs/development/libraries/qt-5/5.14/default.nix | 2 ++ pkgs/development/libraries/qt-5/5.15/default.nix | 2 ++ 3 files changed, 6 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 680debc164f7..2e7029f71464 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 eaf7998047f0..e74c91ecb5d3 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 59c2c7048044..f696a66f67b9 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; }; From ff0dfaaee0975cc0deb118f51120e281eccc6497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 30 Aug 2021 11:49:04 -0500 Subject: [PATCH 049/138] =?UTF-8?q?nvidia=5Fx11:=20470.57.02=20=E2=86=92?= =?UTF-8?q?=20470.63.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d763c1576cd8..7dccdccaf7b8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "470.57.02"; - sha256_64bit = "sha256-VdeuEEgn+qeel1Mh/itg+d1C+/9lZCBTRDwOVv20xH0="; - settingsSha256 = "sha256-DJg5QbyuKJmPpLQVYgTLvucI1e9YgQOO16690VXIWvk="; - persistencedSha256 = "sha256-Cqv6oUFnsSi3S1sjplJKeq9bI2pqgBXPPb11HOJSlDo="; + version = "470.63.01"; + sha256_64bit = "sha256:057dsc0j3136r5gc08id3rwz9c0x7i01xkcwfk77vqic9b6486kg"; + settingsSha256 = "sha256:0lizp4hn49yvca2yd76yh3awld98pkaa35a067lpcld35vb5brgv"; + persistencedSha256 = "sha256:1f3gdpa23ipjy2xwf7qnxmw7w8xxhqy25rmcz34xkngjf4fn4pbs"; } else legacy_390; From 8bfb5762506054294052d5b1df822518c5e382fd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 08:33:52 +0000 Subject: [PATCH 050/138] linux_latest: 5.13.13 -> 5.14 --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 +++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-5.14.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix new file mode 100644 index 000000000000..e6a76146ce74 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.14"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1cki6af9r30k8820j73qdyycp23mwpf2a2rjwl82p9i61mg8n1ky"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6c75d3ee6d8..ef192a69fc77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21263,6 +21263,13 @@ with pkgs; ]; }; + linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -21553,7 +21560,7 @@ with pkgs; # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_13; + linuxPackages_latest = linuxPackages_5_14; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. @@ -21578,6 +21585,7 @@ with pkgs; linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); + linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14); # When adding to the list above: # - Update linuxPackages_latest to the latest version From 3e299737a2a34e6d6e38f724377aaf4a820a1402 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 07:46:49 +0000 Subject: [PATCH 051/138] linux_latest-libre: 18260 -> 18268 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index a183b6859498..91134e18a8a2 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18260"; - sha256 = "11mmdix0vq9yrivx300ay6np3xx1gdqdr4cqdxr1wa84dbl7c2dm"; + rev = "18268"; + sha256 = "050rk485csj41yfydr1cvn60vhb3lzbb3486sm832vp55d34i8fd"; } , ... }: From 15e5c924959cc2e8398737b69fbeb7b2082a836a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 16 Aug 2021 17:44:40 +0200 Subject: [PATCH 052/138] luaPackages: update --- maintainers/scripts/luarocks-packages.csv | 177 +++-- maintainers/scripts/update-luarocks-packages | 50 +- .../interpreters/lua-5/build-lua-package.nix | 24 +- .../lua-modules/generated-packages.nix | 637 ++++++++---------- pkgs/development/lua-modules/overrides.nix | 19 +- .../tools/misc/luarocks/luarocks-nix.nix | 21 +- 6 files changed, 462 insertions(+), 466 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 48a9d0e3d3a9..8a590e1185c5 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,89 +1,88 @@ -name,server,version,luaversion,maintainers -alt-getopt,,,,arobyn -ansicolors,,,, -bit32,,5.3.0-1,lua5_1,lblasc -argparse,,,, -basexx,,,, -binaryheap,,,,vcunat -busted,,,, -cassowary,,,,marsam alerque -compat53,,0.7-1,,vcunat -cosmo,,,,marsam -coxpcall,,1.17.0-1,, -cqueues,,,,vcunat -cyrussasl,,,, -digestif,,0.2-1,lua5_3, -dkjson,,,, -fifo,,,, -gitsigns.nvim,,,lua5_1, -http,,0.3-0,,vcunat -inspect,,,, -ldbus,http://luarocks.org/dev,,, -ldoc,,,, -lgi,,,, -linenoise,,,, -ljsyscall,,,lua5_1,lblasc -lpeg,,,,vyp -lpeg_patterns,,,, -lpeglabel,,,, -lpty,,,, -lrexlib-gnu,,,, -lrexlib-pcre,,,,vyp -lrexlib-posix,,,, -ltermbox,,,, -lua-cjson,,,, -lua-cmsgpack,,,, -lua-iconv,,,, -lua-lsp,http://luarocks.org/dev,,, -lua-messagepack,,,, -lua-resty-http,,,, -lua-resty-jwt,,,, -lua-resty-openidc,,,, -lua-resty-openssl,,,, -lua-resty-session,,,, -lua-term,,,, -lua-toml,,,, -lua-zlib,,,,koral -lua_cliargs,,,, -luabitop,,,, -luacheck,,,, -luacov,,,, -luadbi,,,, -luadbi-mysql,,,, -luadbi-postgresql,,,, -luadbi-sqlite3,,,, -luadoc,,,, -luaepnf,,,, -luaevent,,,, -luaexpat,,1.3.0-1,,arobyn flosse -luaffi,http://luarocks.org/dev,,, -luafilesystem,,1.7.0-2,,flosse -lualogging,,,, -luaossl,,,lua5_1, -luaposix,,34.1.1-1,,vyp lblasc -luarepl,,,, -luasec,,,,flosse -luasocket,,,, -luasql-sqlite3,,,,vyp -luassert,,,, -luasystem,,,, -luautf8,,,,pstn -luazip,,,, -lua-yajl,,,,pstn -luuid,,,, -luv,,1.30.0-0,, -lyaml,,,,lblasc -markdown,,,, -mediator_lua,,,, -mpack,,,, -moonscript,,,,arobyn -nvim-client,,,, -penlight,,,, -plenary.nvim,,,lua5_1, -rapidjson,,,, -readline,,,, -say,,,, -std._debug,,,, -std.normalize,,,, -stdlib,,,,vyp -vstruct,,,, +name,src,ref,server,version,luaversion,maintainers +alt-getopt,,,,,,arobyn +ansicolors,https://github.com/kikito/ansicolors.lua,,,,, +bit32,,,,5.3.0-1,lua5_1,lblasc +argparse,https://github.com/luarocks/argparse.git,,,,, +basexx,https://github.com/teto/basexx.git,,,,, +binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat +busted,,,,,, +cassowary,,,,,,marsam alerque +compat53,,,,0.7-1,,vcunat +cosmo,,,,,,marsam +coxpcall,,,,1.17.0-1,, +cqueues,,,,,,vcunat +cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, +digestif,https://github.com/astoff/digestif.git,,,0.2-1,lua5_3, +dkjson,,,,,, +fifo,,,,,, +gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,lua5_1, +http,,,,0.3-0,,vcunat +inspect,,,,,, +ldbus,,,http://luarocks.org/dev,,, +ldoc,https://github.com/stevedonovan/LDoc.git,,,,, +linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, +ljsyscall,,,,,lua5_1,lblasc +lpeg,,,,,,vyp +lpeg_patterns,,,,,, +lpeglabel,,,,,, +lpty,,,,,, +lrexlib-gnu,,,,,, +lrexlib-pcre,,,,,,vyp +lrexlib-posix,,,,,, +ltermbox,,,,,, +lua-cjson,,,,,, +lua-cmsgpack,,,,,, +lua-iconv,,,,,, +lua-lsp,,,,,, +lua-messagepack,,,,,, +lua-resty-http,,,,,, +lua-resty-jwt,,,,,, +lua-resty-openidc,,,,,, +lua-resty-openssl,,,,,, +lua-resty-session,,,,,, +lua-term,,,,,, +lua-toml,,,,,, +lua-zlib,,,,,,koral +lua_cliargs,https://github.com/amireh/lua_cliargs.git,,,,, +luabitop,https://github.com/teto/luabitop.git,,,,, +luacheck,,,,,, +luacov,,,,,, +luadbi,,,,,, +luadbi-mysql,,,,,, +luadbi-postgresql,,,,,, +luadbi-sqlite3,,,,,, +luadoc,,,,,, +luaepnf,,,,,, +luaevent,,,,,, +luaexpat,,,,1.3.0-1,,arobyn flosse +luaffi,,,http://luarocks.org/dev,,, +luafilesystem,,,,1.7.0-2,,flosse +lualogging,,,,,, +luaossl,,,,,lua5_1, +luaposix,,,,34.1.1-1,,vyp lblasc +luarepl,,,,,, +luasec,,,,,,flosse +luasocket,,,,,, +luasql-sqlite3,,,,,,vyp +luassert,,,,,, +luasystem,,,,,, +luautf8,,,,,,pstn +luazip,,,,,, +lua-yajl,,,,,,pstn +luuid,,,,,, +luv,,,,1.30.0-0,, +lyaml,,,,,,lblasc +markdown,,,,,, +mediator_lua,,,,,, +mpack,,,,,, +moonscript,,,,,,arobyn +nvim-client,https://github.com/neovim/lua-client.git,,,,, +penlight,https://github.com/Tieske/Penlight.git,,,,, +plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1, +rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, +readline,,,,,, +say,https://github.com/Olivine-Labs/say.git,,,,, +std._debug,https://github.com/lua-stdlib/_debug.git,,,,, +std.normalize,git://github.com/lua-stdlib/normalize.git,,,,, +stdlib,https://github.com/lua-stdlib/lua-stdlib.git,,,,,vyp +vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index e0bdfec53bf9..55076f889e99 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -1,7 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell update-luarocks-shell.nix -i python3 - # format: # $ nix run nixpkgs.python3Packages.black -c black update.py # type-check: @@ -20,7 +19,7 @@ import logging import textwrap from multiprocessing.dummy import Pool -from typing import List, Tuple +from typing import List, Tuple, Optional from pathlib import Path log = logging.getLogger() @@ -51,10 +50,21 @@ FOOTER=""" @dataclass class LuaPlugin: name: str - version: str + '''Name of the plugin, as seen on luarocks.org''' + src: str + '''address to the git repository''' + ref: str + '''git reference (branch name/tag)''' + version: Optional[str] + '''Set it to pin a package ''' server: str - luaversion: str - maintainers: str + '''luarocks.org registers packages under different manifests. + Its value can be 'http://luarocks.org/dev' + ''' + luaversion: Optional[str] + '''Attribue of the lua interpreter if a package is available only for a specific lua version''' + maintainers: Optional[str] + ''' Optional string listing maintainers separated by spaces''' @property def normalized_name(self) -> str: @@ -150,16 +160,33 @@ def generate_pkg_nix(plug: LuaPlugin): Our cache key associates "p.name-p.version" to its rockspec ''' log.debug("Generating nix expression for %s", plug.name) - cmd = [ "luarocks", "nix", plug.name] + cmd = [ "luarocks", "nix"] - if plug.server: - cmd.append(f"--only-server={plug.server}") if plug.maintainers: cmd.append(f"--maintainers={plug.maintainers}") - if plug.version: - cmd.append(plug.version) + # updates plugin directly from its repository + print("server: [%s]" % plug.server) + # if plug.server == "src": + if plug.src != "": + if plug.src is None: + msg = "src must be set when 'version' is set to \"src\" for package %s" % plug.name + log.error(msg) + raise RuntimeError(msg) + log.debug("Updating from source %s", plug.src) + cmd.append(plug.src) + # update the plugin from luarocks + else: + cmd.append(plug.name) + if plug.version and plug.version != "src": + + cmd.append(plug.version) + + # + if plug.server != "src" and plug.server: + cmd.append(f"--only-server={plug.server}") + if plug.luaversion: with CleanEnvironment(): @@ -170,7 +197,7 @@ def generate_pkg_nix(plug: LuaPlugin): lua_drv_path=subprocess.check_output(cmd2, text=True).strip() cmd.append(f"--lua-dir={lua_drv_path}/bin") - log.debug("running %s", cmd) + log.debug("running %s", ' '.join(cmd)) output = subprocess.check_output(cmd, text=True) return (plug, output) @@ -192,3 +219,4 @@ if __name__ == "__main__": main() +# vim: set ft=python noet fdm=manual fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 02c92cc51170..8c9204c0b288 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -74,7 +74,7 @@ version # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. let - generatedRockspecFilename = "${pname}-${version}.rockspec"; + generatedRockspecFilename = "${rockspecDir}/${pname}-${version}.rockspec"; # TODO fix warnings "Couldn't load rockspec for ..." during manifest @@ -169,16 +169,17 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab inherit rocksSubdir; # enabled only for src.rock - setSourceRoot= let - # name_only= lib.getName name; - name_only= pname; - 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" - ''; + # setSourceRoot= let + # # name_only= lib.getName name; + # name_only= pname; + # in + # # if this is a rockFile + # 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 @@ -187,6 +188,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab ${luarocks_content} EOF export LUAROCKS_CONFIG="$PWD/${luarocks_config}"; + echo "pwd: $PWD" '' + lib.optionalString (rockspecFilename == null) '' diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 775d31cffb49..a29f037d8da2 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -21,10 +21,10 @@ alt-getopt = buildLuarocksPackage { 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"; }; }; @@ -34,13 +34,14 @@ ansicolors = buildLuarocksPackage { 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"; + url = "https://github.com/kikito/ansicolors.lua/archive/v1.0.2.tar.gz"; + sha256 = "0r4xi57njldmar9pn77l0vr5701rpmilrm51spv45lz0q9js8xps"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/kikito/ansicolors.lua"; description = "Library for color Manipulation."; license.fullName = "MIT "; @@ -49,16 +50,24 @@ ansicolors = buildLuarocksPackage { 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,23 +76,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"; @@ -95,16 +99,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"; }; }; @@ -113,8 +118,6 @@ bit32 = buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; - NIX_DEBUG=3; - src = fetchurl { url = "https://luarocks.org/bit32-5.3.0-1.src.rock"; sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; @@ -122,10 +125,10 @@ bit32 = buildLuarocksPackage { 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"; }; }; @@ -134,11 +137,6 @@ busted = buildLuarocksPackage { pname = "busted"; version = "2.0.0-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/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"; @@ -147,7 +145,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 "; @@ -165,10 +163,10 @@ cassowary = buildLuarocksPackage { 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"; }; }; @@ -178,16 +176,16 @@ compat53 = buildLuarocksPackage { version = "0.7-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/compat53-0.7-1.src.rock"; + url = "https://luarocks.org/compat53-0.7-1.src.rock"; sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; }; 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"; }; }; @@ -202,10 +200,10 @@ cosmo = buildLuarocksPackage { }; 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"; }; }; @@ -215,11 +213,11 @@ coxpcall = buildLuarocksPackage { version = "1.17.0-1"; src = fetchurl { - url = "https://luarocks.org/coxpcall-1.17.0-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/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"; @@ -237,10 +235,10 @@ cqueues = buildLuarocksPackage { 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"; }; }; @@ -249,13 +247,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", @@ -269,7 +262,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"; @@ -278,16 +271,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"; @@ -296,16 +297,16 @@ digestif = buildLuarocksPackage { dkjson = buildLuarocksPackage { pname = "dkjson"; - version = "2.5-2"; + version = "2.5-3"; src = fetchurl { - url = "https://luarocks.org/dkjson-2.5-2.src.rock"; - sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; + url = "https://luarocks.org/dkjson-2.5-3.src.rock"; + sha256 = "0v5sihm85r0f458n1wvfjlmz59hjqlg5ndpp6dhd68fvrjikaw80"; }; - 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"; @@ -322,7 +323,7 @@ fifo = buildLuarocksPackage { }; 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"; @@ -333,17 +334,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 @@ -353,7 +349,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"; @@ -365,16 +361,16 @@ http = buildLuarocksPackage { version = "0.3-0"; src = fetchurl { - url = "https://luarocks.org/http-0.3-0.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/http-0.3-0.src.rock"; sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; }; 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"; }; }; @@ -384,13 +380,13 @@ inspect = buildLuarocksPackage { version = "3.1.1-0"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/inspect-3.1.1-0.src.rock"; + url = "https://luarocks.org/inspect-3.1.1-0.src.rock"; sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; }; 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 "; @@ -401,13 +397,8 @@ 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", @@ -421,7 +412,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"; @@ -430,54 +421,33 @@ ldbus = buildLuarocksPackage { ldoc = buildLuarocksPackage { pname = "ldoc"; - version = "1.4.6-2"; + version = "scm-3"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/ldoc-1.4.6-2.rockspec"; - sha256 = "14yb0qihizby8ja0fa82vx72vk903mv6m7izn39mzfrgb8mha0pm"; - }).outPath; - - 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"; }; }; -lgi = buildLuarocksPackage { - pname = "lgi"; - version = "0.9.2-1"; - - 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; { - homepage = "http://github.com/pavouk/lgi"; - description = "Lua bindings to GObject libraries"; - license.fullName = "MIT/X11"; - }; -}; - 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"; @@ -486,7 +456,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"; @@ -504,10 +474,10 @@ ljsyscall = buildLuarocksPackage { 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"; }; }; @@ -517,16 +487,16 @@ lpeg = buildLuarocksPackage { version = "1.0.2-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg-1.0.2-1.src.rock"; + url = "https://luarocks.org/lpeg-1.0.2-1.src.rock"; sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; }; 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"; }; }; @@ -536,12 +506,12 @@ lpeg_patterns = buildLuarocksPackage { version = "0.5-0"; src = fetchurl { - url = "https://luarocks.org/lpeg_patterns-0.5-0.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg_patterns-0.5-0.src.rock"; sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; }; 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"; @@ -559,7 +529,7 @@ lpeglabel = buildLuarocksPackage { 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"; @@ -571,13 +541,13 @@ lpty = buildLuarocksPackage { version = "1.2.2-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock"; + url = "https://luarocks.org/lpty-1.2.2-1.src.rock"; sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; }; 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"; @@ -595,7 +565,7 @@ lrexlib-gnu = buildLuarocksPackage { 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"; @@ -607,16 +577,16 @@ lrexlib-pcre = buildLuarocksPackage { version = "2.9.1-1"; src = fetchurl { - url = "https://luarocks.org/lrexlib-pcre-2.9.1-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/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"; }; }; @@ -632,7 +602,7 @@ lrexlib-posix = buildLuarocksPackage { 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"; @@ -650,7 +620,7 @@ ltermbox = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "http://code.google.com/p/termbox"; description = "A termbox library package"; license.fullName = "New BSD License"; @@ -668,7 +638,7 @@ lua-cjson = buildLuarocksPackage { 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"; @@ -679,13 +649,8 @@ 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", + "url": "https://github.com/antirez/lua-cmsgpack.git", "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", "date": "2018-06-14T11:56:56+02:00", "path": "/nix/store/ndjf00i9r45gvy8lh3vp218y4w4md33p-lua-cmsgpack", @@ -699,7 +664,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"; @@ -717,7 +682,7 @@ lua-iconv = buildLuarocksPackage { 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"; @@ -726,29 +691,16 @@ lua-iconv = buildLuarocksPackage { lua-lsp = buildLuarocksPackage { pname = "lua-lsp"; - version = "scm-5"; - - knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-lsp-scm-5.rockspec"; - sha256 = "19nlnglg50vpz3wmqvnqafajjkqp8f2snqnfmihz3zi5rpdvzjya"; - }).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", - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; + version = "0.1.0-2"; + src = fetchurl { + url = "https://luarocks.org/lua-lsp-0.1.0-2.src.rock"; + sha256 = "1cxj5qjdycx4vh411wb18kgglzcyarmm8495nw3yl5h2rx1pk3d3"; + }; 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"; @@ -766,7 +718,7 @@ lua-messagepack = buildLuarocksPackage { 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"; @@ -778,13 +730,13 @@ lua-resty-http = buildLuarocksPackage { version = "0.16.1-0"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-resty-http-0.16.1-0.src.rock"; + url = "https://luarocks.org/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"; @@ -802,7 +754,7 @@ lua-resty-jwt = buildLuarocksPackage { 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"; @@ -820,7 +772,7 @@ lua-resty-openidc = buildLuarocksPackage { 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"; @@ -836,7 +788,7 @@ lua-resty-openssl = buildLuarocksPackage { sha256 = "16rzcf6z9rgln4sc0v785awn2f3mi9yrswsk5xsfdsb2y1sdxdc0"; }; - meta = with lib; { + meta = { homepage = "https://github.com/fffonion/lua-resty-openssl"; description = "No summary"; license.fullName = "BSD"; @@ -854,7 +806,7 @@ lua-resty-session = buildLuarocksPackage { 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"; @@ -865,18 +817,13 @@ 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"; @@ -894,7 +841,7 @@ lua-toml = buildLuarocksPackage { 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"; @@ -912,10 +859,10 @@ lua-yajl = buildLuarocksPackage { 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"; }; }; @@ -924,13 +871,8 @@ 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", + "url": "https://github.com/brimworks/lua-zlib.git", "rev": "82d0fdfe8ddd8645970f55011c13d87469501615", "date": "2021-03-08T06:04:09-08:00", "path": "/nix/store/2wr6l2djjl2l63wq1fddfm9ljrrkplr5-lua-zlib", @@ -944,10 +886,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"; }; }; @@ -957,13 +899,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 "; @@ -974,17 +917,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 @@ -994,7 +932,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"; @@ -1012,7 +950,7 @@ luacheck = buildLuarocksPackage { 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"; @@ -1030,7 +968,7 @@ luacov = buildLuarocksPackage { 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"; @@ -1048,7 +986,7 @@ luadbi = buildLuarocksPackage { 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"; @@ -1066,7 +1004,7 @@ luadbi-mysql = buildLuarocksPackage { 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"; @@ -1084,7 +1022,7 @@ luadbi-postgresql = buildLuarocksPackage { 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"; @@ -1102,7 +1040,7 @@ luadbi-sqlite3 = buildLuarocksPackage { 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"; @@ -1119,7 +1057,7 @@ luadoc = buildLuarocksPackage { }; propagatedBuildInputs = [ lualogging luafilesystem ]; - meta = with lib; { + meta = { homepage = "http://luadoc.luaforge.net/"; description = "LuaDoc is a documentation tool for Lua source code"; license.fullName = "MIT/X11"; @@ -1137,7 +1075,7 @@ luaepnf = buildLuarocksPackage { 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"; @@ -1155,7 +1093,7 @@ luaevent = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with lib; { + meta = { homepage = "https://github.com/harningt/luaevent"; description = "libevent binding for Lua"; license.fullName = "MIT"; @@ -1173,10 +1111,10 @@ luaexpat = buildLuarocksPackage { 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"; }; }; @@ -1192,7 +1130,7 @@ luaffi = buildLuarocksPackage { 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"; @@ -1210,25 +1148,25 @@ luafilesystem = buildLuarocksPackage { 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"; src = fetchurl { - url = "https://luarocks.org/lualogging-1.5.1-1.src.rock"; - sha256 = "1c98dnpfa2292g9xhpgsrfdvm80r1fhndrpay1hcgnq0qnz1sibh"; + url = "https://luarocks.org/lualogging-1.5.2-1.src.rock"; + sha256 = "1rxandfjff8z1jnryq9vcvhnva7qyrl7zjrc1mihg6fbddzdcfg7"; }; propagatedBuildInputs = [ luasocket ]; - meta = with lib; { + meta = { homepage = "https://github.com/lunarmodules/lualogging"; description = "A simple API to use logging features"; license.fullName = "MIT/X11"; @@ -1245,7 +1183,7 @@ luaossl = buildLuarocksPackage { }; 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"; @@ -1263,10 +1201,10 @@ luaposix = buildLuarocksPackage { 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"; }; }; @@ -1275,11 +1213,6 @@ 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"; @@ -1288,7 +1221,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"; @@ -1297,19 +1230,19 @@ luarepl = buildLuarocksPackage { luasec = buildLuarocksPackage { pname = "luasec"; - version = "1.0.1-1"; + version = "1.0.2-1"; src = fetchurl { - url = "https://luarocks.org/luasec-1.0.1-1.src.rock"; - sha256 = "0384afx1w124ljs3hpp31ldqlrrgsa2xl625sxrx79yddilgk48f"; + url = "https://luarocks.org/luasec-1.0.2-1.src.rock"; + sha256 = "1c3zqv2fbspvxplj3had9m3rij51bn9krx5kmdcqc3lgmn5d1mby"; }; 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"; }; }; @@ -1325,7 +1258,7 @@ luasocket = buildLuarocksPackage { 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"; @@ -1336,17 +1269,12 @@ 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 @@ -1356,10 +1284,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"; }; }; @@ -1368,11 +1296,6 @@ 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"; @@ -1381,7 +1304,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 "; @@ -1399,7 +1322,7 @@ luasystem = buildLuarocksPackage { 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 "; @@ -1411,16 +1334,16 @@ luautf8 = buildLuarocksPackage { version = "0.1.3-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luautf8-0.1.3-1.src.rock"; + url = "https://luarocks.org/luautf8-0.1.3-1.src.rock"; sha256 = "1yp4j1r33yvsqf8cggmf4mhaxhz5lqzxhl9mnc0q5lh01yy5di48"; }; 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"; }; }; @@ -1436,7 +1359,7 @@ luazip = buildLuarocksPackage { 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"; @@ -1454,7 +1377,7 @@ luuid = buildLuarocksPackage { 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"; @@ -1466,13 +1389,13 @@ luv = buildLuarocksPackage { version = "1.30.0-0"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.30.0-0.src.rock"; + url = "https://luarocks.org/luv-1.30.0-0.src.rock"; sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; }; 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"; @@ -1490,10 +1413,10 @@ lyaml = buildLuarocksPackage { 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"; }; }; @@ -1509,7 +1432,7 @@ markdown = buildLuarocksPackage { 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"; @@ -1520,11 +1443,6 @@ 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"; @@ -1533,7 +1451,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 "; @@ -1551,10 +1469,10 @@ moonscript = buildLuarocksPackage { 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"; }; }; @@ -1563,18 +1481,13 @@ 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"; @@ -1586,13 +1499,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"; @@ -1601,15 +1515,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 = true; + + meta = { homepage = "https://lunarmodules.github.io/penlight"; description = "Lua utility libraries loosely based on the Python standard libraries"; license.fullName = "MIT/X11"; @@ -1620,19 +1545,12 @@ plenary-nvim = buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; - # knownRockspec = (fetchurl { - # url = "https://luarocks.org/plenary.nvim-scm-1.rockspec"; - # sha256 = "1xgqq0skg3vxahlnh1libc5dvhafp11k6k8cs65jcr9sw6xjycwh"; - # }).outPath; - # shouldn't this be the default ? - rockspecPath="."; - 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 @@ -1642,7 +1560,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"; @@ -1653,14 +1571,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"; @@ -1678,7 +1604,7 @@ readline = buildLuarocksPackage { 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"; @@ -1689,11 +1615,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"; @@ -1702,7 +1623,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 "; @@ -1711,16 +1632,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"; @@ -1729,16 +1658,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"; @@ -1747,19 +1684,27 @@ std-normalize = buildLuarocksPackage { stdlib = buildLuarocksPackage { pname = "stdlib"; - version = "41.2.2-1"; + version = "git-1"; - src = fetchurl { - url = "https://luarocks.org/stdlib-41.2.2-1.src.rock"; - sha256 = "1kricll40xy75j72lrbp2jpyxsj9v8b9d7qjf3m3fq1bpg6dmsk7"; - }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lua-stdlib/lua-stdlib.git", + "rev": "a632078f216ac6b9994449b7f1435a419172b44f", + "date": "2018-01-01T20:51:44-08:00", + "path": "/nix/store/m9mqhcghsr178sjllv5ibbs588krd4qh-lua-stdlib", + "sha256": "0hphmqyp33v90i3pjyr4p33c1pmglbzass8yzlaxfxp2ya7k2vsi", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; - meta = with lib; { + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua std-_debug std-normalize ldoc ]; + + 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"; }; }; @@ -1768,14 +1713,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": "b6889e3b275e9f9532b5dff4917e903b17e22730", + "date": "2020-08-01T22:14:34-04:00", + "path": "/nix/store/wayczacy4ds2j320f45yghw9arqzj5s9-vstruct", + "sha256": "0mjvcybh4r8lwz5xncy8j49b864ndk0x5hkb409042glb6cw0s9g", + "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/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 8f3cce77ef22..ffdcce309c74 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -114,13 +114,18 @@ with super; pkgs.glib pkgs.gobject-introspection ]; - patches = [ - (pkgs.fetchpatch { - name = "lgi-find-cairo-through-typelib.patch"; - url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; - sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; - }) - ]; + # patches = [ + # (pkgs.fetchpatch { + # name = "lgi-find-cairo-through-typelib.patch"; + # url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; + # 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({ diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 6e55292722fd..4afae97c779b 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -2,10 +2,19 @@ luarocks.overrideAttrs(old: { pname = "luarocks-nix"; version = "2021-01-22"; - src = fetchFromGitHub { - owner = "nix-community"; - repo = "luarocks-nix"; - rev = "nix_v3.5.0-1"; - sha256 = "sha256-jcgshxAuuc8QizpYL/2K3PKYWiKsnF/8BJAUaryvEvQ="; - }; + src = /home/teto/luarocks; + # src = fetchFromGitHub { + # owner = "nix-community"; + # repo = "luarocks-nix"; + # rev = "test-speedup"; + # sha256 = "sha256-AN4D69IUfCnIWmM7CXWmXeNcTgRCIOamfjYEL4ti9CQ="; + # }; + patches = []; + # src = builtins.fetchGit { + # url = "https://github.com/nix-community/luarocks-nix.git"; + # ref = "test-speedup"; + # rev = "f9cb2285fda1d73bfa8ae33b6102b286dbe1f098"; + # }; + + meta.mainProgram = "luarocks"; }) From 404e5b1040f4998bf95558468fd050836aa91b4d Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 30 Aug 2021 19:15:57 +0200 Subject: [PATCH 053/138] luaPackages.ltermbox: removed official repo here https://github.com/LuaDist-testing/ltermbox but nothing is using it and it is outdated/unmaintained (2018) and poses issue updating --- maintainers/scripts/luarocks-packages.csv | 1 - .../lua-modules/generated-packages.nix | 18 ------------------ pkgs/development/lua-modules/overrides.nix | 4 ---- 3 files changed, 23 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 8a590e1185c5..611168110733 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -29,7 +29,6 @@ lpty,,,,,, lrexlib-gnu,,,,,, lrexlib-pcre,,,,,,vyp lrexlib-posix,,,,,, -ltermbox,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-iconv,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index a29f037d8da2..79dee5fdf245 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -609,24 +609,6 @@ lrexlib-posix = buildLuarocksPackage { }; }; -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 = { - 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"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index ffdcce309c74..00a02dcb2b14 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -146,10 +146,6 @@ with super; ]; }); - ltermbox = super.ltermbox.override( { - disabled = !isLua51 || isLuaJIT; - }); - lua-iconv = super.lua-iconv.override({ buildInputs = [ pkgs.libiconv From 24ac87c440a1b9f6f2ca8b653d1242d3ee1497b7 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 30 Aug 2021 20:43:41 +0200 Subject: [PATCH 054/138] luaPackages.luadoc: remove since last update in 2013 no update in 7 years, link towards source doesn't work anymore https://luarocks.org/modules/luarocks/luadoc/3.0.1-1 --- maintainers/scripts/luarocks-packages.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 611168110733..665902270b40 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -50,7 +50,6 @@ luadbi,,,,,, luadbi-mysql,,,,,, luadbi-postgresql,,,,,, luadbi-sqlite3,,,,,, -luadoc,,,,,, luaepnf,,,,,, luaevent,,,,,, luaexpat,,,,1.3.0-1,,arobyn flosse From 875901c0d52abd9e69ae133794fbc4d19616f831 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 31 Aug 2021 08:18:08 +1000 Subject: [PATCH 055/138] podman: 3.3.0 -> 3.3.1 https://github.com/containers/podman/releases/tag/v3.3.1 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index a21485e984cf..e4cd268758bc 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-EDNpGDjsXULwtUYFLh4u6gntK//rsLLpYgpxRt4R1kc="; + sha256 = "sha256-DVRLdJFYD5Ovc0n5SoMv71GPTuBO3wfqREcGRJEuND0="; }; vendorSha256 = null; From a2fd477970f3cfb5c5c51bc527ce6ace47b1cfab Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 30 Aug 2021 21:42:52 +0200 Subject: [PATCH 056/138] lua: restore knownRockspec and lgi - fix std._debug build - fixed std-normalize - pinned stdlib since the git version causes issues with awesome cleanup --- maintainers/scripts/luarocks-packages.csv | 3 +- .../interpreters/lua-5/build-lua-package.nix | 28 +- .../lua-modules/generated-packages.nix | 977 +++++++++++++----- pkgs/development/lua-modules/overrides.nix | 27 +- 4 files changed, 754 insertions(+), 281 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 665902270b40..65ddc5823c9f 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -20,6 +20,7 @@ http,,,,0.3-0,,vcunat inspect,,,,,, ldbus,,,http://luarocks.org/dev,,, ldoc,https://github.com/stevedonovan/LDoc.git,,,,, +lgi,,,,,, linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, ljsyscall,,,,,lua5_1,lblasc lpeg,,,,,,vyp @@ -82,5 +83,5 @@ readline,,,,,, say,https://github.com/Olivine-Labs/say.git,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, std.normalize,git://github.com/lua-stdlib/normalize.git,,,,, -stdlib,https://github.com/lua-stdlib/lua-stdlib.git,,,,,vyp +stdlib,,,,41.2.2,,vyp vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 8c9204c0b288..8ff70cef3ba2 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -165,22 +165,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; - # name_only= pname; - # in - # # if this is a rockFile - # 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 @@ -194,13 +180,13 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab + lib.optionalString (rockspecFilename == null) '' rockspecFilename="${generatedRockspecFilename}" '' - # + lib.optionalString (knownRockspec != null) '' + + lib.optionalString (knownRockspec != null) '' - # # prevents the following type of error: - # # Inconsistency between rockspec filename (42fm1b3d7iv6fcbhgm9674as3jh6y2sh-luv-1.22.0-1.rockspec) and its contents (luv-1.22.0-1.rockspec) - # rockspecFilename="$TMP/$(stripHash ''${knownRockspec})" - # cp ''${knownRockspec} "$rockspecFilename" - # '' + # prevents the following type of error: + # Inconsistency between rockspec filename (42fm1b3d7iv6fcbhgm9674as3jh6y2sh-luv-1.22.0-1.rockspec) and its contents (luv-1.22.0-1.rockspec) + rockspecFilename="$TMP/$(stripHash ''${knownRockspec})" + cp ''${knownRockspec} "$rockspecFilename" + '' + '' runHook postConfigure ''; @@ -239,9 +225,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab nix_debug "ROCKSPEC $rockspecFilename" nix_debug "cwd: $PWD" - set -x $LUAROCKS make --deps-mode=all --tree=$out ''${rockspecFilename} - set +x runHook postInstall ''; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 79dee5fdf245..cfc6f67fdb11 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -13,11 +13,22 @@ 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 ]; @@ -117,11 +128,22 @@ 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 ]; @@ -136,7 +158,10 @@ bit32 = buildLuarocksPackage { busted = buildLuarocksPackage { pname = "busted"; version = "2.0.0-1"; - + knownRockspec = (fetchurl { + 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"; @@ -155,11 +180,22 @@ 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 ]; @@ -174,11 +210,15 @@ 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://luarocks.org/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 ]; @@ -193,11 +233,22 @@ 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 = { @@ -211,11 +262,22 @@ 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://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/coxpcall-1.17.0-1.src.rock"; - sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; - }; meta = { homepage = "http://keplerproject.github.io/coxpcall"; @@ -227,11 +289,15 @@ 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 ]; @@ -298,11 +364,15 @@ digestif = buildLuarocksPackage { dkjson = buildLuarocksPackage { pname = "dkjson"; 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-3.src.rock"; - sha256 = "0v5sihm85r0f458n1wvfjlmz59hjqlg5ndpp6dhd68fvrjikaw80"; + 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.5"); propagatedBuildInputs = [ lua ]; @@ -316,11 +386,15 @@ 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 = { @@ -359,11 +433,15 @@ 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://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/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 ]; @@ -378,11 +456,15 @@ 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://luarocks.org/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 ]; @@ -396,7 +478,10 @@ 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": "https://github.com/daurnimator/ldbus.git", "rev": "9e176fe851006037a643610e6d8f3a8e597d4073", @@ -444,6 +529,35 @@ 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"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "http://github.com/pavouk/lgi"; + description = "Lua bindings to GObject libraries"; + license.fullName = "MIT/X11"; + }; +}; + linenoise = buildLuarocksPackage { pname = "linenoise"; version = "0.9-1"; @@ -466,11 +580,15 @@ 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 ]; @@ -485,11 +603,15 @@ 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://luarocks.org/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 ]; @@ -504,11 +626,15 @@ 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://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/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 = { @@ -521,11 +647,15 @@ 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 ]; @@ -539,11 +669,15 @@ 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://luarocks.org/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 ]; @@ -557,11 +691,22 @@ 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 ]; @@ -575,11 +720,22 @@ 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://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-pcre-2.9.1-1.src.rock"; - sha256 = "0rsar13nax5r8f96pqjr0hf3civ1f1ijg4k7y69y5gi4wqd376lz"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -594,11 +750,22 @@ 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 ]; @@ -612,11 +779,22 @@ lrexlib-posix = buildLuarocksPackage { 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 ]; @@ -630,13 +808,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": "https://github.com/antirez/lua-cmsgpack.git", - "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", - "date": "2018-06-14T11:56:56+02:00", - "path": "/nix/store/ndjf00i9r45gvy8lh3vp218y4w4md33p-lua-cmsgpack", - "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", + "rev": "dec1810a70d2948725f2e32cc38163de62b9d9a7", + "date": "2015-06-03T08:39:04+02:00", + "path": "/nix/store/ksqvl7hbd5s7nb6hjffyic1shldac4z2-lua-cmsgpack", + "sha256": "0j0ahc9rprgl6dqxybaxggjam2r5i2wqqsd6764n0d7fdpj9fqm0", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -656,11 +837,15 @@ 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 ]; @@ -674,11 +859,22 @@ lua-iconv = buildLuarocksPackage { lua-lsp = buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-lsp-0.1.0-2.rockspec"; + sha256 = "19jsz00qlgbyims6cg8i40la7v8kr7zsxrrr3dg0kdg0i36xqs6c"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "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 +} + '') ["date" "path"]) ; - src = fetchurl { - url = "https://luarocks.org/lua-lsp-0.1.0-2.src.rock"; - sha256 = "1cxj5qjdycx4vh411wb18kgglzcyarmm8495nw3yl5h2rx1pk3d3"; - }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua dkjson lpeglabel inspect ]; @@ -692,11 +888,15 @@ 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 ]; @@ -710,11 +910,22 @@ 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://luarocks.org/lua-resty-http-0.16.1-0.src.rock"; - sha256 = "0n5hiablpc0dsccs6h76zg81wc3jb4mdvyfn9lfxnhls3yqwrgkj"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -728,11 +939,22 @@ 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 ]; @@ -746,11 +968,22 @@ 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 ]; @@ -764,11 +997,22 @@ 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 = { homepage = "https://github.com/fffonion/lua-resty-openssl"; @@ -780,11 +1024,22 @@ 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 ]; @@ -798,7 +1053,10 @@ 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"; @@ -815,11 +1073,22 @@ 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 ]; @@ -833,11 +1102,22 @@ 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 ]; @@ -852,13 +1132,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": "https://github.com/brimworks/lua-zlib.git", - "rev": "82d0fdfe8ddd8645970f55011c13d87469501615", - "date": "2021-03-08T06:04:09-08:00", - "path": "/nix/store/2wr6l2djjl2l63wq1fddfm9ljrrkplr5-lua-zlib", - "sha256": "18q9a5f21fp8hxvpp4sq23wi7m2h0v3p3kydslz140mnryazridj", + "rev": "a305d98f473d0a253b6fd740ce60d7d5a5f1cda0", + "date": "2017-10-07T08:26:37-07:00", + "path": "/nix/store/6hjfczd3xkilkdxidgqzdrwmaiwnlf05-lua-zlib", + "sha256": "1cv12s5c5lihmf3hb0rz05qf13yihy1bjpb7448v8mkiss6y1s5c", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -924,11 +1207,22 @@ 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 ]; @@ -942,11 +1236,22 @@ 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 ]; @@ -960,11 +1265,22 @@ 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 ]; @@ -978,11 +1294,22 @@ 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 ]; @@ -996,11 +1323,22 @@ 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 ]; @@ -1014,11 +1352,22 @@ 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 ]; @@ -1029,31 +1378,25 @@ luadbi-sqlite3 = buildLuarocksPackage { }; }; -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 = { - 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 ]; @@ -1067,11 +1410,15 @@ 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 ]; @@ -1085,11 +1432,15 @@ 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 ]; @@ -1104,11 +1455,22 @@ 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 ]; @@ -1122,11 +1484,22 @@ 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 ]; @@ -1141,11 +1514,22 @@ luafilesystem = buildLuarocksPackage { lualogging = buildLuarocksPackage { pname = "lualogging"; 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.2-1.src.rock"; - sha256 = "1rxandfjff8z1jnryq9vcvhnva7qyrl7zjrc1mihg6fbddzdcfg7"; - }; propagatedBuildInputs = [ luasocket ]; meta = { @@ -1158,11 +1542,15 @@ 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 = { @@ -1175,11 +1563,15 @@ 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 ]; @@ -1194,7 +1586,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"; @@ -1213,11 +1608,22 @@ luarepl = buildLuarocksPackage { luasec = buildLuarocksPackage { pname = "luasec"; 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.2-1.src.rock"; - sha256 = "1c3zqv2fbspvxplj3had9m3rij51bn9krx5kmdcqc3lgmn5d1mby"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; @@ -1232,11 +1638,15 @@ 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 ]; @@ -1250,7 +1660,10 @@ 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": "https://github.com/keplerproject/luasql.git", "rev": "69f68a858134d6adbe9b65a902dcd3f60cd6a7ce", @@ -1277,7 +1690,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"; @@ -1296,11 +1712,15 @@ 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 ]; @@ -1314,11 +1734,15 @@ 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://luarocks.org/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 ]; @@ -1333,11 +1757,22 @@ 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 ]; @@ -1351,11 +1786,15 @@ 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 ]; @@ -1369,11 +1808,15 @@ 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://luarocks.org/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 ]; @@ -1387,11 +1830,15 @@ 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 ]; @@ -1406,11 +1853,22 @@ 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 ]; @@ -1424,7 +1882,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"; @@ -1443,11 +1904,22 @@ 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 ]; @@ -1462,7 +1934,10 @@ 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"; @@ -1514,7 +1989,7 @@ penlight = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; checkInputs = [ busted busted ]; - doCheck = true; + doCheck = false; meta = { homepage = "https://lunarmodules.github.io/penlight"; @@ -1578,11 +2053,15 @@ 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 ]; @@ -1666,22 +2145,18 @@ std-normalize = buildLuarocksPackage { stdlib = buildLuarocksPackage { pname = "stdlib"; - version = "git-1"; + version = "41.2.2-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/stdlib-41.2.2-1.rockspec"; + sha256 = "0rscb4cm8s8bb8fk8rknc269y7bjqpslspsaxgs91i8bvabja6f6"; + }).outPath; + src = fetchurl { + url = "http://github.com/lua-stdlib/lua-stdlib/archive/release-v41.2.2.zip"; + sha256 = "0is8i8lk4qq4afnan0vj1bwr8brialyrva7cjy43alzgwdphwynx"; + }; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lua-stdlib/lua-stdlib.git", - "rev": "a632078f216ac6b9994449b7f1435a419172b44f", - "date": "2018-01-01T20:51:44-08:00", - "path": "/nix/store/m9mqhcghsr178sjllv5ibbs588krd4qh-lua-stdlib", - "sha256": "0hphmqyp33v90i3pjyr4p33c1pmglbzass8yzlaxfxp2ya7k2vsi", - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua std-_debug std-normalize ldoc ]; + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua ]; meta = { homepage = "http://lua-stdlib.github.io/lua-stdlib"; @@ -1697,10 +2172,10 @@ vstruct = buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/ToxicFrog/vstruct.git", - "rev": "b6889e3b275e9f9532b5dff4917e903b17e22730", - "date": "2020-08-01T22:14:34-04:00", - "path": "/nix/store/wayczacy4ds2j320f45yghw9arqzj5s9-vstruct", - "sha256": "0mjvcybh4r8lwz5xncy8j49b864ndk0x5hkb409042glb6cw0s9g", + "rev": "924d3dd63043189e4a7ef6b1b54b19208054cc0f", + "date": "2020-05-06T23:13:06-04:00", + "path": "/nix/store/a4i9k5hx9xiz38bij4hb505dg088jkss-vstruct", + "sha256": "0sl9v874mckhh6jbxsan48s5xajzx193k4qlphw69sdbf8kr3p57", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 00a02dcb2b14..a15bd6e53663 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -114,13 +114,13 @@ with super; pkgs.glib pkgs.gobject-introspection ]; - # patches = [ - # (pkgs.fetchpatch { - # name = "lgi-find-cairo-through-typelib.patch"; - # url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; - # sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; - # }) - # ]; + patches = [ + (pkgs.fetchpatch { + name = "lgi-find-cairo-through-typelib.patch"; + url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; + sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; + }) + ]; # there is only a rockspec.in in the repo, the actual rockspec must be generated preConfigure = '' @@ -349,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; From 6312bac40846b92fd1b33def488badcd902241a1 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 30 Aug 2021 22:41:02 +0200 Subject: [PATCH 057/138] luaPackages.ansicolors: remove because unmaintained since 2013 luarocks points at https://github.com/kikito/ansicolors.lua with a last commit in 2013 while its upstream https://github.com/hoelzro/ansicolors contains a 2017 commit. This last project mentions it's superseeded by https://github.com/hoelzro/lua-term --- maintainers/scripts/luarocks-packages.csv | 1 - .../lua-modules/generated-packages.nix | 19 ------------------- 2 files changed, 20 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 65ddc5823c9f..1cb6a83d42ae 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,6 +1,5 @@ name,src,ref,server,version,luaversion,maintainers alt-getopt,,,,,,arobyn -ansicolors,https://github.com/kikito/ansicolors.lua,,,,, bit32,,,,5.3.0-1,lua5_1,lblasc argparse,https://github.com/luarocks/argparse.git,,,,, basexx,https://github.com/teto/basexx.git,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index cfc6f67fdb11..c5a1a41cbd3c 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -40,25 +40,6 @@ alt-getopt = buildLuarocksPackage { }; }; -ansicolors = buildLuarocksPackage { - pname = "ansicolors"; - version = "1.0.2-3"; - - src = fetchurl { - url = "https://github.com/kikito/ansicolors.lua/archive/v1.0.2.tar.gz"; - sha256 = "0r4xi57njldmar9pn77l0vr5701rpmilrm51spv45lz0q9js8xps"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/kikito/ansicolors.lua"; - description = "Library for color Manipulation."; - license.fullName = "MIT "; - }; -}; - argparse = buildLuarocksPackage { pname = "argparse"; version = "scm-2"; From 1d22aed0417ef945552d4dc2abcf04e806162351 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 31 Aug 2021 00:17:26 +0200 Subject: [PATCH 058/138] luarocks-nix: bumped luarocks-nix this new version removes support of src.rock but now supports rockspecs embedded in a repo. The goal is to be able to support neovim plugins that provide a rockspec, even when they are not registered on luarocks. --- .../tools/misc/luarocks/luarocks-nix.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 4afae97c779b..096a7b8f70ce 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -2,18 +2,17 @@ luarocks.overrideAttrs(old: { pname = "luarocks-nix"; version = "2021-01-22"; - src = /home/teto/luarocks; - # src = fetchFromGitHub { - # owner = "nix-community"; - # repo = "luarocks-nix"; - # rev = "test-speedup"; - # sha256 = "sha256-AN4D69IUfCnIWmM7CXWmXeNcTgRCIOamfjYEL4ti9CQ="; - # }; + src = fetchFromGitHub { + owner = "nix-community"; + repo = "luarocks-nix"; + rev = "test-speedup"; + sha256 = "sha256-WfzLSpIp0V7Ib4sjYvoJHF+/vHaieccvfVAr5W47QsQ="; + }; patches = []; # src = builtins.fetchGit { # url = "https://github.com/nix-community/luarocks-nix.git"; # ref = "test-speedup"; - # rev = "f9cb2285fda1d73bfa8ae33b6102b286dbe1f098"; + # rev = "68ebd5356206a625021b9add4ec2f916692a55eb"; # }; meta.mainProgram = "luarocks"; From 7f3a4f6b67a4887e1fbf9c576f3f4b369e98e274 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 13:43:34 +0000 Subject: [PATCH 059/138] linuxPackages.isgx: 2.11 -> 2.14 --- pkgs/os-specific/linux/isgx/default.nix | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/isgx/default.nix b/pkgs/os-specific/linux/isgx/default.nix index fb6caf3bacbe..6e97532ee5dd 100644 --- a/pkgs/os-specific/linux/isgx/default.nix +++ b/pkgs/os-specific/linux/isgx/default.nix @@ -1,29 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, kernel, kernelAtLeast }: +{ stdenv, lib, fetchFromGitHub, kernel, kernelAtLeast }: stdenv.mkDerivation rec { name = "isgx-${version}-${kernel.version}"; - version = "2.11"; + version = "2.14"; src = fetchFromGitHub { owner = "intel"; repo = "linux-sgx-driver"; - rev = "sgx_driver_${version}"; - hash = "sha256-zZ0FgCx63LCNmvQ909O27v/o4+93gefhgEE/oDr/bHw="; + rev = "sgx_diver_${version}"; # Typo is upstream's. + sha256 = "0kbbf2inaywp44lm8ig26mkb36jq3smsln0yp6kmrirdwc3c53mi"; }; - patches = [ - # Fixes build with kernel >= 5.8 - (fetchpatch { - url = "https://github.com/intel/linux-sgx-driver/commit/276c5c6a064d22358542f5e0aa96b1c0ace5d695.patch"; - sha256 = "sha256-PmchqYENIbnJ51G/tkdap/g20LUrJEoQ4rDtqy6hj24="; - }) - # Fixes detection with kernel >= 5.11 - (fetchpatch { - url = "https://github.com/intel/linux-sgx-driver/commit/ed2c256929962db1a8805db53bed09bb8f2f4de3.patch"; - sha256 = "sha256-MRbgS4U8FTCP1J1n+rhsvbXxKDytfl6B7YlT9Izq05U="; - }) - ]; - hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; From a96144ce4fe95365aa553cfda316a962e2ca34e8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 31 Aug 2021 08:19:51 +1000 Subject: [PATCH 060/138] lima: 0.6.0 -> 0.6.1 https://github.com/lima-vm/lima/releases/tag/v0.6.1 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index bf4e14a6bab3..93e4c7e0f487 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UwsAeU7Me2UN9pUWvqGgQ7XSNcrClXYOA+9F6yO2aqA="; + sha256 = "sha256-x4IRHxmVeP87M7rSrQWDd9pj2Rb9uGu133mExepxX6Q="; }; - vendorSha256 = "sha256-vdqLdSXQ2ywZoG7ROQP9PLWUqhoOO7N5li+xjc2HtzM="; + vendorSha256 = "sha256-PeIEIUX/PwwnbZfXnK3IsENO+zRYLhljBRe910aZgKs="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From db4b3ef15a3fed741820affdb35154b8af9c8b11 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Mon, 30 Aug 2021 16:27:43 -0700 Subject: [PATCH 061/138] dwz: init at 0.14 (#136078) --- pkgs/development/tools/misc/dwz/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/misc/dwz/default.nix diff --git a/pkgs/development/tools/misc/dwz/default.nix b/pkgs/development/tools/misc/dwz/default.nix new file mode 100644 index 000000000000..0a13d4a68dd0 --- /dev/null +++ b/pkgs/development/tools/misc/dwz/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchurl, elfutils }: + +stdenv.mkDerivation rec { + pname = "dwz"; + version = "0.14"; + + src = fetchurl { + url = "https://www.sourceware.org/ftp/${pname}/releases/${pname}-${version}.tar.gz"; + sha256 = "07qdvzfk4mvbqj5z3aff7vc195dxqn1mi27w2dzs1w2zhymnw01k"; + }; + + nativeBuildInputs = [ elfutils ]; + + makeFlags = [ "prefix=${placeholder "out"}" ]; + + meta = with lib; { + homepage = "https://sourceware.org/dwz/"; + description = "DWARF optimization and duplicate removal tool"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jbcrail ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef192a69fc77..6a482da66438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13747,6 +13747,8 @@ with pkgs; drush = callPackage ../development/tools/misc/drush { }; + dwz = callPackage ../development/tools/misc/dwz { }; + easypdkprog = callPackage ../development/embedded/easypdkprog { }; editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; From 197a496c7f2e5959ab4ce3b9d96cf9f2fc0e93f7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 30 Aug 2021 18:22:00 -0500 Subject: [PATCH 062/138] houdini: use libudev0-shim --- pkgs/applications/misc/houdini/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 81a5eddaf6ed..f55752a22923 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -5,7 +5,7 @@ buildFHSUserEnv rec { targetPkgs = pkgs: with pkgs; [ libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils - libxkbcommon libudev tbb + libxkbcommon libudev0-shim tbb ] ++ (with xorg; [ libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver From 7b2709f6a4b4b56f802b6ea09740baf99e06ee60 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 30 Aug 2021 16:23:57 -0700 Subject: [PATCH 063/138] nixos/nvidia: let user choose whether to install nvidia-settings --- nixos/modules/hardware/video/nvidia.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 1e125eced2cb..73d3451c71c3 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -143,6 +143,15 @@ in ''; }; + hardware.nvidia.nvidiaSettings = mkOption { + default = true; + type = types.bool; + description = '' + Whether to add nvidia-settings, NVIDIA's GUI configuration tool, to + systemPackages. + ''; + }; + hardware.nvidia.nvidiaPersistenced = mkOption { default = false; type = types.bool; @@ -279,7 +288,8 @@ in hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out; hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32; - environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] + environment.systemPackages = [ nvidia_x11.bin ] + ++ optionals nvidiaSettings [ nvidia_x11.settings ] ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; systemd.packages = optional cfg.powerManagement.enable nvidia_x11.out; From 636e17aab5d90ee0163858cd0e110d51850a6354 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 30 Aug 2021 16:27:26 -0700 Subject: [PATCH 064/138] linuxPackages.nvidia_x11: apply kernel module makeFlags --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 2d325ab3d565..754d9887cb2a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -75,6 +75,8 @@ let kernel = if libsOnly then null else kernel.dev; kernelVersion = if libsOnly then null else kernel.modDirVersion; + makeFlags = optionals (!libsOnly) kernel.makeFlags; + hardeningDisable = [ "pic" "format" ]; dontStrip = true; From fe31fdf43bdb4fa8f3ab59928b6ede6c1232d475 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 30 Aug 2021 16:30:55 -0700 Subject: [PATCH 065/138] linuxPackages.nvidia_x11.persistenced: pick up nvidia_x11 makeFlags --- pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 9a3daa3d2705..5276dfd2aff4 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 = '' From 0b63366e6f415c37fcd3f33e7fcb75f3883a6e1c Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 30 Aug 2021 16:31:14 -0700 Subject: [PATCH 066/138] linuxPackages.nvidia_x11.settings: pick up nvidia_x11 makeFlags --- pkgs/os-specific/linux/nvidia-x11/settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index d5bbf40e2b8a..f9a94e6c73d7 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 '' From 4a8ab482e0d7c28afb95df19bb376edfd7b87ca1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 30 Aug 2021 16:32:32 -0700 Subject: [PATCH 067/138] linuxPackages.nvidia_x11.settings: use makeFlags in preBuild's libXNVCtrl build --- pkgs/os-specific/linux/nvidia-x11/settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index f9a94e6c73d7..873e09df8dfb 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { preBuild = '' if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then ( cd src/libXNVCtrl - make + make $makeFlags ) fi ''; From 19e4afc912d8c62c8977a54d590e8d1cef7fb195 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 30 Aug 2021 16:41:23 -0700 Subject: [PATCH 068/138] linuxPackages.nvidia-x11: use makeFlags in builder.sh --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 4 +--- pkgs/os-specific/linux/nvidia-x11/generic.nix | 7 ++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 448e91986fc6..51bd4d725a8b 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 754d9887cb2a..282d9728821e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -75,7 +75,12 @@ let kernel = if libsOnly then null else kernel.dev; kernelVersion = if libsOnly then null else kernel.modDirVersion; - makeFlags = optionals (!libsOnly) kernel.makeFlags; + 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" ]; From d702fbfe32f27e2aa62128db76ee9c845871ac44 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 11:57:31 +0900 Subject: [PATCH 069/138] elasticsearch: nixpkgs-fmt --- pkgs/servers/search/elasticsearch/7.x.nix | 13 ++-- pkgs/servers/search/elasticsearch/plugins.nix | 71 ++++++++++--------- 2 files changed, 45 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index fb15951399fe..50ec006cc5cd 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -1,10 +1,13 @@ { elk7Version , enableUnfree ? true -, lib, stdenv +, lib +, stdenv , fetchurl , makeWrapper , jre_headless -, util-linux, gnugrep, coreutils +, util-linux +, gnugrep +, coreutils , autoPatchelfHook , zlib }: @@ -17,11 +20,11 @@ let shas = if enableUnfree then { - x86_64-linux = "1s27bzx5y8vcd95qrw6av3fhyxb45219x9ahwaxa2cygmbpighrp"; + x86_64-linux = "1s27bzx5y8vcd95qrw6av3fhyxb45219x9ahwaxa2cygmbpighrp"; x86_64-darwin = "1ia3byir3i5qaarmcaysrg3dhnxjmxnf0m0kzyf61g9aiy87gb7q"; } else { - x86_64-linux = "005i7d7ag10qkn7bkx7md50iihvcvc84hay2j94wvsm7yghhbmi3"; + x86_64-linux = "005i7d7ag10qkn7bkx7md50iihvcvc84hay2j94wvsm7yghhbmi3"; x86_64-darwin = "01f81720rbzdqc0g1xymhz2lflldfbnb0rh7mpki99pss28vj9sh"; }; in @@ -48,7 +51,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre_headless util-linux ] - ++ optional enableUnfree zlib; + ++ optional enableUnfree zlib; installPhase = '' mkdir -p $out diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 19aac337057f..5ceb6b079410 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -3,17 +3,17 @@ let esVersion = elasticsearch.version; - esPlugin = a@{ - pluginName, - installPhase ? '' - mkdir -p $out/config - mkdir -p $out/plugins - ln -s ${elasticsearch}/lib $out/lib - ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin install --batch -v file://$src - rm $out/lib - '', - ... - }: + esPlugin = + a@{ pluginName + , installPhase ? '' + mkdir -p $out/config + mkdir -p $out/plugins + ln -s ${elasticsearch}/lib $out/lib + ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin install --batch -v file://$src + rm $out/lib + '' + , ... + }: stdenv.mkDerivation (a // { inherit installPhase; pname = "elasticsearch-${pluginName}"; @@ -24,10 +24,11 @@ let nativeBuildInputs = [ unzip ]; meta = a.meta // { platforms = elasticsearch.meta.platforms; - maintainers = (a.meta.maintainers or []) ++ (with lib.maintainers; [ offline ]); + maintainers = (a.meta.maintainers or [ ]) ++ (with lib.maintainers; [ offline ]); }; }); -in { +in +{ analysis-icu = esPlugin rec { name = "elasticsearch-analysis-icu-${version}"; @@ -149,26 +150,28 @@ in { }; }; - search-guard = let - majorVersion = lib.head (builtins.splitVersion esVersion); - in esPlugin rec { - pluginName = "search-guard"; - version = - # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.5.1" then "${esVersion}-38.0.0" - else if esVersion == "6.8.3" then "${esVersion}-25.5" - else throw "unsupported version ${esVersion} for plugin ${pluginName}"; - src = fetchurl { - url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; - sha256 = - if version == "7.5.1-38.0.0" then "1a1wp9wrmz6ji2rnpk0b9jqnp86w0w0z8sb48giyc1gzcy1ra9yh" - else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb" - else throw "unsupported version ${version} for plugin ${pluginName}"; + search-guard = + let + majorVersion = lib.head (builtins.splitVersion esVersion); + in + esPlugin rec { + pluginName = "search-guard"; + version = + # https://docs.search-guard.com/latest/search-guard-versions + if esVersion == "7.5.1" then "${esVersion}-38.0.0" + else if esVersion == "6.8.3" then "${esVersion}-25.5" + else throw "unsupported version ${esVersion} for plugin ${pluginName}"; + src = fetchurl { + url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; + sha256 = + if version == "7.5.1-38.0.0" then "1a1wp9wrmz6ji2rnpk0b9jqnp86w0w0z8sb48giyc1gzcy1ra9yh" + else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb" + else throw "unsupported version ${version} for plugin ${pluginName}"; + }; + meta = with lib; { + homepage = "https://search-guard.com"; + description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. "; + license = licenses.asl20; + }; }; - meta = with lib; { - homepage = "https://search-guard.com"; - description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. "; - license = licenses.asl20; - }; - }; } From 4a2d9eb0fe02bb308279f50f05d31de66a8ba857 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 12:23:41 +0900 Subject: [PATCH 070/138] kibana: nixpkgs-fmt --- pkgs/development/tools/misc/kibana/7.x.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 754559969d50..e82f557470e4 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -1,6 +1,7 @@ { elk7Version , enableUnfree ? true -, lib, stdenv +, lib +, stdenv , makeWrapper , fetchurl , nodejs-10_x @@ -18,15 +19,16 @@ let shas = if enableUnfree then { - x86_64-linux = "1wq4fc2fifkg1qz7nxdfb4yi2biay8cgdz7kl5k0p37sxn0sbkja"; + x86_64-linux = "1wq4fc2fifkg1qz7nxdfb4yi2biay8cgdz7kl5k0p37sxn0sbkja"; x86_64-darwin = "06346kj7bv49py49pmmnmh8m24322m88v1af19909pj9cxgd0p6v"; } else { - x86_64-linux = "0ygpmcm6wdcnvw8azwqc5257lyic7yw31rqvm2pw3afhpha62lpj"; + x86_64-linux = "0ygpmcm6wdcnvw8azwqc5257lyic7yw31rqvm2pw3afhpha62lpj"; x86_64-darwin = "0xy81g0bhxp47p29kkkh5llfzqkzqzr5dk50ap2hy0hjw33ld6g1"; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; version = elk7Version; From 9a3c58ee74ad3d89cd848f10d787c753a92f70bd Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 12:25:15 +0900 Subject: [PATCH 071/138] logstash: nixpkgs-fmt --- pkgs/tools/misc/logstash/7.x.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 1abc0ff9bf82..340cbd830646 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -1,6 +1,7 @@ { elk7Version , enableUnfree ? true -, lib, stdenv +, lib +, stdenv , fetchurl , makeWrapper , nixosTests @@ -21,13 +22,14 @@ let this = stdenv.mkDerivation rec { else "0nlwgaw6rmhp5b68zpp1pzsjs30b0bjzdg8f7xy6rarpk338s8yb"; }; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; dontPatchShebangs = true; buildInputs = [ - makeWrapper jre + makeWrapper + jre ]; installPhase = '' @@ -48,9 +50,9 @@ let this = stdenv.mkDerivation rec { 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; + 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 = From 8b2cecc3ce33053da4a4aab33991839f9a7a1a54 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 12:36:15 +0900 Subject: [PATCH 072/138] beats: nixpkgs-fmt --- pkgs/misc/logging/beats/7.x.nix | 52 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 77e14e96c54e..bf252c028bcb 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,30 +1,31 @@ { lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, nixosTests, systemd }: -let beat = package : extraArgs : buildGoPackage (rec { - name = "${package}-${version}"; - version = elk7Version; +let beat = package: extraArgs: buildGoPackage (rec { + name = "${package}-${version}"; + version = elk7Version; - src = fetchFromGitHub { - owner = "elastic"; - repo = "beats"; - rev = "v${version}"; - sha256 = "192ygz3ppfah8d2b811x67jfqhcr5ivz7qh4vwrd729rjfr0bbgb"; - }; + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "192ygz3ppfah8d2b811x67jfqhcr5ivz7qh4vwrd729rjfr0bbgb"; + }; - goPackagePath = "github.com/elastic/beats"; + goPackagePath = "github.com/elastic/beats"; - subPackages = [ package ]; + subPackages = [ package ]; - meta = with lib; { - homepage = "https://www.elastic.co/products/beats"; - license = licenses.asl20; - maintainers = with maintainers; [ fadenb basvandijk ]; - platforms = platforms.linux; - }; - } // extraArgs); -in rec { - filebeat7 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; - heartbeat7 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + meta = with lib; { + homepage = "https://www.elastic.co/products/beats"; + license = licenses.asl20; + maintainers = with maintainers; [ fadenb basvandijk ]; + platforms = platforms.linux; + }; +} // extraArgs); +in +rec { + filebeat7 = beat "filebeat" { meta.description = "Lightweight shipper for logfiles"; }; + heartbeat7 = beat "heartbeat" { meta.description = "Lightweight shipper for uptime monitoring"; }; metricbeat7 = beat "metricbeat" { meta.description = "Lightweight shipper for metrics"; passthru.tests = @@ -46,14 +47,15 @@ in rec { PostgreSQL, Redis or Thrift and correlate the messages into transactions. ''; }; - journalbeat7 = beat "journalbeat" { + journalbeat7 = beat "journalbeat" { meta.description = '' Journalbeat is an open source data collector to read and forward journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' - patchelf --set-rpath ${libPath} "$out/bin/journalbeat" - ''; + postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in + '' + patchelf --set-rpath ${libPath} "$out/bin/journalbeat" + ''; }; } From f9321de0f3dc6d97bf68c10ac4d5263162c25ed8 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 12:47:45 +0900 Subject: [PATCH 073/138] elk7: 7.5.1 -> 7.10.2 Update pkgs/development/tools/misc/kibana/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/servers/search/elasticsearch/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/servers/search/elasticsearch/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/development/tools/misc/kibana/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> --- pkgs/development/tools/misc/kibana/7.x.nix | 8 +++---- pkgs/misc/logging/beats/7.x.nix | 2 +- pkgs/servers/search/elasticsearch/7.x.nix | 8 +++---- pkgs/servers/search/elasticsearch/plugins.nix | 22 ++++++++++--------- pkgs/tools/misc/logstash/7.x.nix | 7 +++--- pkgs/top-level/all-packages.nix | 6 ++--- 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index e82f557470e4..fdfe655b8341 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -19,12 +19,12 @@ let shas = if enableUnfree then { - x86_64-linux = "1wq4fc2fifkg1qz7nxdfb4yi2biay8cgdz7kl5k0p37sxn0sbkja"; - x86_64-darwin = "06346kj7bv49py49pmmnmh8m24322m88v1af19909pj9cxgd0p6v"; + x86_64-linux = "sha256-lTPBppKm51zgKSQtSdO0PgZ/aomvaStwqwYYGNPY4Bo="; + x86_64-darwin = "sha256-d7xHmoASiywDlZCJX/CfUX1VIi4iOcDrqvK0su54MJc="; } else { - x86_64-linux = "0ygpmcm6wdcnvw8azwqc5257lyic7yw31rqvm2pw3afhpha62lpj"; - x86_64-darwin = "0xy81g0bhxp47p29kkkh5llfzqkzqzr5dk50ap2hy0hjw33ld6g1"; + x86_64-linux = "sha256-+pkKpiXBpLHs72KKNtMJbqipw6eu5XC1xu/iLFCHGRQ="; + x86_64-darwin = "sha256-CyJ5iRXaPgXO2lyy+E24OcGtb9V3e1gMZRIu25bVyzk="; }; in diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index bf252c028bcb..dd1f606d43d3 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -8,7 +8,7 @@ let beat = package: extraArgs: buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "192ygz3ppfah8d2b811x67jfqhcr5ivz7qh4vwrd729rjfr0bbgb"; + sha256 = "sha256-zr0a0LBR4G9okS2pUixDYtYZ0yCp4G6j08jx/zlIKOA="; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 50ec006cc5cd..b0114ad17055 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -20,12 +20,12 @@ let shas = if enableUnfree then { - x86_64-linux = "1s27bzx5y8vcd95qrw6av3fhyxb45219x9ahwaxa2cygmbpighrp"; - x86_64-darwin = "1ia3byir3i5qaarmcaysrg3dhnxjmxnf0m0kzyf61g9aiy87gb7q"; + x86_64-linux = "sha256-O3rjtvXyJI+kRBqiz2U2OMkCIQj4E+AIHaE8N4o14R4="; + x86_64-darwin = "sha256-AwuY2yMxf+v7U5/KD3Cf+Hv6ijjySEyj6pzF3RCsg24="; } else { - x86_64-linux = "005i7d7ag10qkn7bkx7md50iihvcvc84hay2j94wvsm7yghhbmi3"; - x86_64-darwin = "01f81720rbzdqc0g1xymhz2lflldfbnb0rh7mpki99pss28vj9sh"; + x86_64-linux = "sha256-cJrdkFIFgAI6wfQh34Z8yFuLrOCOKzgOsWZhU3S/3NQ="; + x86_64-darwin = "sha256-OhMVOdXei9D9cH+O5tBhdKvZ05TsImjMqUUsucRyWMo="; }; in stdenv.mkDerivation (rec { diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 5ceb6b079410..39af6976bf9b 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -37,7 +37,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.5.1" then "0v6ynbk34g7pl9cwy8ga8bk1my18jb6pc3pqbjl8p93w38219vi6" + if version == "7.10.2" then "sha256-HXNJy8WPExPeh5afjdLEFg+0WX0LYI/kvvaLGVUke5E=" else if version == "6.8.3" then "0vbaqyj0lfy3ijl1c9h92b0nh605h5mjs57bk2zhycdvbw5sx2lv" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -54,7 +54,7 @@ in src = fetchurl { url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip"; sha256 = - if version == "7.5.1" then "0js8b9a9ma797448m3sy92qxbwziix8gkcka7hf17dqrb9k29v61" + if version == "7.10.2" then "sha256-mW4YNZ20qatyfHCDAmod/gVmkPYh15NrsYPgiBy1/T8=" else if version == "6.8.3" then "12bshvp01pp2lgwd0cn9l58axg8gdimsh4g9wfllxi1bdpv4cy53" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -71,7 +71,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.5.1" then "0znmbdf99bli4kvyb3vxr5x48yb6n64nl38gpa63iqsv3nlbi0hp" + if version == "7.10.2" then "sha256-PjA/pwoulkD2d6sHKqzcYxQpb1aS68/l047z5JTcV3Y=" else if version == "6.8.3" then "0ggdhf7w50bxsffmcznrjy14b578fps0f8arg3v54qvj94v9jc37" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -88,7 +88,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.5.1" then "09wl2bpng4xx384xns960rymnm64b5zn2cb1sp25n85pd0isp4p2" + if version == "7.10.2" then "sha256-yvxSkVyZDWeu7rcxxq1+IVsljZQKgWEURiXY9qycK1s=" else if version == "6.8.3" then "0pmffz761dqjpvmkl7i7xsyw1iyyspqpddxp89rjsznfc9pak5im" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -105,7 +105,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.5.1" then "0hhwxkjlkw1yv5sp6pdn5k1y8bdv4mnmb6nby1z4367mig6rm8v9" + if version == "7.10.2" then "sha256-yOMiYJ2c/mcLDcTA99YrpQBiEBAa/mLtTqJlqTJ5tBc=" else if version == "6.8.3" then "0kfr4i2rcwinjn31xrc2piicasjanaqcgnbif9xc7lnak2nnzmll" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -122,7 +122,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = - if version == "7.5.1" then "1j1rgbha5lh0a02h55zqc5qn0mvvi16l2m5r8lmaswp97px056v9" + if version == "7.10.2" then "sha256-fN2RQsY9OACE71pIw87XVJo4c3sUu/6gf/6wUt7ZNIE=" else if version == "6.8.3" then "1mm6hj2m1db68n81rzsvlw6nisflr5ikzk5zv9nmk0z641n5vh1x" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -139,7 +139,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = - if version == "7.5.1" then "15g438zpxrcmsgddwmk3sccy92ha90cyq9c61kcw1q84wfi0a7jl" + if version == "7.10.2" then "sha256-JdWt5LzSbs0MIEuLJIE1ceTnNeTYI5Jt2N0Xj7OBO6g=" else if version == "6.8.3" then "1s2klpvnhpkrk53p64zbga3b66czi7h1a13f58kfn2cn0zfavnbk" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -158,13 +158,15 @@ in pluginName = "search-guard"; version = # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.5.1" then "${esVersion}-38.0.0" + if esVersion == "7.10.2" then "7.10.1-49.3.0" else if esVersion == "6.8.3" then "${esVersion}-25.5" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = fetchurl { - url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; + url = + if version == "7.10.1-49.3.0" then "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip" + else "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; sha256 = - if version == "7.5.1-38.0.0" then "1a1wp9wrmz6ji2rnpk0b9jqnp86w0w0z8sb48giyc1gzcy1ra9yh" + if version == "7.10.1-49.3.0" then "sha256-vKH2+c+7WlncgljrvYH9lAqQTKzg9l0ABZ23Q/xdoK4=" else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb" else throw "unsupported version ${version} for plugin ${pluginName}"; }; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 340cbd830646..13f926d851a3 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -11,15 +11,16 @@ with lib; let this = stdenv.mkDerivation rec { - version = elk7Version; + # FIXME 7.10 is not available on the mirror + version = "7.9.3"; name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "01l6alwgsq6yf0z9d08i0hi8g708nph1vm78nl4xbpg8h964bybj" - else "0nlwgaw6rmhp5b68zpp1pzsjs30b0bjzdg8f7xy6rarpk338s8yb"; + then "sha256-YM17/LqsMLH15YZp+0pqbEUzmAcCUpIwWT7o+MJN1QE=" + else "sha256-5HEs/2bi8m64P0R8aHGgyFJCqiFxs1aBF59Wzg9STCM="; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a482da66438..730fa1f35f4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4618,7 +4618,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. # When updating make sure to update all plugins or they will break! elk6Version = "6.8.3"; - elk7Version = "7.5.1"; + elk7Version = "7.10.2"; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { util-linux = util-linuxMinimal; @@ -4631,12 +4631,12 @@ with pkgs; }; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { util-linux = util-linuxMinimal; - jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; util-linux = util-linuxMinimal; - jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch = elasticsearch6; elasticsearch-oss = elasticsearch6-oss; From 159be7791c43ec5b3db0403bf47373981a6d7f9f Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 22:50:10 +0900 Subject: [PATCH 074/138] logstash: fix download url Update pkgs/tools/misc/logstash/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/tools/misc/logstash/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> --- pkgs/development/tools/misc/kibana/7.x.nix | 4 +-- pkgs/tools/misc/logstash/7.x.nix | 32 ++++++++++++++-------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index fdfe655b8341..a2b6f740db4c 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { - name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; + pname = "kibana${optionalString (!enableUnfree) "-oss"}"; version = elk7Version; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz"; sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 13f926d851a3..83a063c125ef 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -10,17 +10,28 @@ with lib; -let this = stdenv.mkDerivation rec { - # FIXME 7.10 is not available on the mirror - version = "7.9.3"; - name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; +let + info = splitString "-" stdenv.hostPlatform.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = + if enableUnfree + then { + x86_64-linux = "sha256-5qv4fbFpLf6aduD7wyxXQ6FsCeUqrszRisNBx44vbMY="; + x86_64-darwin = "sha256-7H+Xpo8qF1ZZMkR5n92PVplEN4JsBEYar91zHQhE+Lo="; + } + else { + x86_64-linux = "sha256-jiV2yGPwPgZ5plo3ftImVDLSOsk/XBzFkeeALSObLhU="; + x86_64-darwin = "sha256-UYG+GGr23eAc2GgNX/mXaGU0WKMjiQMPpD1wUvAVz0A="; + }; +in +stdenv.mkDerivation rec { + version = elk7Version; + pname = "logstash${optionalString (!enableUnfree) "-oss"}"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = - if enableUnfree - then "sha256-YM17/LqsMLH15YZp+0pqbEUzmAcCUpIwWT7o+MJN1QE=" - else "sha256-5HEs/2bi8m64P0R8aHGgyFJCqiFxs1aBF59Wzg9STCM="; + url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}-${plat}-${arch}.tar.gz"; + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; dontBuild = true; @@ -63,5 +74,4 @@ let this = stdenv.mkDerivation rec { elk = nixosTests.elk.ELK-7; } ); -}; -in this +} From 59e34733b7b0276f364f53c2bbac8721a0214aa9 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 23:10:11 +0900 Subject: [PATCH 075/138] beats: buildGoPackage -> buildGoModule --- pkgs/misc/logging/beats/7.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index dd1f606d43d3..99a79fecedc5 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,7 +1,7 @@ -{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, nixosTests, systemd }: +{ lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd }: -let beat = package: extraArgs: buildGoPackage (rec { - name = "${package}-${version}"; +let beat = package: extraArgs: buildGoModule (rec { + pname = package; version = elk7Version; src = fetchFromGitHub { @@ -11,7 +11,7 @@ let beat = package: extraArgs: buildGoPackage (rec { sha256 = "sha256-zr0a0LBR4G9okS2pUixDYtYZ0yCp4G6j08jx/zlIKOA="; }; - goPackagePath = "github.com/elastic/beats"; + vendorSha256 = "sha256-xmw432vY1T2EixkDcXdGrnMdc8fYOI4R2lEjbkav3JQ="; subPackages = [ package ]; From 6f28a718e5a7d6c278d795274246f6b3eac488ab Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 23:26:13 +0900 Subject: [PATCH 076/138] kibana update nodejs 10 -> 14 --- pkgs/development/tools/misc/kibana/7.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index a2b6f740db4c..33298f68334a 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -4,14 +4,14 @@ , stdenv , makeWrapper , fetchurl -, nodejs-10_x +, nodejs-14_x , coreutils , which }: with lib; let - nodejs = nodejs-10_x; + nodejs = nodejs-14_x; inherit (builtins) elemAt; info = splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; From 8afec3d92ff1f055af2583569c32a2d254bb2c83 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 30 Aug 2021 17:12:05 -0700 Subject: [PATCH 077/138] linuxPackages.ddcci-driver: use kernel's make flags --- pkgs/os-specific/linux/ddcci/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index 7e5f95cb2067..48913e2aef7b 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}" From 54dbdcbcbb9886ed01693b7e5a7947b8fad07d2e Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 31 Aug 2021 09:16:55 +0900 Subject: [PATCH 078/138] ipfs: nixpkgs-fmt --- .../services/network-filesystems/ipfs.nix | 99 +++++++++++-------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 1d5c03787496..c64fd07db8cb 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -5,36 +5,41 @@ let opt = options.services.ipfs; ipfsFlags = toString ([ - (optionalString cfg.autoMount "--mount") - (optionalString cfg.enableGC "--enable-gc") - (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") - (optionalString (cfg.defaultMode == "offline") "--offline") + (optionalString cfg.autoMount "--mount") + (optionalString cfg.enableGC "--enable-gc") + (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") + (optionalString (cfg.defaultMode == "offline") "--offline") (optionalString (cfg.defaultMode == "norouting") "--routing=none") ] ++ cfg.extraFlags); splitMulitaddr = addrRaw: lib.tail (lib.splitString "/" addrRaw); - multiaddrToListenStream = addrRaw: let + multiaddrToListenStream = addrRaw: + let addr = splitMulitaddr addrRaw; s = builtins.elemAt addr; - in if s 0 == "ip4" && s 2 == "tcp" - then "${s 1}:${s 3}" + in + if s 0 == "ip4" && s 2 == "tcp" + then "${s 1}:${s 3}" else if s 0 == "ip6" && s 2 == "tcp" - then "[${s 1}]:${s 3}" + then "[${s 1}]:${s 3}" else if s 0 == "unix" - then "/${lib.concatStringsSep "/" (lib.tail addr)}" + then "/${lib.concatStringsSep "/" (lib.tail addr)}" else null; # not valid for listen stream, skip - multiaddrToListenDatagram = addrRaw: let + multiaddrToListenDatagram = addrRaw: + let addr = splitMulitaddr addrRaw; s = builtins.elemAt addr; - in if s 0 == "ip4" && s 2 == "udp" - then "${s 1}:${s 3}" + in + if s 0 == "ip4" && s 2 == "udp" + then "${s 1}:${s 3}" else if s 0 == "ip6" && s 2 == "udp" - then "[${s 1}]:${s 3}" + then "[${s 1}]:${s 3}" else null; # not valid for listen datagram, skip -in { +in +{ ###### interface @@ -65,9 +70,10 @@ in { dataDir = mkOption { type = types.str; - default = if versionAtLeast config.system.stateVersion "17.09" - then "/var/lib/ipfs" - else "/var/lib/ipfs/.ipfs"; + default = + if versionAtLeast config.system.stateVersion "17.09" + then "/var/lib/ipfs" + else "/var/lib/ipfs/.ipfs"; description = "The data dir for IPFS"; }; @@ -137,7 +143,7 @@ in { These are applied last, so may override configuration set by other options in this module. Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default! ''; - default = {}; + default = { }; example = { Datastore.StorageMax = "100GB"; Discovery.MDNS.Enabled = false; @@ -153,7 +159,7 @@ in { extraFlags = mkOption { type = types.listOf types.str; description = "Extra flags passed to the IPFS daemon"; - default = []; + default = [ ]; }; localDiscovery = mkOption { @@ -168,7 +174,7 @@ in { type = types.nullOr types.int; default = null; description = "The fdlimit for the IPFS systemd unit or null to have the daemon attempt to manage it"; - example = 64*1024; + example = 64 * 1024; }; startWhenNeeded = mkOption { @@ -235,24 +241,25 @@ in { ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir} ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir} '' + concatStringsSep "\n" (collect - isString - (mapAttrsRecursive - (path: value: - # Using heredoc below so that the value is never improperly quoted - '' - read value < Date: Tue, 31 Aug 2021 09:17:57 +0900 Subject: [PATCH 079/138] ipfs: increase UDP buffer size --- nixos/modules/services/network-filesystems/ipfs.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index c64fd07db8cb..57eae46b17a6 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -192,6 +192,9 @@ in environment.systemPackages = [ cfg.package ]; environment.variables.IPFS_PATH = cfg.dataDir; + # https://github.com/lucas-clemente/quic-go/wiki/UDP-Receive-Buffer-Size + boot.kernel.sysctl."net.core.rmem_max" = mkDefault 2500000; + programs.fuse = mkIf cfg.autoMount { userAllowOther = true; }; From 7194273c778d51cf9d209f494a21eee0621d3f82 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Mon, 30 Aug 2021 21:20:01 -0300 Subject: [PATCH 080/138] sage: adapt tests for networkx 2.6 --- .../science/math/sage/sage-src.nix | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 1e1fd0a42616..3ba21cf6c8be 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; From 6c10f151a1efc28f6fa7d474bda48378afcb6ff4 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 31 Aug 2021 11:59:52 +0900 Subject: [PATCH 081/138] docs: update beam.section --- doc/languages-frameworks/beam.section.md | 151 +++++++++++++++-------- 1 file changed, 102 insertions(+), 49 deletions(-) diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 08abd4588c64..fb608932dfc3 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -68,27 +68,107 @@ Erlang.mk functions similarly to Rebar3, except we use `buildErlangMk` instead o `mixRelease` is used to make a release in the mix sense. Dependencies will need to be fetched with `fetchMixDeps` and passed to it. -#### mixRelease - Elixir Phoenix example {#mixrelease---elixir-phoenix-example} +#### mixRelease - Elixir Phoenix example {#mix-release-elixir-phoenix-example} -Here is how your `default.nix` file would look. +there are 3 steps, frontend dependencies (javascript), backend dependencies (elixir) and the final derivation that puts both of those together + +##### mixRelease - Frontend dependencies (javascript) {#mix-release-javascript-deps} + +for phoenix projects, inside of nixpkgs you can either use yarn2nix (mkYarnModule) or node2nix. An example with yarn2nix can be found [here](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39). An example with node2nix will follow. To package something outside of nixpkgs, you have alternatives like [npmlock2nix](https://github.com/nix-community/npmlock2nix) or [nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage) + +##### mixRelease - backend dependencies (mix) {#mix-release-mix-deps} + +There are 2 ways to package backend dependencies. With mix2nix and with a fixed-output-derivation (FOD). + +###### mix2nix {#mix2nix} + +mix2nix is a cli tool available in nixpkgs. it will generate a nix expression from a mix.lock file. It is quite standard in the 2nix tool series. + +Note that currently mix2nix can't handle git dependencies inside the mix.lock file. If you have git dependencies, you can either add them manually (see [example](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/pleroma/default.nix#L20)) or use the FOD method. + +The advantage of using mix2nix is that nix will know your whole dependency graph. On a dependency update, this won't trigger a full rebuild and download of all the dependencies, where FOD will do so. + +practical steps: + +- run `mix2nix > mix_deps.nix` in the upstream repo. +- pass `mixNixDeps = with pkgs; import ./mix_deps.nix { inherit lib beamPackages; };` as an argument to mixRelease. + +If there are git depencencies. + +- You'll need to fix the version artificially in mix.exs and regenerate the mix.lock with fixed version (on upstream). This will enable you to run `mix2nix > mix_deps.nix`. +- From the mix_deps.nix file, remove the dependencies that had git versions and pass them as an override to the import function. + +```nix + mixNixDeps = import ./mix.nix { + inherit beamPackages lib; + overrides = (final: prev: { + # mix2nix does not support git dependencies yet, + # so we need to add them manually + prometheus_ex = beamPackages.buildMix rec { + name = "prometheus_ex"; + version = "3.0.5"; + + # Change the argument src with the git src that you actually need + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "prometheus.ex"; + rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5"; + sha256 = "1v0q4bi7sb253i8q016l7gwlv5562wk5zy3l2sa446csvsacnpjk"; + }; + # you can re-use the same beamDeps argument as generated + beamDeps = with final; [ prometheus ]; + }; + }); +}; +``` + +You will need to run the build process once to fix the sha256 to correspond to your new git src. + +###### FOD {#fixed-output-derivation} + +A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir_ls.nix) for a usage example of FOD. + +Practical steps + +- start with the following argument to mixRelease + +```nix + mixFodDeps = fetchMixDeps { + pname = "mix-deps-${pname}"; + inherit src version; + sha256 = lib.fakeSha256; + }; +``` + +The first build will complain about the sha256 value, you can replace with the suggested value after that. + +Note that if after you've replaced the value, nix suggests another sha256, then mix is not fetching the dependencies reproducibly. An FOD will not work in that case and you will have to use mix2nix. + +##### mixRelease - example {#mix-release-example} + +Here is how your `default.nix` file would look for a phoenix project. ```nix with import { }; let + # beam.interpreters.erlangR23 is available if you need a particular version packages = beam.packagesWith beam.interpreters.erlang; + + pname = "your_project"; + version = "0.0.1"; + src = builtins.fetchgit { url = "ssh://git@github.com/your_id/your_repo"; rev = "replace_with_your_commit"; }; - pname = "your_project"; - version = "0.0.1"; - mixEnv = "prod"; - + # if using mix2nix you can use the mixNixDeps attribute mixFodDeps = packages.fetchMixDeps { pname = "mix-deps-${pname}"; - inherit src mixEnv version; + inherit src version; # nix will complain and tell you the right value to replace this with sha256 = lib.fakeSha256; # if you have build time environment variables add them here @@ -97,45 +177,19 @@ let nodeDependencies = (pkgs.callPackage ./assets/default.nix { }).shell.nodeDependencies; - frontEndFiles = stdenvNoCC.mkDerivation { - pname = "frontend-${pname}"; - - nativeBuildInputs = [ nodejs ]; - - inherit version src; - - buildPhase = '' - cp -r ./assets $TEMPDIR - - mkdir -p $TEMPDIR/assets/node_modules/.cache - cp -r ${nodeDependencies}/lib/node_modules $TEMPDIR/assets - export PATH="${nodeDependencies}/bin:$PATH" - - cd $TEMPDIR/assets - webpack --config ./webpack.config.js - cd .. - ''; - - installPhase = '' - cp -r ./priv/static $out/ - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # nix will complain and tell you the right value to replace this with - outputHash = lib.fakeSha256; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - }; - - in packages.mixRelease { - inherit src pname version mixEnv mixFodDeps; + inherit src pname version mixFodDeps; # if you have build time environment variables add them here MY_ENV_VAR="my_value"; - preInstall = '' - mkdir -p ./priv/static - cp -r ${frontEndFiles} ./priv/static + + postBuild = '' + ln -sf ${nodeDependencies}/lib/node_modules assets/node_modules + npm run deploy --prefix ./assets + + # for external task you need a workaround for the no deps check flag + # https://github.com/phoenixframework/phoenix/issues/2690 + mix do deps.loadpaths --no-deps-check, phx.digest + mix phx.digest --no-deps-check ''; } ``` @@ -165,6 +219,8 @@ in systemd.services.${release_name} = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "postgresql.service" ]; + # note that if you are connecting to a postgres instance on a different host + # postgresql.service should not be included in the requires. requires = [ "network-online.target" "postgresql.service" ]; description = "my app"; environment = { @@ -201,6 +257,7 @@ in path = [ pkgs.bash ]; }; + # in case you have migration scripts or you want to use a remote shell environment.systemPackages = [ release ]; } ``` @@ -215,16 +272,11 @@ Usually, we need to create a `shell.nix` file and do our development inside of t { pkgs ? import {} }: with pkgs; - let - - elixir = beam.packages.erlangR22.elixir_1_9; - + elixir = beam.packages.erlangR24.elixir_1_12; in mkShell { buildInputs = [ elixir ]; - - ERL_INCLUDE_PATH="${erlang}/lib/erlang/usr/include"; } ``` @@ -264,6 +316,7 @@ let # TODO: not sure how to make hex available without installing it afterwards. mix local.hex --if-missing export LANG=en_US.UTF-8 + # keep your shell history in iex export ERL_AFLAGS="-kernel shell_history enabled" # postges related From 4502d6386e3e35f7297497075a22226f05ea44b5 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 31 Aug 2021 12:55:31 +0900 Subject: [PATCH 082/138] ipfs: nixpkgs-fmt --- .../services/network-filesystems/ipfs.nix | 99 +++++++++++-------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 1d5c03787496..c64fd07db8cb 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -5,36 +5,41 @@ let opt = options.services.ipfs; ipfsFlags = toString ([ - (optionalString cfg.autoMount "--mount") - (optionalString cfg.enableGC "--enable-gc") - (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") - (optionalString (cfg.defaultMode == "offline") "--offline") + (optionalString cfg.autoMount "--mount") + (optionalString cfg.enableGC "--enable-gc") + (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") + (optionalString (cfg.defaultMode == "offline") "--offline") (optionalString (cfg.defaultMode == "norouting") "--routing=none") ] ++ cfg.extraFlags); splitMulitaddr = addrRaw: lib.tail (lib.splitString "/" addrRaw); - multiaddrToListenStream = addrRaw: let + multiaddrToListenStream = addrRaw: + let addr = splitMulitaddr addrRaw; s = builtins.elemAt addr; - in if s 0 == "ip4" && s 2 == "tcp" - then "${s 1}:${s 3}" + in + if s 0 == "ip4" && s 2 == "tcp" + then "${s 1}:${s 3}" else if s 0 == "ip6" && s 2 == "tcp" - then "[${s 1}]:${s 3}" + then "[${s 1}]:${s 3}" else if s 0 == "unix" - then "/${lib.concatStringsSep "/" (lib.tail addr)}" + then "/${lib.concatStringsSep "/" (lib.tail addr)}" else null; # not valid for listen stream, skip - multiaddrToListenDatagram = addrRaw: let + multiaddrToListenDatagram = addrRaw: + let addr = splitMulitaddr addrRaw; s = builtins.elemAt addr; - in if s 0 == "ip4" && s 2 == "udp" - then "${s 1}:${s 3}" + in + if s 0 == "ip4" && s 2 == "udp" + then "${s 1}:${s 3}" else if s 0 == "ip6" && s 2 == "udp" - then "[${s 1}]:${s 3}" + then "[${s 1}]:${s 3}" else null; # not valid for listen datagram, skip -in { +in +{ ###### interface @@ -65,9 +70,10 @@ in { dataDir = mkOption { type = types.str; - default = if versionAtLeast config.system.stateVersion "17.09" - then "/var/lib/ipfs" - else "/var/lib/ipfs/.ipfs"; + default = + if versionAtLeast config.system.stateVersion "17.09" + then "/var/lib/ipfs" + else "/var/lib/ipfs/.ipfs"; description = "The data dir for IPFS"; }; @@ -137,7 +143,7 @@ in { These are applied last, so may override configuration set by other options in this module. Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default! ''; - default = {}; + default = { }; example = { Datastore.StorageMax = "100GB"; Discovery.MDNS.Enabled = false; @@ -153,7 +159,7 @@ in { extraFlags = mkOption { type = types.listOf types.str; description = "Extra flags passed to the IPFS daemon"; - default = []; + default = [ ]; }; localDiscovery = mkOption { @@ -168,7 +174,7 @@ in { type = types.nullOr types.int; default = null; description = "The fdlimit for the IPFS systemd unit or null to have the daemon attempt to manage it"; - example = 64*1024; + example = 64 * 1024; }; startWhenNeeded = mkOption { @@ -235,24 +241,25 @@ in { ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir} ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir} '' + concatStringsSep "\n" (collect - isString - (mapAttrsRecursive - (path: value: - # Using heredoc below so that the value is never improperly quoted - '' - read value < Date: Mon, 30 Aug 2021 15:47:23 +0200 Subject: [PATCH 083/138] stalonetray: 0.8.3 -> 0.8.4 This update is quite involved for a minor version update. 1. I had to change the source from Sourceforge to Github. 2. I manually specify the autoconf pre-configuration steps. This seems to be necessary, but is there a better, more canonical way? 3. I had to add the docbook dependency and tinker around with substitutions, because the original files would pull sources from an online repository. Please have a look! Thanks for your comments. Cheers. --- .../window-managers/stalonetray/default.nix | 50 +++++++++++++------ 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 47903bb2276e..218b2a4fefd2 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/"; - }; - }; } From eb8e943493164009f34ba4c0a824533ce755f1dd Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 31 Aug 2021 09:15:44 +0200 Subject: [PATCH 084/138] Fix interaction between appendOverlays and otherPackageSets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The comment a dirty hack that should be removed has led me to believe that nixpkgsFun isn't the right solution, but bypassing it is worse, because it creates a second, inner overriding mechanism that doesn't pass its changes to the old, outer overriding mechanism. Before this change: nix-repl> ((import {}).appendOverlays([(f: s: { foobarbaz = "ok"; })])).foobarbaz "ok" nix-repl> ((import {}).appendOverlays([(f: s: { foobarbaz = "ok"; })])).pkgsCross.aarch64-multiplatform.foobarbaz error: attribute 'foobarbaz' missing at «string»:1:1: 1| ((import {}).appendOverlays([(f: s: { foobarbaz = "ok"; })])).pkgsCross.aarch64-multiplatform.foobarbaz | ^ 2| After this change: nix-repl> ((import ./. {}).appendOverlays([(f: s: { foobarbaz = "ok"; })])).pkgsCross.aarch64-multiplatform.foobarbaz "ok" Thanks to samueldr for discovering this problem. --- pkgs/top-level/stage.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index b01ef584d206..84c4d8fc4059 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. From 56feed592e3441faa4eb7da016b04ee13148b447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 31 Aug 2021 09:23:05 +0200 Subject: [PATCH 085/138] kakoune: remove pkg-config, cleanup preConfigure --- pkgs/applications/editors/kakoune/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index dc91630b5cd2..2562a821b822 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config }: +{ lib, stdenv, fetchFromGitHub }: with lib; @@ -11,12 +11,10 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "13kc68vkrzg89khir6ayyxgbnmz16dhippcnw09hhzxivf5ayzpy"; }; - nativeBuildInputs = [ pkg-config ]; - makeFlags = [ "debug=no" ]; + makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; preConfigure = '' export version="v${version}" - export PREFIX=$out ''; enableParallelBuilding = true; From 6cdb2092d679c028c54a032444308f30b7c0a2ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 09:36:18 +0200 Subject: [PATCH 086/138] flawfinder: 2.0.18 -> 2.0.19 --- pkgs/development/tools/flawfinder/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/flawfinder/default.nix b/pkgs/development/tools/flawfinder/default.nix index 36209c5d5aa4..0129cf73741b 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 From edddb705e8c735eb868d2e95663ae9a633b2f8d3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 31 Aug 2021 01:20:07 -0700 Subject: [PATCH 087/138] nixos/roon-server: fix openFirewall --- nixos/modules/services/audio/roon-server.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix index eceb65044c5b..42da5a100170 100644 --- a/nixos/modules/services/audio/roon-server.nix +++ b/nixos/modules/services/audio/roon-server.nix @@ -14,9 +14,6 @@ in { default = false; description = '' Open ports in the firewall for the server. - - UDP: 9003 - TCP: 9100 - 9200 ''; }; user = mkOption { @@ -54,10 +51,15 @@ in { }; networking.firewall = mkIf cfg.openFirewall { - allowedTCPPortRanges = [ - { from = 9100; to = 9200; } - ]; + allowedTCPPortRanges = [{ from = 9100; to = 9200; }]; allowedUDPPorts = [ 9003 ]; + extraCommands = '' + iptables -A INPUT -s 224.0.0.0/4 -j ACCEPT + iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT + iptables -A INPUT -s 240.0.0.0/5 -j ACCEPT + iptables -A INPUT -m pkttype --pkt-type multicast -j ACCEPT + iptables -A INPUT -m pkttype --pkt-type broadcast -j ACCEPT + ''; }; From 9e7af8a13c5fce9d35e2d5b11dbd5f30a879148b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 31 Aug 2021 01:21:07 -0700 Subject: [PATCH 088/138] nixos/roon-bridge: fix openFirewall --- nixos/modules/services/audio/roon-bridge.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/audio/roon-bridge.nix b/nixos/modules/services/audio/roon-bridge.nix index 85273a2039c3..e08f8a4f9e7a 100644 --- a/nixos/modules/services/audio/roon-bridge.nix +++ b/nixos/modules/services/audio/roon-bridge.nix @@ -14,9 +14,6 @@ in { default = false; description = '' Open ports in the firewall for the bridge. - - UDP: 9003 - TCP: 9100 - 9200 ''; }; user = mkOption { @@ -54,10 +51,15 @@ in { }; networking.firewall = mkIf cfg.openFirewall { - allowedTCPPortRanges = [ - { from = 9100; to = 9200; } - ]; + allowedTCPPortRanges = [{ from = 9100; to = 9200; }]; allowedUDPPorts = [ 9003 ]; + extraCommands = '' + iptables -A INPUT -s 224.0.0.0/4 -j ACCEPT + iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT + iptables -A INPUT -s 240.0.0.0/5 -j ACCEPT + iptables -A INPUT -m pkttype --pkt-type multicast -j ACCEPT + iptables -A INPUT -m pkttype --pkt-type broadcast -j ACCEPT + ''; }; From 92a5eac48b363984c4ab6de97ec36409bed55fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 30 Aug 2021 22:30:24 +0200 Subject: [PATCH 089/138] libe57format: 2.1 -> 2.2.0 --- .../libraries/libe57format/default.nix | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix index 49b75906bdbc..2ad8573ecb30 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 ]; From 274c9f6e0bab2cf7955059ee317098d1f6d9b643 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 31 Aug 2021 17:45:44 +0900 Subject: [PATCH 090/138] logstash: fix passthru.tests --- pkgs/tools/misc/logstash/7.x.nix | 101 ++++++++++++++++--------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 83a063c125ef..c0c67b19b10a 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="; }; + 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"); + }; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + + 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 + + patchShebangs $out/bin/logstash + patchShebangs $out/bin/logstash-plugin + + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" + + 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 ]; + }; + passthru.tests = + optionalAttrs (!enableUnfree) ( + assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; + { + elk = nixosTests.elk.ELK-7; + } + ); + }; in -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"); - }; - - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - dontPatchShebangs = true; - - 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 - - patchShebangs $out/bin/logstash - patchShebangs $out/bin/logstash-plugin - - wrapProgram $out/bin/logstash \ - --set JAVA_HOME "${jre}" - - 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 ]; - }; - passthru.tests = - optionalAttrs (!enableUnfree) ( - assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; - { - elk = nixosTests.elk.ELK-7; - } - ); -} +this From 9064e2c442578f5b6c53c173f31fa75158ebb01a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 11:11:33 +0200 Subject: [PATCH 091/138] python3Packages.zeroconf: 0.36.0 -> 0.36.2 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 4cda57cd9a23..618396a90b42 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 = [ From b8f14e34361d5ed7429bd9465a21706b5ecf4c30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 11:25:47 +0200 Subject: [PATCH 092/138] python3Packages.karton-dashboard: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/karton-dashboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index d1dd4478cf53..ad7d87138569 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 = [ From 1dd3bd8728bc31bc985d16087a2bd4fcf6e56d16 Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Sun, 29 Aug 2021 22:20:14 +0200 Subject: [PATCH 093/138] nixos/syncthing: fix declarative init crash on HTTPS A previous config may be present that has HTTPS for the REST API enabled. --- nixos/modules/services/networking/syncthing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 1a1b12f979c2..ebe4d89a0e7f 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -37,7 +37,7 @@ let do sleep 1; done curl() { - ${pkgs.curl}/bin/curl -sS -H "X-API-Key: $api_key" \ + ${pkgs.curl}/bin/curl -sSLk -H "X-API-Key: $api_key" \ --retry 1000 --retry-delay 1 --retry-all-errors \ "$@" } From 7bcc7aad5900bbd334ca9e7027bce37036b406eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 11:39:05 +0200 Subject: [PATCH 094/138] nmap: 7.91 -> 7.92 --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index a6d2ab143621..ff416f793e1c 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 ] From c87483cb559ce135e0f79e7a9e392613e14e6d95 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 31 Aug 2021 04:55:30 -0500 Subject: [PATCH 095/138] kops: 1.21.0 -> 1.21.1 (#136057) --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2111.section.md | 3 ++- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index b922f9f12082..2be2c66080d1 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -22,7 +22,7 @@ - kOps now defaults to 1.21.0, which uses containerd as the + kOps now defaults to 1.21.1, which uses containerd as the default runtime. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index c7e5afb7d0af..6db546caba33 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -7,7 +7,8 @@ In addition to numerous new and upgraded packages, this release has the followin ## Highlights {#sec-release-21.11-highlights} - PHP now defaults to PHP 8.0, updated from 7.4. -- kOps now defaults to 1.21.0, which uses containerd as the default runtime. + +- kOps now defaults to 1.21.1, which uses containerd as the default runtime. - `python3` now defaults to Python 3.9, updated from Python 3.8. diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 389be11e506c..8487afc208dd 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}"; }; } From 9de959a06fd2f7184155c17ad3e51d2ebd2d425a Mon Sep 17 00:00:00 2001 From: Raphael Megzari Date: Tue, 31 Aug 2021 18:56:51 +0900 Subject: [PATCH 096/138] caddy: 2.4.3 -> 2.4.4 (#136252) --- pkgs/servers/caddy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index b4c85de84ebc..801601487913 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; }; From afde3709d7eb5d34275ab3d65a3a1afc78d3d413 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 12:12:06 +0200 Subject: [PATCH 097/138] step-cli: 0.16.1 -> 0.17.2 --- pkgs/tools/security/step-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index c91a83c0a0d7..c1d5e0ec5b2c 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"; From f86c54202d770454226fa415b7fb26514afe1de7 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 31 Aug 2021 12:31:50 +0200 Subject: [PATCH 098/138] networkmanagerapplet: 1.22.0 -> 1.24.0 - https://gitlab.gnome.org/GNOME/network-manager-applet/-/blob/1.24.0/NEWS --- pkgs/tools/networking/networkmanager/applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index 5f83ffae055f..e6cf8d0e09cc 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 = [ From 075a6f16c0c67a97d4c81d9e90b6e5a3addf7503 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 14:19:55 +0000 Subject: [PATCH 099/138] tar2ext4: 0.8.20 -> 0.8.21 --- pkgs/tools/filesystems/tar2ext4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index bd173e7e5713..cd042f701d3a 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"; From 357eacbcd41fe87845554018f96d3cb81faf7679 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 11:47:44 +0000 Subject: [PATCH 100/138] linuxPackages.rtw88: mark broken on Linux 5.14 --- pkgs/os-specific/linux/rtw88/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index 423023512408..c3f849df1181 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; }; } From 1dfaced689df9590622d627f0f1ecbf0f690a6f0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 11:48:50 +0000 Subject: [PATCH 101/138] linuxPackages.xmm7360-pci: mark broken on Linux 5.14 --- pkgs/os-specific/linux/xmm7360-pci/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/xmm7360-pci/default.nix b/pkgs/os-specific/linux/xmm7360-pci/default.nix index 115299ff50bd..221bde981b65 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"; }; } From cf5caf02c908a7e30884b69a7c554c6ad605ac94 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 25 Aug 2021 21:17:32 +0200 Subject: [PATCH 102/138] python3Packages.coqpit: 0.0.10 -> 0.0.13 --- pkgs/development/python-modules/coqpit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index aa65432c15e9..a30c727eaa3c 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 = [ From 45af244b2d44cc9a434c5da292f646cdbcadaa90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 03:16:17 +0200 Subject: [PATCH 103/138] tts: relax mecab-python3 constraint --- pkgs/tools/audio/tts/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index dfc5f6646456..eceef5a0f953 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -26,10 +26,12 @@ python3.pkgs.buildPythonApplication rec { }; 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; [ From 1342c4648b6f04064882daacdfc6a5650d406700 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Aug 2021 11:50:30 +0000 Subject: [PATCH 104/138] =?UTF-8?q?jenkins:=202.289.3=20=E2=86=92=202.303.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 4af5738d91b5..a7d9aeda000b 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 ]; From 43b2aeb7f47c15e66958dab4db91c3e6019b6abe Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Aug 2021 11:48:01 +0000 Subject: [PATCH 105/138] =?UTF-8?q?oh-my-zsh:=202021-08-18=20=E2=86=92=202?= =?UTF-8?q?021-08-27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 7decd474e1e8..e78c208b56fe 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 = '' From aa29251293b7507bc248259e2f8681cee1eef103 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 14:26:32 +0200 Subject: [PATCH 106/138] tts: 0.2.0 -> 0.2.1 --- pkgs/tools/audio/tts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index eceef5a0f953..eb1ea2aa5923 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -16,13 +16,13 @@ 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 = '' From 7d471c87544b6743b8c36ab965271220d334d125 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 28 Aug 2021 17:52:23 +0000 Subject: [PATCH 107/138] usbredir: fix cross --- pkgs/development/libraries/usbredir/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 00a16e15b032..502c50db1220 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 ]; From 98429b2de9e937e58ee339a95f501e4a9d78d447 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 18:38:54 +0200 Subject: [PATCH 108/138] hashcat: 6.2.3 -> 6.2.4 --- pkgs/tools/security/hashcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 273e2837e06a..c45724e80e0a 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 ]; From eb22f77b930ca33e715a889520a7201b4041c630 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Aug 2021 20:31:46 +0800 Subject: [PATCH 109/138] skypeforlinux: 8.69.0.77 -> 8.75.0.140 --- .../instant-messengers/skypeforlinux/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 4eb536256240..7db77fbc31e3 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" ]; }; } From 60adf763357f7ae4b51b945ac967cb46c747d9ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 15:17:09 +0200 Subject: [PATCH 110/138] offlineimap: 7.3.3 -> 7.3.4 (#136145) --- pkgs/tools/networking/offlineimap/default.nix | 49 +++++++++++++------ 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 0de96169769a..5dc789e0dc58 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 ]; }; } From 8bce3034fda3b8d201961d382b55caaa54636e4d Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 31 Aug 2021 22:22:36 +0900 Subject: [PATCH 111/138] ipfs: add autoMigrate option --- nixos/modules/services/network-filesystems/ipfs.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index c64fd07db8cb..0eaeb9e3ceff 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -89,6 +89,12 @@ in description = "Whether IPFS should try to mount /ipfs and /ipns at startup."; }; + autoMigrate = mkOption { + type = types.bool; + default = true; + description = "Whether IPFS should try to run the fs-repo-migration at startup."; + }; + ipfsMountDir = mkOption { type = types.str; default = "/ipfs"; @@ -240,6 +246,8 @@ in ipfs --offline config Mounts.FuseAllowOther --json true ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir} ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir} + '' + optionalString cfg.autoMigrate '' + ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -y '' + concatStringsSep "\n" (collect isString (mapAttrsRecursive From 5947c5989979c684d97f7154695e77e2000afbb7 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Tue, 31 Aug 2021 10:03:35 -0400 Subject: [PATCH 112/138] matrix-synapse: 1.41.0 -> 1.41.1 https://github.com/matrix-org/synapse/releases/tag/v1.41.1 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f996ebe13909..e94b05edf9d3 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 = [ From 19ea42a1f6dc98745efead05fc4a7eab3907f3ae Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 31 Aug 2021 09:58:33 -0500 Subject: [PATCH 113/138] zfsUnstable: 2.1.0 -> unstable-2021-08-30 --- pkgs/os-specific/linux/zfs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 517e6036e780..60ac7d9057e6 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -210,13 +210,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; }; From 65be0edee53214acddf1feceafa58e8b852ba2b5 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 31 Aug 2021 16:01:25 +0530 Subject: [PATCH 114/138] git-branchless: add support for Darwin builds --- .../git-and-tools/git-branchless/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) 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 c80db8ee9582..ba4b12bd4501 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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 730fa1f35f4a..721b3ddeb353 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5255,7 +5255,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; From dd86b52c94af28acecbc3ad0bf4050cd8dae9126 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 31 Aug 2021 16:01:54 +0530 Subject: [PATCH 115/138] maintainers: add msfjarvis --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 43968e4d80d8..0bcaf2e4367b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7445,6 +7445,16 @@ name = "Maxim Schuwalow"; email = "maxim.schuwalow@gmail.com"; }; + msfjarvis = { + github = "msfjarvis"; + githubId = 3348378; + name = "Harsh Shandilya"; + email = "nixos@msfjarvis.dev"; + keys = [{ + longkeyid = "rsa4096/0xB7843F823355E9B9"; + fingerprint = "8F87 050B 0F9C B841 1515 7399 B784 3F82 3355 E9B9"; + }]; + }; msiedlarek = { email = "mikolaj@siedlarek.pl"; github = "msiedlarek"; From 9a218676434f8d9c58a113a9d9d7d08eb1f7083e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 31 Aug 2021 16:02:05 +0530 Subject: [PATCH 116/138] git-branchless: add msfjarvis as co-maintainer --- .../version-management/git-and-tools/git-branchless/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ba4b12bd4501..0afcd8400c7b 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 @@ -52,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 ]; }; } From 767bb4e4bbb9a8d06d4c3cbc14092902c2465f98 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 31 Aug 2021 17:45:12 +0200 Subject: [PATCH 117/138] nixos/nextcloud: apply doc fixes suggested by fabaff Co-authored-by: Fabian Affolter --- nixos/modules/services/web-apps/nextcloud.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 0d5634e93bfe..ed84487d233a 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -96,14 +96,14 @@ managing its own configuration. The config file lives in the home directory of the nextcloud user (by default /var/lib/nextcloud/config/config.php) and is also used to - track several states of the application (e.g. whether installed or not). + track several states of the application (e.g., whether installed or not). All configuration parameters are also stored in /var/lib/nextcloud/config/override.config.php which is generated by the module and linked from the store to ensure that all values from - config.phpcan be modified by the module. + config.php can be modified by the module. However config.php manages the application's state and shouldn't be touched manually because of that. @@ -123,7 +123,7 @@ Multiple version upgrades - Nextcloud doesn't allow to move more than one major-version forward. If you're e.g. on + Nextcloud doesn't allow to move more than one major-version forward. E.g., if you're on v16, you cannot upgrade to v18, you need to upgrade to v17 first. This is ensured automatically as long as the stateVersion is declared properly. In that case @@ -152,7 +152,7 @@ If this occurs on an existing setup, this is most likely because - the maintenance-mode is active. It can be deactivated by running + the maintenance mode is active. It can be deactivated by running nextcloud-occ maintenance:mode --off. It's advisable though to check the logs first on why the maintenance mode was activated. @@ -163,7 +163,7 @@ A re-run of the installer can be forced by deleting /var/lib/nextcloud/config/config.php. This is the only time - where this is advisable because the fresh install doesn't have any state that can be lost. + advisable because the fresh install doesn't have any state that can be lost. In case that doesn't help, an entire re-creation can be forced via rm -rf ~nextcloud/. From 5f62c582a4d9d73e1dbd07fb4295b931be8ad36e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 17:10:47 +0200 Subject: [PATCH 118/138] sequoia: fix license --- pkgs/tools/security/sequoia/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index d84f6f299005..18db48dfb249 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 ]; }; } From 29c70e8b88e1f2ae25f44691d34ffdb073d575f5 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 31 Aug 2021 10:44:11 -0600 Subject: [PATCH 119/138] element-{web,desktop}: 1.8.1 -> 1.8.2 --- .../element/element-desktop-package.json | 6 +++--- .../element/element-desktop-yarndeps.nix | 8 ++++---- .../instant-messengers/element/element-desktop.nix | 4 ++-- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) 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 4dd59aa5eee3..5251b07d8d9f 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 7af8cc7dc2fa..12ec78a6af1c 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 a82fe8ce344b..1cd7921cb9bd 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 a40ccf49f773..fdea75c78af7 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 = '' From 7b63df2fdeb0e14ed77b41be11cbf1e390cea15f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 21 Aug 2021 19:50:48 +0200 Subject: [PATCH 120/138] ocaml-ng.ocamlPackages_4_08.uunf: mark as broken on aarch64 Fails to build consistently on aarch64 for unknown reasons, probably a compiler bug as OCaml 4.12 seems to work. --- pkgs/development/ocaml-modules/uunf/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index cb95839d16c0..898bbbba91b7 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; }; } From 9af43148f9778146f0e4f9ac9619e6d0ac594349 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 31 Aug 2021 22:12:16 +0300 Subject: [PATCH 121/138] merkaartor: fix hash --- pkgs/applications/misc/merkaartor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index bb28be72deb7..90d91583a26f 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 ]; From e62a0eac8f2cfe58efae9200f9d267169f519cab Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 31 Aug 2021 22:15:04 +0200 Subject: [PATCH 122/138] buildLuarocksPackage: cleanup --- maintainers/scripts/update-luarocks-packages | 4 ++-- .../interpreters/lua-5/build-lua-package.nix | 10 +++------- pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 5 ----- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 55076f889e99..a465031b9112 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -53,11 +53,11 @@ class LuaPlugin: '''Name of the plugin, as seen on luarocks.org''' src: str '''address to the git repository''' - ref: str + ref: Optional[str] '''git reference (branch name/tag)''' version: Optional[str] '''Set it to pin a package ''' - server: str + server: Optional[str] '''luarocks.org registers packages under different manifests. Its value can be 'http://luarocks.org/dev' ''' diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 8ff70cef3ba2..5639b2a4bb90 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -7,10 +7,8 @@ }: { -# name ? "${attrs.pname}-${attrs.version}" -pname, - -version +pname +, version # by default prefix `name` e.g. "lua5.2-${name}" , namePrefix ? if lua.pkgs.isLuaJIT @@ -62,7 +60,7 @@ version # relative to srcRoot, path to the rockspec to use when using rocks , rockspecFilename ? null - # "../*.rockspec" +# relative to srcRoot, path to folder that contains the expected rockspec , rockspecDir ? "." # must be set for packages that don't have a rock @@ -174,8 +172,6 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab ${luarocks_content} EOF export LUAROCKS_CONFIG="$PWD/${luarocks_config}"; - echo "pwd: $PWD" - '' + lib.optionalString (rockspecFilename == null) '' rockspecFilename="${generatedRockspecFilename}" diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 096a7b8f70ce..22872bdcbfa8 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -9,11 +9,6 @@ luarocks.overrideAttrs(old: { sha256 = "sha256-WfzLSpIp0V7Ib4sjYvoJHF+/vHaieccvfVAr5W47QsQ="; }; patches = []; - # src = builtins.fetchGit { - # url = "https://github.com/nix-community/luarocks-nix.git"; - # ref = "test-speedup"; - # rev = "68ebd5356206a625021b9add4ec2f916692a55eb"; - # }; meta.mainProgram = "luarocks"; }) From 67247c113e30f51061bf913ad19d54ad84aede44 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Wed, 25 Aug 2021 15:29:42 -0700 Subject: [PATCH 123/138] bluespec: unstable-2021.03.29 -> 2021.07 --- .../compilers/bluespec/default.nix | 134 ++++++++++-------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 78 insertions(+), 57 deletions(-) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index 7a76d4948e73..4ae6622b9dc7 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -1,67 +1,31 @@ -{ 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 +{ 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, asciidoctor, tex # docs +, dejagnu, gnum4, time, tcsh # check +, longTests ? false # WIP }: 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; + outputs = [ "out" "doc" ]; + 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 - ]; - - postUnpack = '' mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2 # XXX: only works because yices.src isn't a tarball. @@ -70,34 +34,90 @@ in stdenv.mkDerivation rec { ''; preBuild = '' + # XXX: remove + set -x + patchShebangs \ src/Verilog/copy_module.pl \ src/comp/update-build-version.sh \ src/comp/update-build-system.sh \ - src/comp/wrapper.sh + src/comp/wrapper.sh \ + + # patchShebangs doesn't catch these. + substituteInPlace \ + testsuite/findfailures.csh \ + --replace '/bin/tcsh' "${tcsh}/bin/tcsh" \ + --replace '/bin/csh' "${tcsh}/bin/tcsh" + + substituteInPlace \ + testsuite/test_list.sh \ + --replace '/bin/tcsh' "${tcsh}/bin/tcsh" \ + --replace '/bin/csh' "${tcsh}/bin/tcsh" 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 ''; + buildInputs = yices.buildInputs ++ [ + fontconfig + libX11 # tcltk + tcl + tk + xorg.libXft + zlib + ]; + + nativeBuildInputs = [ + automake + autoconf + asciidoctor + bison + flex + ghcWithPackages + perl + pkg-config + tcsh + 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 = [ dejagnu gnum4 verilog perl time ]; + + checkTarget = if longTests then "check-suite" else "check-smoke"; + + checkFlags = [ + "SYSTEMCTEST=0" # no SystemC support yet. Patches welcome! + ]; + + 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 721b3ddeb353..55edf3b8f4ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10820,6 +10820,7 @@ with pkgs; bluespec = callPackage ../development/compilers/bluespec { gmp-static = gmp.override { withStatic = true; }; + tex = texlive.combined.scheme-full; }; cakelisp = callPackage ../development/compilers/cakelisp { }; From de2257e11c3d2e70befaba6ef90a8ef0572e41dc Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Wed, 25 Aug 2021 15:38:10 -0700 Subject: [PATCH 124/138] whitespace --- pkgs/development/compilers/bluespec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index 4ae6622b9dc7..108345ec0d9c 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { src/comp/update-build-system.sh \ src/comp/wrapper.sh \ - # patchShebangs doesn't catch these. + # patchShebangs doesn't catch these. substituteInPlace \ testsuite/findfailures.csh \ --replace '/bin/tcsh' "${tcsh}/bin/tcsh" \ @@ -107,9 +107,9 @@ in stdenv.mkDerivation rec { mv inst/bin $out mv inst/lib $out - # fragile, I know.. + # fragile, I know.. mkdir -p $doc/share/doc/bsc - mv inst/README $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 ''; From dea07960df60dc196c158eb538328784791baef3 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 27 Aug 2021 14:37:17 -0700 Subject: [PATCH 125/138] bluespec: use only 'check-smoke' for now --- .../compilers/bluespec/default.nix | 32 +++---------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index 108345ec0d9c..7fd69be01f61 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -1,8 +1,6 @@ { 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, asciidoctor, tex # docs -, dejagnu, gnum4, time, tcsh # check -, longTests ? false # WIP }: let @@ -24,6 +22,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; + # https://github.com/B-Lang-org/bsc/pull/278 patches = [ ./libstp_stub_makefile.patch ]; postUnpack = '' @@ -34,32 +33,18 @@ in stdenv.mkDerivation rec { ''; preBuild = '' - # XXX: remove - set -x - patchShebangs \ src/Verilog/copy_module.pl \ src/comp/update-build-version.sh \ src/comp/update-build-system.sh \ - src/comp/wrapper.sh \ - - # patchShebangs doesn't catch these. - substituteInPlace \ - testsuite/findfailures.csh \ - --replace '/bin/tcsh' "${tcsh}/bin/tcsh" \ - --replace '/bin/csh' "${tcsh}/bin/tcsh" - - substituteInPlace \ - testsuite/test_list.sh \ - --replace '/bin/tcsh' "${tcsh}/bin/tcsh" \ - --replace '/bin/csh' "${tcsh}/bin/tcsh" + src/comp/wrapper.sh 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 ++ [ @@ -80,7 +65,6 @@ in stdenv.mkDerivation rec { ghcWithPackages perl pkg-config - tcsh tex ]; @@ -92,15 +76,7 @@ in stdenv.mkDerivation rec { "STP_STUB=1" ]; - doCheck = true; - - checkInputs = [ dejagnu gnum4 verilog perl time ]; - - checkTarget = if longTests then "check-suite" else "check-smoke"; - - checkFlags = [ - "SYSTEMCTEST=0" # no SystemC support yet. Patches welcome! - ]; + checkTarget = "check-smoke"; installPhase = '' mkdir -p $out From 83088d4503f3daf37b5065aeffe38224542ab2ae Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 27 Aug 2021 14:40:22 -0700 Subject: [PATCH 126/138] whitespace --- pkgs/development/compilers/bluespec/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index 7fd69be01f61..b68f0b061347 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { src/Verilog/copy_module.pl \ src/comp/update-build-version.sh \ src/comp/update-build-system.sh \ - src/comp/wrapper.sh + src/comp/wrapper.sh substituteInPlace src/comp/Makefile \ --replace 'BINDDIR' 'BINDIR' \ From 6e968a8550a4dbaf257f7d2ce57299e5df5a3610 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sat, 28 Aug 2021 07:27:27 -0700 Subject: [PATCH 127/138] bluespec: style changes, checkInputs --- .../compilers/bluespec/default.nix | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index b68f0b061347..e839ca9b8bb9 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -1,11 +1,27 @@ -{ 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, asciidoctor, tex # docs -}: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, fontconfig +, libX11 +, perl +, flex +, bison +, pkg-config +, tcl +, tk +, 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"; @@ -76,6 +92,13 @@ in stdenv.mkDerivation rec { "STP_STUB=1" ]; + doCheck = true; + + checkInputs = [ + gmp-static + verilog + ]; + checkTarget = "check-smoke"; installPhase = '' From 912565a7081615a61811ee2b5e64c6216b425e6a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sat, 28 Aug 2021 08:26:02 -0700 Subject: [PATCH 128/138] whitespace --- pkgs/development/compilers/bluespec/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index e839ca9b8bb9..d89ed3e0d49f 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + checkInputs = [ gmp-static verilog ]; From e0c48f213be0adf3265c6ba175b2e1f5ec14c7f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Sep 2021 01:10:27 +0000 Subject: [PATCH 129/138] python38Packages.ntc-templates: 2.3.0 -> 2.3.1 --- pkgs/development/python-modules/ntc-templates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 67c6783a4649..dcb326a05a94 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 = [ From e444a24b0e3703c809a6ffbf8a255d7a1e7523a9 Mon Sep 17 00:00:00 2001 From: Zhenya Vinogradov Date: Wed, 11 Aug 2021 14:01:46 +0300 Subject: [PATCH 130/138] danger-gitlab: init at 8.0.0 --- .../version-management/danger-gitlab/Gemfile | 2 + .../danger-gitlab/Gemfile.lock | 92 +++++ .../danger-gitlab/default.nix | 14 + .../danger-gitlab/gemset.nix | 388 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 498 insertions(+) create mode 100644 pkgs/applications/version-management/danger-gitlab/Gemfile create mode 100644 pkgs/applications/version-management/danger-gitlab/Gemfile.lock create mode 100644 pkgs/applications/version-management/danger-gitlab/default.nix create mode 100644 pkgs/applications/version-management/danger-gitlab/gemset.nix diff --git a/pkgs/applications/version-management/danger-gitlab/Gemfile b/pkgs/applications/version-management/danger-gitlab/Gemfile new file mode 100644 index 000000000000..7c95dac9dd35 --- /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 000000000000..d68ec3108ca2 --- /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 000000000000..e994739008d3 --- /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 000000000000..299716a33bd8 --- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55edf3b8f4ba..f809ea1c9b29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 11dc269ec100eedd6658dd5f6faad4908fd4f373 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 11 Aug 2021 15:54:15 -0700 Subject: [PATCH 131/138] phosh: 0.12.1 -> 0.13.1 --- .../window-managers/phosh/default.nix | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 985814a0a132..5a5f1a8e6f79 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,7 +120,7 @@ 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 ]; platforms = platforms.linux; From 34e8efc3b9de1a3c6937ecdbdccc2a9189a93c5c Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 11 Aug 2021 23:12:36 -0700 Subject: [PATCH 132/138] phosh: Remove archseer as maintainer Per request: https://github.com/NixOS/nixpkgs/pull/133559#issuecomment-897343555 --- pkgs/applications/window-managers/phosh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 5a5f1a8e6f79..0a16bfc8842b 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { description = "A pure Wayland shell prototype for GNOME on mobile devices"; 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; }; } From 3c843d19845aa1d597fd77d34db1c159fd0fff6a Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 11 Aug 2021 15:56:37 -0700 Subject: [PATCH 133/138] phoc: Change source URL to GNOME GitLab --- pkgs/applications/misc/phoc/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index e599ffa39d78..97613b21957b 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; From be95ff2187e82fd3f41bef646bc69964c7f11d75 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 1 Sep 2021 16:07:23 +0900 Subject: [PATCH 134/138] wrangler: 1.19.0 -> 1.19.1 --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 55c2d3139e93..a14bc94e3f61 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 ]; From 83b48cc5896f4a50497d66f686938affe7cacf9e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 1 Sep 2021 15:15:50 +0800 Subject: [PATCH 135/138] caddy: build with default go and fix tests --- nixos/tests/caddy.nix | 95 +++++++++++++++++---------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index 29b227c0409b..0902904b2086 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -50,57 +50,58 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; }; }; + }; - testScript = { nodes, ... }: - let - etagSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/etag"; - justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/config-reload"; - multipleConfigs = "${nodes.webserver.config.system.build.toplevel}/specialisation/multiple-configs"; - in - '' - url = "http://localhost/example.html" - webserver.wait_for_unit("caddy") - webserver.wait_for_open_port("80") + testScript = { nodes, ... }: + let + etagSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/etag"; + justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/config-reload"; + multipleConfigs = "${nodes.webserver.config.system.build.toplevel}/specialisation/multiple-configs"; + in + '' + url = "http://localhost/example.html" + webserver.wait_for_unit("caddy") + webserver.wait_for_open_port("80") - def check_etag(url): - etag = webserver.succeed( - "curl --fail -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format( - url - ) - ) - etag = etag.replace("\r\n", " ") - http_code = webserver.succeed( - "curl --fail --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( - etag, url - ) - ) - assert int(http_code) == 304, "HTTP code is {}, expected 304".format(http_code) - return etag + def check_etag(url): + etag = webserver.succeed( + "curl --fail -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format( + url + ) + ) + etag = etag.replace("\r\n", " ") + http_code = webserver.succeed( + "curl --fail --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( + etag, url + ) + ) + assert int(http_code) == 304, "HTTP code is {}, expected 304".format(http_code) + return etag - with subtest("check ETag if serving Nix store paths"): - old_etag = check_etag(url) - webserver.succeed( - "${etagSystem}/bin/switch-to-configuration test >&2" - ) - webserver.sleep(1) - new_etag = check_etag(url) - assert old_etag != new_etag, "Old ETag {} is the same as {}".format( - old_etag, new_etag - ) + with subtest("check ETag if serving Nix store paths"): + old_etag = check_etag(url) + webserver.succeed( + "${etagSystem}/bin/switch-to-configuration test >&2" + ) + webserver.sleep(1) + new_etag = check_etag(url) + assert old_etag != new_etag, "Old ETag {} is the same as {}".format( + old_etag, new_etag + ) - with subtest("config is reloaded on nixos-rebuild switch"): - webserver.succeed( - "${justReloadSystem}/bin/switch-to-configuration test >&2" - ) - webserver.wait_for_open_port("8080") + with subtest("config is reloaded on nixos-rebuild switch"): + webserver.succeed( + "${justReloadSystem}/bin/switch-to-configuration test >&2" + ) + webserver.wait_for_open_port("8080") - with subtest("multiple configs are correctly merged"): - webserver.succeed( - "${multipleConfigs}/bin/switch-to-configuration test >&2" - ) - webserver.wait_for_open_port("8080") - webserver.wait_for_open_port("8081") - ''; - }) + with subtest("multiple configs are correctly merged"): + webserver.succeed( + "${multipleConfigs}/bin/switch-to-configuration test >&2" + ) + webserver.wait_for_open_port("8080") + webserver.wait_for_open_port("8081") + ''; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55edf3b8f4ba..c364837909f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2180,9 +2180,7 @@ with pkgs; ''; }); - caddy = callPackage ../servers/caddy { - buildGoModule = buildGo115Module; - }; + caddy = callPackage ../servers/caddy { }; traefik = callPackage ../servers/traefik { }; From 3ba32e04a7e8fd164684e1b79a8a172f07d631d4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 1 Sep 2021 07:44:51 +0000 Subject: [PATCH 136/138] linux_5_13: add missing alias --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0421939e901c..b78502116a49 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -477,6 +477,7 @@ mapAliases ({ linux_5_10 = linuxKernel.kernels.linux_5_10; linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; + linux_5_13 = linuxKernel.kernels.linux_5_13; # added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; From ed48b359914cbc2b39c213b4814030125ef6d8e4 Mon Sep 17 00:00:00 2001 From: Kranium Mendoza Date: Wed, 1 Sep 2021 18:51:55 +1000 Subject: [PATCH 137/138] pick: 2.0.2 -> 4.0.0 (#136348) --- pkgs/tools/misc/pick/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index a8203978feea..9a6c6881f7df 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; From 93ba1f2fee84bf286c5ced360c635e7052affc75 Mon Sep 17 00:00:00 2001 From: LeSuisse Date: Wed, 1 Sep 2021 13:19:09 +0200 Subject: [PATCH 138/138] xfig: 3.2.8a -> 3.2.8b (#136366) https://sourceforge.net/p/mcj/xfig/ci/b6c4fd32a1f3733b84cdbeeb2870b5e9849bc32c/ --- pkgs/applications/graphics/xfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 3330e3eaefd6..dc98d761bf08 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 ];