From 73dd8a73a48d54a9d75a1df8e4d3dc6ef92d57fb Mon Sep 17 00:00:00 2001 From: Pasquale Date: Sun, 14 Jun 2020 13:27:30 +0200 Subject: [PATCH 001/294] mantainers: add pasqui23 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b75cb49467a0..493a975aae14 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5972,6 +5972,12 @@ githubId = 131844; name = "Igor Pashev"; }; + pasqui23 = { + email = "p3dimaria@hotmail.it"; + github = "pasqui23"; + githubId = 6931743; + name = "pasqui23"; + }; patryk27 = { email = "wychowaniec.patryk@gmail.com"; github = "Patryk27"; From 79f4822a30ae5522ad66229527d04241e22a6722 Mon Sep 17 00:00:00 2001 From: Pasquale Date: Sun, 14 Jun 2020 13:28:27 +0200 Subject: [PATCH 002/294] zplugin: init at 2.3 --- pkgs/shells/zsh/zplugin/default.nix | 40 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/shells/zsh/zplugin/default.nix diff --git a/pkgs/shells/zsh/zplugin/default.nix b/pkgs/shells/zsh/zplugin/default.nix new file mode 100644 index 000000000000..c148f60b2eef --- /dev/null +++ b/pkgs/shells/zsh/zplugin/default.nix @@ -0,0 +1,40 @@ +{ stdenvNoCC, lib, fetchFromGitHub, installShellFiles }: +stdenvNoCC.mkDerivation rec { + pname = "zplugin"; + version = "2.3"; + src = fetchFromGitHub { + owner = "zdharma"; + repo = pname; + rev = "v${version}"; + sha256 = "0qqv5p19s8jb06d6h55dm4acji9x2rpxb2ni3h7fb0q43iz6y85w"; + }; + # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git + dontBuild = true; + nativeBuildInputs = [ installShellFiles ]; + installPhase = '' + outdir="$out/share/$pname" + + cd "$src" + + # Zplugin's source files + install -dm0755 "$outdir" + install -m0644 zplugin{,-side,-install,-autoload}.zsh "$outdir" + install -m0755 git-process-output.zsh "$outdir" + + # Zplugin autocompletion + installShellCompletion --zsh _zplugin + + #TODO:Zplugin-module files + # find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \; + # find zmodules/ -type f -exec install -m 744 "{}" "$outdir/{}" \; + + ''; + #TODO:doc output + + meta = with lib; { + homepage = "https://github.com/zdharma/zplugin"; + description = "Flexible zsh plugin manager"; + license = licenses.mit; + maintainers = with maintainers; [ pasqui23 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3760114301e0..a1e3fad9242b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7886,6 +7886,8 @@ in zplug = callPackage ../shells/zsh/zplug { }; + zplugin = callPackage ../shells/zsh/zplugin {} ; + zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-bd = callPackage ../shells/zsh/zsh-bd { }; From 5e20a0364669b39b86be1ab0453884f2344d5d7b Mon Sep 17 00:00:00 2001 From: Vonfry Date: Sun, 5 Jul 2020 09:43:10 +0800 Subject: [PATCH 003/294] vimPlugins.vim-airline-clock: init at 2018-05-08 --- 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 5cb779d5e1f8..56876d594b4f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3877,6 +3877,18 @@ let meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; + vim-airline-clock = buildVimPluginFrom2Nix { + pname = "vim-airline-clock"; + version = "2018-05-08"; + src = fetchFromGitHub { + owner = "enricobacis"; + repo = "vim-airline-clock"; + rev = "a752ae89d833ce14f87e303f3f479c01065077ca"; + sha256 = "0wbaxm1k9j4cl5vw1wppsds0afc0h3n2ipp8xhgdh5jswjhr6wlc"; + }; + meta.homepage = "https://github.com/enricobacis/vim-airline-clock/"; + }; + vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; version = "2020-06-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 46d445e9c2ab..1dd4ce2ecfd1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -96,6 +96,7 @@ elmcast/elm-vim elzr/vim-json embear/vim-localvimrc enomsg/vim-haskellConcealPlus +enricobacis/vim-airline-clock ensime/ensime-vim ervandew/supertab esneider/YUNOcommit.vim From eb4e67505fdf9c521106b3ba9c6f300c77adee6c Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 27 Jun 2020 13:55:54 +0200 Subject: [PATCH 004/294] undervolt: expose power limits as Nixopts We no longer escape the flags because the power limit flags want two arguments If we escaped them, we'd only get one argument with an escaped space in it. Undervolt's flags don't have anything in them that would need to be escaped, so that shouldn't break anything --- nixos/modules/services/hardware/undervolt.nix | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 054ffa35050a..9c2f78a755dd 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -3,7 +3,12 @@ with lib; let cfg = config.services.undervolt; - cliArgs = lib.cli.toGNUCommandLineShell {} { + + mkPLimit = limit: window: + if (isNull limit && isNull window) then null + else assert asserts.assertMsg (!isNull limit && !isNull window) "Both power limit and window must be set"; + "${toString limit} ${toString window}"; + cliArgs = lib.cli.toGNUCommandLine {} { inherit (cfg) verbose temp @@ -21,6 +26,9 @@ let temp-bat = cfg.tempBat; temp-ac = cfg.tempAc; + + power-limit-long = mkPLimit cfg.p1.limit cfg.p1.window; + power-limit-short = mkPLimit cfg.p2.limit cfg.p2.window; }; in { @@ -104,6 +112,40 @@ in ''; }; + p1.limit = mkOption { + type = with types; nullOr int; + default = null; + description = '' + The P1 Power Limit in Watts. + Both limit and window must be set. + ''; + }; + p1.window = mkOption { + type = with types; nullOr (oneOf [ float int ]); + default = null; + description = '' + The P1 Time Window in seconds. + Both limit and window must be set. + ''; + }; + + p2.limit = mkOption { + type = with types; nullOr int; + default = null; + description = '' + The P2 Power Limit in Watts. + Both limit and window must be set. + ''; + }; + p2.window = mkOption { + type = with types; nullOr (oneOf [ float int ]); + default = null; + description = '' + The P2 Time Window in seconds. + Both limit and window must be set. + ''; + }; + useTimer = mkOption { type = types.bool; default = false; @@ -133,7 +175,7 @@ in serviceConfig = { Type = "oneshot"; Restart = "no"; - ExecStart = "${pkgs.undervolt}/bin/undervolt ${cliArgs}"; + ExecStart = "${pkgs.undervolt}/bin/undervolt ${toString cliArgs}"; }; }; From 54210573c1e2db45d5abbda4c3ce1afc25210889 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 25 Aug 2020 17:54:27 -0500 Subject: [PATCH 005/294] stdenv/native: provide patchelf on linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This provides consistency with the pure stdenv, which provides patchelf this way. Native stdenv can always just manually install patchelf on their system, but like xz, it’s unlikely to be provided in /usr/bin/. In addition, it’s not even in the RHEL7 repos. --- pkgs/stdenv/native/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index f6e0df161ad0..b79b81253ad5 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -78,7 +78,7 @@ let # A function that builds a "native" stdenv (one that uses tools in # /usr etc.). makeStdenv = - { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }: + { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }), extraNativeBuildInputs ? [] }: import ../generic { buildPlatform = localSystem; @@ -94,10 +94,10 @@ let if system == "x86_64-cygwin" then prehookCygwin else prehookBase; - extraNativeBuildInputs = - if system == "i686-cygwin" then extraNativeBuildInputsCygwin else + extraNativeBuildInputs = extraNativeBuildInputs ++ + (if system == "i686-cygwin" then extraNativeBuildInputsCygwin else if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else - []; + []); initialPath = extraPath ++ path; @@ -163,6 +163,7 @@ in inherit (prevStage.stdenv) cc fetchurl; extraPath = [ prevStage.xz ]; overrides = self: super: { inherit (prevStage) xz; }; + extraNativeBuildInputs = if localSystem.isLinux then [ prevStage.patchelf ] else []; }; }) From 48309677368e3fac5489326e00f1d6b0513d2b8e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 21 Aug 2020 22:20:10 -0500 Subject: [PATCH 006/294] Fix cc-wrapper in native stdenv --- pkgs/build-support/cc-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 6ee287e287bc..ecde89ac9450 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -57,7 +57,7 @@ let suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; expand-response-params = - if buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" + if (buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null" then import ../expand-response-params { inherit (buildPackages) stdenv; } else ""; From 3733a496bd6b6805c55198c60fb3ddbd8e59b2e4 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Wed, 30 Sep 2020 12:59:06 +0000 Subject: [PATCH 007/294] fatresize: 1.0.2 -> 1.1.0 --- pkgs/tools/filesystems/fatresize/default.nix | 32 +++----- .../fatresize/fatresize_parted_nix.patch | 74 ------------------- 2 files changed, 10 insertions(+), 96 deletions(-) delete mode 100644 pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index c1d048889c70..79551df00ee9 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -1,38 +1,26 @@ -{ stdenv, fetchurl, parted, utillinux }: +{ stdenv, fetchFromGitHub, parted, utillinux, pkg-config }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.1.0"; pname = "fatresize"; - src = fetchurl { - url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2"; - sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm"; + src = fetchFromGitHub { + owner = "ya-mouse"; + repo = "fatresize"; + rev = "v${version}"; + sha256 = "1vhz84kxfyl0q7mkqn68nvzzly0a4xgzv76m6db0bk7xyczv1qr2"; }; buildInputs = [ parted utillinux ]; - - # This patch helps this unmantained piece of software to be built against recent parted - # It basically modifies the detection scheme for parted version (the current one has no micro version defined) - # The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted - # The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params - patches = [ ./fatresize_parted_nix.patch ]; - - preConfigure = '' - echo "Replacing calls to ped_free with free ..." - substituteInPlace ./fatresize.c --replace ped_free free - ''; - - # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives - # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG - makeFlags = [ "LDFLAGS=-lparted-fs-resize" ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ parted utillinux ]; meta = with stdenv.lib; { description = "The FAT16/FAT32 non-destructive resizer"; - homepage = "https://sourceforge.net/projects/fatresize"; + homepage = "https://github.com/ya-mouse/fatresize"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl3; }; } diff --git a/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch b/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch deleted file mode 100644 index e9aa87a2d564..000000000000 --- a/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/aclocal.m4 b/aclocal.m4 -index 18e8176..2e75592 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -88,8 +88,15 @@ int main () - if ( !(version = ped_get_version ()) ) - exit(1); - if (sscanf(version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", version); -- exit(1); -+ if (sscanf(version, "%d.%d", &major, &minor) != 2) -+ { -+ printf("%s, bad version string\n", version); -+ exit(1); -+ } -+ else -+ { -+ micro = 0; -+ } - } - - if ((major > $parted_config_major_version) || -diff --git a/configure b/configure -index ed31457..e5f1705 100755 ---- a/configure -+++ b/configure -@@ -4793,8 +4793,15 @@ int main () - if ( !(version = ped_get_version ()) ) - exit(1); - if (sscanf(version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", version); -- exit(1); -+ if (sscanf(version, "%d.%d", &major, &minor) != 2) -+ { -+ printf("%s, bad version string\n", version); -+ exit(1); -+ } -+ else -+ { -+ micro = 0; -+ } - } - - if ((major > $parted_config_major_version) || -diff --git a/fatresize.c b/fatresize.c -index 424d5d2..e439102 100644 ---- a/fatresize.c -+++ b/fatresize.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - #include "config.h" -@@ -217,7 +218,7 @@ fatresize_handler(PedException *ex) - static int - snap(PedSector* sector, PedSector new_sector, PedGeometry* range) - { -- PED_ASSERT(ped_geometry_test_sector_inside (range, *sector), return 0); -+ PED_ASSERT(ped_geometry_test_sector_inside (range, *sector)); - if (!ped_geometry_test_sector_inside(range, new_sector)) - return 0; - -@@ -281,7 +282,7 @@ snap_to_boundaries (PedGeometry* new_geom, PedGeometry* old_geom, - end_part->geom.end, end_part->geom.start - 1, -1); - } - -- PED_ASSERT (start <= end, return); -+ PED_ASSERT (start <= end); - ped_geometry_set (new_geom, start, end - start + 1); - } - From 3ed0b84b883dfd68db33297c6dea3cb39afb2777 Mon Sep 17 00:00:00 2001 From: sohalt Date: Sat, 26 Sep 2020 12:33:56 +0200 Subject: [PATCH 008/294] tarssh: init at 0.4.0 --- pkgs/servers/tarssh/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/tarssh/default.nix diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix new file mode 100644 index 000000000000..72e636b303f1 --- /dev/null +++ b/pkgs/servers/tarssh/default.nix @@ -0,0 +1,25 @@ +{ fetchFromGitHub, rustPlatform, stdenv }: + +with rustPlatform; + +buildRustPackage rec { + pname = "tarssh"; + version = "0.4.0"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "Freaky"; + repo = pname; + sha256 = "0fm0rwknhm39nhd6g0pnxby34i5gpmi5ri795d9ylsw0pqwz6kd0"; + }; + + cargoSha256 = "108xdpgfgfd4z455snif0mzbla0rv8gjqxci5qgwjzfyshwkprgv"; + + meta = with stdenv.lib; { + description = "A simple SSH tarpit inspired by endlessh"; + homepage = "https://github.com/Freaky/tarssh"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ sohalt ]; + platforms = platforms.unix ; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b1d6353b04f..feff7c5b8aa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7323,6 +7323,8 @@ in tarsnapper = callPackage ../tools/backup/tarsnapper { }; + tarssh = callPackage ../servers/tarssh { }; + tartube = callPackage ../applications/video/tartube { }; tayga = callPackage ../tools/networking/tayga { }; From 69ef15309ddd50dee55e22a9e0a8bea68c273232 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 01:03:01 +0200 Subject: [PATCH 009/294] python3Packages.irctokens: init at 2.0.0 --- .../python-modules/irctokens/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/irctokens/default.nix diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix new file mode 100644 index 000000000000..037a5f0520fd --- /dev/null +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pyyaml +, python +}: + +buildPythonPackage rec { + pname = "irctokens"; + version = "2.0.0"; + disabled = pythonOlder "3.6"; # f-strings + + src = fetchFromGitHub { + owner = "jesopo"; + repo = pname; + rev = "v${version}"; + sha256 = "0kpxn5paailm4xpdlnzxrhjrfgvvg5pp327wd8kl41a0wbqkj4zb"; + }; + + checkInputs = [ pyyaml ]; + checkPhase = '' + ${python.interpreter} -m unittest test + ''; + + pythonImportsCheck = [ "irctokens" ]; + + meta = with lib; { + description = "RFC1459 and IRCv3 protocol tokeniser library for python3"; + license = licenses.mit; + homepage = "https://github.com/jesopo/irctokens"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4928fdd7c16e..8e7a9247edbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2965,6 +2965,8 @@ in { irc = callPackage ../development/python-modules/irc { }; + irctokens = callPackage ../development/python-modules/irctokens { }; + isbnlib = callPackage ../development/python-modules/isbnlib { }; islpy = callPackage ../development/python-modules/islpy { }; From 11ce4d215d619d6b0fc7a9f716a106fff2e38731 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 01:11:43 +0200 Subject: [PATCH 010/294] python3Packages.ircstates: init at 0.11.3 --- .../python-modules/ircstates/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/ircstates/default.nix diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix new file mode 100644 index 000000000000..857b0358aff2 --- /dev/null +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pythonOlder +, irctokens +, pendulum +, python +}: + +buildPythonPackage rec { + pname = "ircstates"; + version = "0.11.3"; + disabled = pythonOlder "3.6"; # f-strings + + src = fetchFromGitHub { + owner = "jesopo"; + repo = pname; + rev = "v${version}"; + sha256 = "1v8r6ma8gzvn5ym3xx9qlb0rc4l67pxr3z8njzk1ffxn1x3mxd3i"; + }; + + patches = [ + (fetchpatch { + name = "relax-pendulum-version.patch"; + url = "https://github.com/jesopo/ircstates/commit/f51f1b689e592020d1c91ccab6c03927aadb9f94.patch"; + sha256 = "0qbp3b9hlqbbx7b474q1mcgnzzzwcm4g89x26iqgmlgxzmv3y5xp"; + }) + ]; + + propagatedBuildInputs = [ + irctokens + pendulum + ]; + + checkPhase = '' + ${python.interpreter} -m unittest test + ''; + + pythonImportsCheck = [ "ircstates" ]; + + meta = with lib; { + description = "sans-I/O IRC session state parsing library"; + license = licenses.mit; + homepage = "https://github.com/jesopo/ircstates"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e7a9247edbd..aeec113524bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2965,6 +2965,8 @@ in { irc = callPackage ../development/python-modules/irc { }; + ircstates = callPackage ../development/python-modules/ircstates { }; + irctokens = callPackage ../development/python-modules/irctokens { }; isbnlib = callPackage ../development/python-modules/isbnlib { }; From 13d1db923c293ec76a1ad8c5251a4d4b9305f678 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 01:34:35 +0200 Subject: [PATCH 011/294] python3Packages.anyio: init at 2.0.2 --- .../python-modules/anyio/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/anyio/default.nix diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix new file mode 100644 index 000000000000..516b8520f00e --- /dev/null +++ b/pkgs/development/python-modules/anyio/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, idna +, sniffio +, typing-extensions +, curio +, hypothesis +, pytestCheckHook +, trio +, trustme +, uvloop +}: + +buildPythonPackage rec { + pname = "anyio"; + version = "2.0.2"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "agronholm"; + repo = pname; + rev = version; + sha256 = "06nazfrm2sclp3lpgsn9wl8vmqxvx36s3gr2gnqz3zhjpf3glkxv"; + }; + + propagatedBuildInputs = [ + idna + sniffio + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + checkInputs = [ + curio + hypothesis + pytestCheckHook + trio + trustme + uvloop + ]; + + pytestFlagsArray = [ + # lots of DNS lookups + "--ignore=tests/test_sockets.py" + ]; + + pythonImportsCheck = [ "anyio" ]; + + meta = with lib; { + description = "High level compatibility layer for multiple asynchronous event loop implementations on Python"; + homepage = "https://github.com/agronholm/anyio"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aeec113524bb..3f7524840f86 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -320,6 +320,8 @@ in { antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; + anyio = callPackage ../development/python-modules/anyio { }; + anyjson = callPackage ../development/python-modules/anyjson { }; anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; From e364d10db536eeef51a0d63a7570e251dc9d757d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 01:44:16 +0200 Subject: [PATCH 012/294] python3Packages.asyncio-throttle: init at 1.0.1 --- .../asyncio-throttle/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/asyncio-throttle/default.nix diff --git a/pkgs/development/python-modules/asyncio-throttle/default.nix b/pkgs/development/python-modules/asyncio-throttle/default.nix new file mode 100644 index 000000000000..bf08aec41a5b --- /dev/null +++ b/pkgs/development/python-modules/asyncio-throttle/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "asyncio-throttle"; + version = "1.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hallazzang"; + repo = pname; + rev = "v${version}"; + sha256 = "0raqnrnp42cn1c7whbm7ajbgaczx33k6hbxsj30nh998pqxhh4sj"; + }; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "asyncio_throttle" ]; + + meta = with lib; { + description = "Simple, easy-to-use throttler for asyncio"; + homepage = "https://github.com/hallazzang/asyncio-throttle"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f7524840f86..86da89347193 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -426,6 +426,8 @@ in { async_generator = callPackage ../development/python-modules/async_generator { }; + asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { }; + asyncpg = callPackage ../development/python-modules/asyncpg { }; asyncssh = callPackage ../development/python-modules/asyncssh { }; From c70681f33429c524210c6bfbd8d5337d679294f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 02:23:27 +0200 Subject: [PATCH 013/294] python3Packages.async_stagger: init at 0.3.0 --- .../python-modules/async_stagger/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/async_stagger/default.nix diff --git a/pkgs/development/python-modules/async_stagger/default.nix b/pkgs/development/python-modules/async_stagger/default.nix new file mode 100644 index 000000000000..034a8329b121 --- /dev/null +++ b/pkgs/development/python-modules/async_stagger/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, pythonOlder +, pytestCheckHook +, pytest-asyncio +, pytest-mock +}: + +buildPythonPackage rec { + pname = "async_stagger"; + version = "0.3.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "007l54fbk2dfzv3vmqz98m1i37mzxkkva5r4fiwq2pg8nb61fy0w"; + }; + + patches = [ + (fetchpatch { + # Fix test failures on Python 3.8 + # https://github.com/twisteroidambassador/async_stagger/issues/4 + url = "https://github.com/twisteroidambassador/async_stagger/commit/736ab20ff9c172628d911f1e6f72420399ec9631.patch"; + sha256 = "1ygqd9n56sj83lvgmv6nrx3m0sp3646s5k7z697qx43xslixj731"; + }) + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + pytest-mock + ]; + + pythonImportsCheck = [ "async_stagger" ]; + + meta = with lib; { + description = "Happy Eyeballs connection algorithm and underlying scheduling logic in asyncio"; + homepage = "https://github.com/twisteroidambassador/async_stagger"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86da89347193..1c8fee71e3e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -432,6 +432,8 @@ in { asyncssh = callPackage ../development/python-modules/asyncssh { }; + async_stagger = callPackage ../development/python-modules/async_stagger { }; + asynctest = callPackage ../development/python-modules/asynctest { }; async-timeout = callPackage ../development/python-modules/async_timeout { }; From f31f1020bc9b823dc54d8c5018c4e0454f5fe0c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 02:39:44 +0200 Subject: [PATCH 014/294] python3Packages.ircrobots: init at 0.3.3 --- .../python-modules/ircrobots/default.nix | 52 +++++++++++++++++++ .../ircrobots/relax-dependencies.patch | 14 +++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 68 insertions(+) create mode 100644 pkgs/development/python-modules/ircrobots/default.nix create mode 100644 pkgs/development/python-modules/ircrobots/relax-dependencies.patch diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix new file mode 100644 index 000000000000..359cf3e6934f --- /dev/null +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, anyio +, asyncio-throttle +, dataclasses +, ircstates +, async_stagger +, async-timeout +, python +}: + +buildPythonPackage rec { + pname = "ircrobots"; + version = "0.3.3"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jesopo"; + repo = pname; + rev = "v${version}"; + sha256 = "0ykn6ch7aazv2cx13q2gr94arh6f96d8hwjwnrcjai3i3x4q2pkq"; + }; + + patches = [ + ./relax-dependencies.patch + ]; + + propagatedBuildInputs = [ + anyio + asyncio-throttle + ircstates + async_stagger + async-timeout + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ]; + + checkPhase = '' + ${python.interpreter} -m unittest test + ''; + + pythonImportsCheck = [ "ircrobots" ]; + + meta = with lib; { + description = "Asynchronous bare-bones IRC bot framework for python3"; + license = licenses.mit; + homepage = "https://github.com/jesopo/ircrobots"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/ircrobots/relax-dependencies.patch b/pkgs/development/python-modules/ircrobots/relax-dependencies.patch new file mode 100644 index 000000000000..9aed3577f63d --- /dev/null +++ b/pkgs/development/python-modules/ircrobots/relax-dependencies.patch @@ -0,0 +1,14 @@ +diff --git a/requirements.txt b/requirements.txt +index 87a2d31..4e0efb1 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,6 +1,6 @@ +-anyio ==1.3.0 ++anyio + asyncio-throttle ==1.0.1 +-dataclasses ==0.6 +-ircstates ==0.11.2 ++dataclasses; python_version < "3.7" ++ircstates >=0.11.2 + async_stagger ==0.3.0 + async_timeout ==3.0.1 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c8fee71e3e5..e7ee2c82dda8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2971,6 +2971,8 @@ in { irc = callPackage ../development/python-modules/irc { }; + ircrobots = callPackage ../development/python-modules/ircrobots { }; + ircstates = callPackage ../development/python-modules/ircstates { }; irctokens = callPackage ../development/python-modules/irctokens { }; From 8eced948be92bcc2b68279f3639dbef42209daf1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 03:20:11 +0200 Subject: [PATCH 015/294] ircdog: init at 0.2.1 --- .../networking/irc/ircdog/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/irc/ircdog/default.nix diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix new file mode 100644 index 000000000000..5badc69a3a27 --- /dev/null +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoPackage +, fetchFromGitHub +}: + +buildGoPackage rec { + pname = "ircdog"; + version = "0.2.1"; + + goPackagePath = "github.com/goshuirc/ircdog"; + + src = fetchFromGitHub { + owner = "goshuirc"; + repo = pname; + rev = "v${version}"; + sha256 = "1ppbznlkv7vajfbimxbyiq5y6pkfhm6ylhl408rwq1bawl28hpkl"; + fetchSubmodules = true; + }; + + meta = with lib; { + description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes"; + homepage = "https://github.com/goshuirc/ircdog"; + license = licenses.isc; + maintainers = with maintainers; [ hexa ]; + }; +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2bb1badd8f6..caea93ce22db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16536,6 +16536,8 @@ in imgproxy = callPackage ../servers/imgproxy { }; + ircdog = callPackage ../applications/networking/irc/ircdog { }; + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; From bb61cce82abc6f692548d6831960e455766c898c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sat, 10 Oct 2020 10:05:15 +0200 Subject: [PATCH 016/294] nixos-install: pass through impure flag --- nixos/doc/manual/man-nixos-install.xml | 6 ++++++ nixos/modules/installer/tools/nixos-install.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index b205e2309687..12d015971999 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -49,6 +49,12 @@ flake-uri + + + + + + diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 90555f145803..9279f11b4f32 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -64,7 +64,7 @@ while [ "$#" -gt 0 ]; do --no-bootloader) noBootLoader=1 ;; - --show-trace) + --show-trace|--impure) extraBuildFlags+=("$i") ;; --help) From 698836ecb7dad3efe8c8b69faafedeee8c8a0cfd Mon Sep 17 00:00:00 2001 From: "J. Neto" Date: Sun, 11 Oct 2020 15:30:19 -0300 Subject: [PATCH 017/294] textadept: 10.2 -> 10.8 --- .../editors/textadept/default.nix | 16 +++++++------ pkgs/applications/editors/textadept/deps.nix | 24 +++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index bb771c89010b..0456d013bbbe 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: + stdenv.mkDerivation rec { - version = "10.2"; + version = "10.8"; pname = "textadept"; nativeBuildInputs = [ pkgconfig ]; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchhg { url = "http://foicica.com/hg/textadept"; rev = "textadept_${version}"; - sha256 = "0fai8xqddkkprmbf0cf8wwgv7ccfdb1iyim30nppm2m16whkc8fl"; + sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s="; }; preConfigure = @@ -19,10 +20,6 @@ stdenv.mkDerivation rec { "ln -s ${fetchurl params} $PWD/src/${name}" ) (import ./deps.nix)) + '' - # work around trying to download stuff in `make deps` - function wget() { true; } - export -f wget - cd src make deps ''; @@ -31,12 +28,17 @@ stdenv.mkDerivation rec { make curses ''; + preInstall = '' + mkdir -p $out/share/applications + mkdir -p $out/share/pixmaps + ''; + postInstall = '' make curses install PREFIX=$out MAKECMDGOALS=curses ''; makeFlags = [ - "PREFIX=$(out)" + "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/applications/editors/textadept/deps.nix index 80306191ff12..3ab778dddb2a 100644 --- a/pkgs/applications/editors/textadept/deps.nix +++ b/pkgs/applications/editors/textadept/deps.nix @@ -1,23 +1,23 @@ { - "542782a4df7d.zip" = { - url = "http://foicica.com/hg/scintilla/archive/542782a4df7d.zip"; - sha256 = "1qwxxcj86z9y7ij05j60lcp1awy2c9ck0vnn9z6c732sqjza0zx5"; + "99fa62b828ee.zip" = { + url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip"; + sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc="; }; "lua-5.3.5.tar.gz" = { url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc"; }; - "lpeg-1.0.0.tar.gz" = { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.0.tar.gz"; - sha256 = "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"; + "lpeg-1.0.2.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; + sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4="; }; - "v_1_6_3.zip" = { - url = "https://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip"; - sha256 = "044s125im2irb4i42nnc5shvjj25fp4vsdbzd6b0va5igj0f6h4y"; + "v1_7_0_2.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip"; + sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg="; }; - "6435a42450c7.zip" = { - url = "http://foicica.com/hg/gtdialog/archive/6435a42450c7.zip"; - sha256 = "1vxn89sif3qccksb6x5iprysqhjg69g7nyxlgrg31q397dmsg1ym"; + "db67f8a489e8.zip" = { + url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip"; + sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM="; }; "cdk-5.0-20150928.tgz" = { url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz"; From 2ef3661fdf5c365b79480f3bdc2bceb0c63e39f3 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Wed, 14 Oct 2020 12:34:31 -0400 Subject: [PATCH 018/294] noaa-apt: make platforms.all explicit --- pkgs/applications/radio/noaa-apt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix index 55703ea44d6d..c99d4af12d6c 100644 --- a/pkgs/applications/radio/noaa-apt/default.nix +++ b/pkgs/applications/radio/noaa-apt/default.nix @@ -59,6 +59,7 @@ rustPlatform.buildRustPackage rec { homepage = "http://noaa-apt.mbernardi.com.ar/"; license = licenses.gpl3Only; maintainers = with maintainers; [ trepetti ]; + platforms = platforms.all; changelog = "https://github.com/martinber/noaa-apt/releases/tag/v${version}"; }; } From d2529bf58c4014484d0862e2f67530db30118314 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Wed, 14 Oct 2020 12:56:15 -0400 Subject: [PATCH 019/294] noaa-apt: 1.2.0 -> 1.3.0 --- pkgs/applications/radio/noaa-apt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix index c99d4af12d6c..b2afd2cffe20 100644 --- a/pkgs/applications/radio/noaa-apt/default.nix +++ b/pkgs/applications/radio/noaa-apt/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "noaa-apt"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "martinber"; repo = "noaa-apt"; rev = "v${version}"; - sha256 = "0fqki4a9c54rixdz5bpswvn433f9saw6yazgw4av3xdd7g2fdvvj"; + sha256 = "0fmbg6lw7lmm402hzddpzgi7y9mc6kic14x8rif7fampk20mv3ms"; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { pango ]; - cargoSha256 = "1pzcq31inazmc9cz31fspzqkp0lpkjid8ai3g17sin1pfzby5jlh"; + cargoSha256 = "0w4rbbz8lsh31xkgibzndiic47690nfcjrn1411dskf7ali6djy8"; preBuild = '' # Used by macro pointing to resource location at compile time. From 7ee6eb7e1d81951d8fa8fda23a7d3e097b845de1 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Fri, 16 Oct 2020 03:49:26 +0800 Subject: [PATCH 020/294] clipcat: init at 0.4.19 --- pkgs/applications/misc/clipcat/default.nix | 64 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/misc/clipcat/default.nix diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix new file mode 100644 index 000000000000..244770e138f9 --- /dev/null +++ b/pkgs/applications/misc/clipcat/default.nix @@ -0,0 +1,64 @@ +{ lib, fetchFromGitHub, installShellFiles, rustPlatform, rustfmt, xorg +, pkgconfig, llvmPackages, clang, protobuf, python3 }: + +rustPlatform.buildRustPackage rec { + pname = "clipcat"; + version = "0.4.19"; + + src = fetchFromGitHub { + owner = "xrelkd"; + repo = pname; + rev = "v${version}"; + sha256 = "1lhnm521qqy3aw2iyk1dv4yc5ms0c5x5iipx96bz6v6y0cnmf4kw"; + }; + + cargoSha256 = "04iflyvz8g53z658rkxafiyi2m9kzxwl3p1xgkjq7vacmz5jk15c"; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + # needed for internal protobuf c wrapper library + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + + nativeBuildInputs = [ + pkgconfig + + clang + llvmPackages.libclang + + rustfmt + protobuf + + python3 + + installShellFiles + ]; + buildInputs = [ xorg.libxcb ]; + + cargoBuildFlags = [ "--features=all" ]; + + postInstall = '' + installShellCompletion --bash --name clipcatd completions/bash-completion/completions/clipcatd + installShellCompletion --fish --name clipcatd.fish completions/fish/completions/clipcatd.fish + installShellCompletion --zsh --name _clipcatd completions/zsh/site-functions/_clipcatd + + installShellCompletion --bash --name clipcatctl completions/bash-completion/completions/clipcatctl + installShellCompletion --fish --name clipcatctl.fish completions/fish/completions/clipcatctl.fish + installShellCompletion --zsh --name _clipcatctl completions/zsh/site-functions/_clipcatctl + + installShellCompletion --bash --name clipcat-menu completions/bash-completion/completions/clipcat-menu + installShellCompletion --fish --name clipcat-menu.fish completions/fish/completions/clipcat-menu.fish + installShellCompletion --zsh --name _clipcat-menu completions/zsh/site-functions/_clipcat-menu + + installShellCompletion --bash --name clipcat-notify completions/bash-completion/completions/clipcat-notify + installShellCompletion --fish --name clipcat-notify.fish completions/fish/completions/clipcat-notify.fish + installShellCompletion --zsh --name _clipcat-notify completions/zsh/site-functions/_clipcat-notify + ''; + + meta = with lib; { + description = "Clipboard Manager written in Rust Programming Language"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ xrelkd ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db255b00c622..09c413672c68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20067,6 +20067,8 @@ in clipgrab = libsForQt514.callPackage ../applications/video/clipgrab { }; + clipcat = callPackage ../applications/misc/clipcat { }; + clipmenu = callPackage ../applications/misc/clipmenu { }; clipit = callPackage ../applications/misc/clipit { }; From 580f0faa7512f09a7a6fd63282603111a0d48723 Mon Sep 17 00:00:00 2001 From: V Date: Mon, 19 Oct 2020 14:25:36 +0200 Subject: [PATCH 021/294] nixos/caddy: remove services.caddy.agree This option is no longer referenced anywhere as of #99371. --- nixos/modules/services/web-servers/caddy.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 72bf9a9a1f44..63ba75e660cb 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -24,6 +24,10 @@ let ${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${adaptedConfig} ${tlsJSON} > $out ''; in { + imports = [ + (mkRemovedOptionModule [ "services" "caddy" "agree" ] "this option is no longer necessary for Caddy 2") + ]; + options.services.caddy = { enable = mkEnableOption "Caddy web server"; @@ -66,12 +70,6 @@ in { description = "Email address (for Let's Encrypt certificate)"; }; - agree = mkOption { - default = false; - type = types.bool; - description = "Agree to Let's Encrypt Subscriber Agreement"; - }; - dataDir = mkOption { default = "/var/lib/caddy"; type = types.path; From 3835f35f2b965b78204344ab50dbba23fb9e48ff Mon Sep 17 00:00:00 2001 From: V Date: Tue, 20 Oct 2020 03:27:03 +0200 Subject: [PATCH 022/294] uemacs: remove This crashes with a buffer overflow upon running it. It has likely been broken for some time. It has no maintainers. It is also unfree. --- pkgs/applications/editors/uemacs/default.nix | 38 -------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 40 deletions(-) delete mode 100644 pkgs/applications/editors/uemacs/default.nix diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix deleted file mode 100644 index e14a07eb6835..000000000000 --- a/pkgs/applications/editors/uemacs/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchgit, ncurses }: - -stdenv.mkDerivation { - pname = "uemacs"; - version = "2014-12-08"; - - src = fetchgit { - url = "git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git"; - rev = "8841922689769960fa074fbb053cb8507f2f3ed9"; - sha256 = "14yq7kpkax111cg6k7i3mnqk7sq7a65krq6qizzj7vvnm7bsj3sd"; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace "-lcurses" "-lncurses" \ - --replace "CFLAGS=-O2" "CFLAGS+=" \ - --replace "BINDIR=/usr/bin" "BINDIR=$out/bin" \ - --replace "LIBDIR=/usr/lib" "LIBDIR=$out/share/uemacs" - substituteInPlace epath.h \ - --replace "/usr/global/lib/" "$out/share/uemacs/" \ - --replace "/usr/local/bin/" "$out/bin/" \ - --replace "/usr/local/lib/" "$out/share/uemacs/" \ - --replace "/usr/local/" "$out/bin/" \ - --replace "/usr/lib/" "$out/share/uemacs/" - mkdir -p $out/bin $out/share/uemacs - ''; - - buildInputs = [ ncurses ]; - - meta = with stdenv.lib; { - homepage = "https://git.kernel.org/cgit/editors/uemacs/uemacs.git"; - description = "Torvalds Micro-emacs fork"; - longDescription = '' - uEmacs/PK 4.0 is a full screen editor based on MicroEMACS 3.9e - ''; - license = licenses.unfree; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c74f2249fc89..870a7fe39d14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7939,8 +7939,6 @@ in udunits = callPackage ../development/libraries/udunits { }; - uemacs = callPackage ../applications/editors/uemacs { }; - uftp = callPackage ../servers/uftp {}; uhttpmock = callPackage ../development/libraries/uhttpmock { }; From fdc5b324d66a276ea5615e05afbc2b3854a6b573 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Wed, 7 Oct 2020 10:01:53 +0200 Subject: [PATCH 023/294] slack: 4.9.0 -> 4.10.3 --- .../networking/instant-messengers/slack/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 2edccd8c019e..bd41fc562bfc 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -40,8 +40,8 @@ let pname = "slack"; version = { - x86_64-darwin = "4.9.0"; - x86_64-linux = "4.9.1"; + x86_64-darwin = "4.10.3"; + x86_64-linux = "4.10.3"; }.${system} or throwSystem; src = let @@ -49,11 +49,11 @@ let in { x86_64-darwin = fetchurl { url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = "007fflncvvclj4agb6g5hc5k9j5hhz1rpvlcfd8w31rn1vad4abk"; + sha256 = "0r77l57vr603xamich4h4gbdd5vdcj0sjs6yjpymfx9s0f98v8bb"; }; x86_64-linux = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1n8br5vlcnf13b8m6727hy4bkmd6wayss96ck4ba9zsjiyj7v74i"; + sha256 = "1gnjj2iyk8cwjajg8h9qpmzx10j4qjxjzciq8csg45qfzwkr3drf"; }; }.${system} or throwSystem; From c821e0d4be2b4ebc8e1eebca6eb11211a371a43e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Sep 2020 01:53:52 +0200 Subject: [PATCH 024/294] nixos/babeld: lock down service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit → Overall exposure level for babeld.service: 2.2 OK 🙂 --- nixos/modules/services/networking/babeld.nix | 34 ++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix index e62c74d0069d..90395dbd3c54 100644 --- a/nixos/modules/services/networking/babeld.nix +++ b/nixos/modules/services/networking/babeld.nix @@ -87,9 +87,37 @@ in description = "Babel routing daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile}"; + serviceConfig = { + ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile} -I /run/babeld/babeld.pid -S /var/lib/babeld/state"; + CapabilityBoundingSet = [ "CAP_NET_ADMIN" ]; + IPAddressAllow = [ "fe80::/64" "ff00::/8" "::1/128" "127.0.0.0/8" ]; + IPAddressDeny = "any"; + LockPersonality = true; + NoNewPrivileges = true; + MemoryDenyWriteExecute = true; + ProtectSystem = "strict"; + ProtectClock = true; + ProtectKernelTunables = false; # Couldn't write sysctl: Read-only file system + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + ProtectHome = true; + ProtectHostname = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = false; # kernel_route(ADD): Operation not permitted + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; + UMask = "0177"; + RuntimeDirectory = "babeld"; + StateDirectory = "babeld"; + }; }; - }; - } From f7cf7ed51dc7d9c72ed50c416a3b2945e37fb543 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Thu, 22 Oct 2020 10:59:46 -0700 Subject: [PATCH 025/294] terraform-providers.time: init at 0.6.0 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c49f4cd2b1ba..ecbf0b5ea223 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -934,6 +934,14 @@ "sha256": "1cl83afm00fflsd3skynjvncid3r74fkxfznrs1v8qypcg1j79g1", "version": "0.18.0" }, + "time": { + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/time", + "repo": "terraform-provider-time", + "rev": "v0.6.0", + "sha256": "0fb81hisjicib9rzbn51jqfrchyjd3hzq98adnf22cbra8wlnxlm", + "version": "0.6.0" + }, "tls": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tls", From c57affcc3ff20e48297b3a6779cdbadabcb488d7 Mon Sep 17 00:00:00 2001 From: Nora Puchreiner <71534864+nora-puchreiner@users.noreply.github.com> Date: Fri, 23 Oct 2020 02:13:07 +0000 Subject: [PATCH 026/294] graalvm8-ee, graalvm11-ee: 20.0.0 -> 20.2.1 --- .../compilers/graalvm/enterprise-edition.nix | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index 89896c556efa..690bfdb425cf 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,44 +1,51 @@ -{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg_3, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: +{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: let common = javaVersion: let graalvmXXX-ee = stdenv.mkDerivation rec { pname = "graalvm${javaVersion}-ee"; - version = "20.0.0"; + version = "20.2.1"; srcs = [ (requireFile { name = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz"; - sha256 = { "8" = "2df9b31b96f7a24b6a2fe3ecea0b5e819d5d058fde6320016dba1787ce59e99e"; - "11" = "b704fd27b5993584a1ad659b41f42ff0ae8893c066b64a6f6a1719fbee382536"; + sha256 = { "8" = "e0bb182146283a43824dd2c2ceeb89b6ff7a93f9a85da889f8663ce1c2bd3002"; + "11" = "e5d92d361e7859fe5f88c92d7bb466e285e07f1e4e2d9944948f85fa0e3aee2b"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "a9f3f86d880d133bd24ad3b1d95129a96e80ea1d8fbc865d09e9410b921e6897"; - "11" = "57086123a95f1e9d4e67b92f830bad9325431908c69a40ef10f28ed586d8bd35"; + sha256 = { "8" = "37ac6a62f68adad513057a60513ba75749adf98cc73999b3918afe159900428d"; + "11" = "f62df715ad529f8b84854644ac99e0a9a349232c7f03985d20a2a8be20edaa44"; + }.${javaVersion}; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "llvm-toolchain-installable-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8" = "da98a8c17b0c724b41d1596b57e282a1ecfcbf9140404dfb04b0d4d9fb159d8a"; + "11" = "fc442c396e92f59d034a69175104cb3565c3d128426bd939cc94c6ceccbb720f"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "28b2910736f41070c84b97f1b1a3c5fa43ebdcd926ec92c8f145550b5b975b3c"; - "11" = "27ff1befa67fe5cc9eb0216b6b1105876f44d13eff6137f36f29f13377ea687b"; + sha256 = { "8" = "44f6887249f2eb54cba98dd4d9de019da5463d92982e03bf655fffe4bb520daf"; + "11" = "941f3752ccb097958f49250586f04c305092ded3ea4c1b7d9a0f7632e47fa335"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "9c83bcd71e316805c2914c9002ce348ae44829606adc2375d9188b1eaaaf82f9"; - "11" = "5ca51478bcb5ea5bd9be35856dd7fb2ef03b888cd1b7284a8c15531979025fb4"; + sha256 = { "8" = "5c3993c701bd09c6064dcf4a6d9c7489620d0654b03c74682398c788c0211c09"; + "11" = "de3ebf35ce47dc399d7976cbd09fde0e85f2c10f85bc3fe8f32bb9e2b500ab70"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "e8bd14d3f9bf652104e4346e0899a0351afaecae030a9c0ce0f91b1f93d9e660"; - "11" = "d24eeb84625bb7a5e330b897fd6dde7fc579a687997b64625199c33fa83c40b4"; + sha256 = { "8" = "c0a334b271fd32c098bb3c42eada7eafb9f536becaa756097eebe4682915b067"; + "11" = "9e801071992a0ff976bc40b640a8b9368fd8ea890ba986543658fcbaa3a7fd68"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) @@ -47,7 +54,7 @@ let unpackPhase = '' unpack_jar() { jar=$1 - unzip $jar -d $out + unzip -o $jar -d $out perl -ne 'use File::Path qw(make_path); use File::Basename qw(dirname); if (/^(.+) = (.+)$/) { @@ -70,6 +77,7 @@ let unpack_jar ''${arr[2]} unpack_jar ''${arr[3]} unpack_jar ''${arr[4]} + unpack_jar ''${arr[5]} ''; installPhase = { @@ -117,7 +125,7 @@ let }.${javaVersion} }:${ stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender - glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg_3 libGL ]}" + glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" for f in $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true From a2472ebfb18d5857c07bb92dfb1c44f03fc4b44e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 22 Oct 2020 23:07:10 +0300 Subject: [PATCH 027/294] geogebra: 5-0-593-0 -> 5-0-609-0, geogebra6: 6-0-600-0 -> 6-0-609-0 --- .../science/math/geogebra/default.nix | 92 ++++++++++------ .../science/math/geogebra/geogebra6.nix | 100 +++++++++++------- 2 files changed, 121 insertions(+), 71 deletions(-) diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 5cebef83a4a9..a6950ad3451c 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,18 +1,7 @@ -{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }: - -stdenv.mkDerivation rec { +{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: +let pname = "geogebra"; - version = "5-0-593-0"; - - preferLocalBuild = true; - - src = fetchurl { - urls = [ - "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - ]; - sha256 = "d84c27a3299e6df08881733d22215a18decedcba4c2d97a9e5424c39cd57db35"; - }; + version = "5-0-609-0"; srcIcon = fetchurl { url = "http://static.geogebra.org/images/geogebra-logo.svg"; @@ -30,23 +19,6 @@ stdenv.mkDerivation rec { mimeType = "application/vnd.geogebra.file;application/vnd.geogebra.tool;"; }; - buildInputs = [ makeWrapper ]; - - installPhase = '' - install -D geogebra/* -t "$out/libexec/geogebra/" - - makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \ - --set JAVACMD "${jre}/bin/java" \ - --set GG_PATH "$out/libexec/geogebra" \ - --add-flags "--language=${language}" - - install -Dm644 "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - - install -Dm644 "${srcIcon}" \ - "$out/share/icons/hicolor/scalable/apps/geogebra.svg" - ''; - meta = with stdenv.lib; { description = "Dynamic mathematics software with graphics, algebra and spreadsheets"; longDescription = '' @@ -57,7 +29,61 @@ stdenv.mkDerivation rec { homepage = "https://www.geogebra.org/"; maintainers = with maintainers; [ ma27 ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; - platforms = platforms.all; + platforms = with platforms; linux ++ darwin; hydraPlatforms = []; }; -} + + linuxPkg = stdenv.mkDerivation { + inherit pname version meta srcIcon desktopItem; + + preferLocalBuild = true; + + src = fetchurl { + urls = [ + "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "http://web.archive.org/web/20201022200454/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + ]; + sha256 = "0xbhg8hm3dqm3qkraj48pqwslrnjyxpq9mcgylr2m8i1gmqw7xwf"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -D geogebra/* -t "$out/libexec/geogebra/" + + makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \ + --set JAVACMD "${jre}/bin/java" \ + --set GG_PATH "$out/libexec/geogebra" \ + --add-flags "--language=${language}" + + install -Dm644 "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + + install -Dm644 "${srcIcon}" \ + "$out/share/icons/hicolor/scalable/apps/geogebra.svg" + ''; + }; + + darwinPkg = stdenv.mkDerivation { + inherit pname version meta; + + preferLocalBuild = true; + + src = fetchurl { + url = "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"; + sha256 = "16fgqwxz31cfmia0pyzpk05aqzrqr11sjbw37q9zb3xfh3p1r4gz"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + install -dm755 $out/Applications + unzip $src -d $out/Applications + ''; + }; +in +if stdenv.isDarwin +then darwinPkg +else linuxPkg diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 65caff82ead1..7bd582648937 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,46 +1,70 @@ { stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: -stdenv.mkDerivation rec{ - - name = "geogebra-${version}"; - version = "6-0-600-0"; - - src = fetchurl { - urls = [ - "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20200904093945/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - ]; - sha256 = "1l49rvfkil2cz6r7sa2mi0p6hvb6p66jv3x6xj8hjqls4l3sfhkm"; - }; - - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ - unzip - makeWrapper - ]; - - unpackPhase = '' - unzip $src - ''; - - installPhase = '' - mkdir -p $out/libexec/geogebra/ $out/bin - cp -r GeoGebra-linux-x64/{resources,locales} "$out/" - makeWrapper ${stdenv.lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" - install -Dm644 "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - - install -Dm644 "${srcIcon}" \ - "$out/share/icons/hicolor/scalable/apps/geogebra.svg" - ''; +let + pname = "geogebra"; + version = "6-0-609-0"; srcIcon = geogebra.srcIcon; - desktopItem = geogebra.desktopItem; + meta = with stdenv.lib; geogebra.meta // { license = licenses.geogebra; maintainers = with maintainers; [ voidless ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; -} + + linuxPkg = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl { + urls = [ + "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20201022200156/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + ]; + sha256 = "0rzcbq587x8827g9v03awa9hz27vyfjc0cz45ymbchqp31lsx49b"; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ + unzip + makeWrapper + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/libexec/geogebra/ $out/bin + cp -r GeoGebra-linux-x64/{resources,locales} "$out/" + makeWrapper ${stdenv.lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" + install -Dm644 "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + + install -Dm644 "${srcIcon}" \ + "$out/share/icons/hicolor/scalable/apps/geogebra.svg" + ''; + }; + + darwinPkg = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl { + url = "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"; + sha256 = "0275869zgwbl1qjj593q6629hnxbwk9c15rkm29a3lh10pinb099"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + install -dm755 $out/Applications + unzip $src -d $out/Applications + ''; + }; +in +if stdenv.isDarwin +then darwinPkg +else linuxPkg From 0075ec3ffab4bcb5e7e0a4ee5ad4fb46cec83054 Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Sat, 24 Oct 2020 08:23:20 +0900 Subject: [PATCH 028/294] nuspell: 3.1.2 -> 4.0.0, fix license The license of Nuspell is not GPL-3.0-only but LGPL-3.0-or-later. Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com> --- pkgs/development/libraries/nuspell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 7de16c7c1199..c8cb7734e90c 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.1.2"; + version = "4.0.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "0wbb6dwmzlsyy224y0liis0azgzwbjdvcyzc31pw1aw6vbp36na6"; + sha256 = "1jfnwva2i67i9pyh123a5h2zs5p7gw77qh4w7qkx61jigsyxc5v7"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; maintainers = with maintainers; [ fpletz ]; - license = licenses.gpl3; + license = licenses.lgpl3Plus; }; } From c3144b8f6ff15fc265b61766444f2ff31cecdd10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 24 Oct 2020 08:00:06 +0200 Subject: [PATCH 029/294] sentencepiece: 0.1.93 -> 0.1.94 Changelog: https://github.com/google/sentencepiece/releases/tag/v0.1.94 --- pkgs/development/libraries/sentencepiece/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 9b699035bf9f..e918a3b3d1d2 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.93"; + version = "0.1.94"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0h9c1xs0sab23labh8m3ar6kvzfldv2id2f17icja61ihyw06nrd"; + sha256 = "sha256:11cqw4hx33gw2jmrg11jyp7fj9pwzwjwzqcn24jfsbgh6n8gks5x"; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; From ab0faef05f2d7fa64e048d70bea0f5c8b70e747b Mon Sep 17 00:00:00 2001 From: Maxwell L-T Date: Sun, 25 Oct 2020 13:23:50 -0400 Subject: [PATCH 030/294] mullvad-vpn: 2020.5 -> 2020.6 --- pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index aa7aaab29ac2..52adbca18b17 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2020.5"; + version = "2020.6"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "131z6qlpjwxcn5a62f1f147f2z1xg185jmr0vbin8h0dwa1182vn"; + sha256 = "0d9rv874avx86jppl1dky0nfq1633as0z8yz3h3f69nhmcbwhlr3"; }; nativeBuildInputs = [ From 835ba5b069433facbe40661160d56b34dc012212 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 19:38:14 +0000 Subject: [PATCH 031/294] liquibase: 4.0.0 -> 4.1.1 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 75ccca43a690..93698e8d8e97 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "06wpvqyv7w749l3ndvzg1p774rv1apbmbpwbdlad57pih4nqa7mm"; + sha256 = "0gq3y2cgqb1dky5baqjydwmnaimczvsfg8dqc55c7aqcgy7hp3pg"; }; buildInputs = [ jre makeWrapper ]; From 03206f88e57f9cc712f617fbdd1104d5794a2047 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 20:04:47 +0000 Subject: [PATCH 032/294] lynis: 3.0.0 -> 3.0.1 --- pkgs/tools/security/lynis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index d7f42479d0b4..9bbbc455b9b3 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "05p8h2ww4jcc6lgxrm796cbvlfmw26rxq5fmw0xxavbpadiw752j"; + sha256 = "0lsb455rimr1cjxqcgy819xjxf1faas8wlx2x0pxhn5yha9w9sfs"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 1f89f78553c2669f4ad9a9aa58ebdb52272b532f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 23:40:03 +0000 Subject: [PATCH 033/294] obs-studio: 26.0.0 -> 26.0.2 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index c8d70c72fbac..0d0fce279bbd 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -39,13 +39,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "26.0.0"; + version = "26.0.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "09y57b3c88szl3wyx3cxq8jrm3pfnyg2n25hxl1ynkq3rgaavdq2"; + sha256 = "1d502f80whh686mvq0yn6zpa5nvmnlzxwp5sjz43vpbbvhpbrdqj"; }; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; From 5ef636ef93195952d7b457e331b55c7f571494f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Oct 2020 01:39:23 +0000 Subject: [PATCH 034/294] opustags: 1.3.0 -> 1.4.0 --- pkgs/applications/audio/opustags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index eb056c720d1f..8e5546aec8b6 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, cmake, pkgconfig, libogg, fetchFromGitHub, libiconv }: stdenv.mkDerivation rec { pname = "opustags"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; rev = version; - sha256 = "09z0cdg20algaj2yyhfz3hxh1biwjjvzx1pc2vdc64n8lkswqsc1"; + sha256 = "1y0czl72paawy342ff9ickaamkih43k59yfcdw7bnddypyfa7nbg"; }; buildInputs = [ libogg ]; From f6136d06ffed9e21879ddd7bd156275de011c447 Mon Sep 17 00:00:00 2001 From: Ivan Tham Date: Mon, 26 Oct 2020 10:45:22 +0800 Subject: [PATCH 035/294] fontdir: add ttc to font regex .ttc fonts are used by noto-fonts-cjk --- nixos/modules/config/fonts/fontdir.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index 264d73ebafa5..c4bd3a077d33 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -8,7 +8,7 @@ let x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } '' mkdir -p "$out/share/X11/fonts" - font_regexp='.*\.\(ttf\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?' + font_regexp='.*\.\(ttf\|ttc\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?' find ${toString config.fonts.fonts} -regex "$font_regexp" \ -exec ln -sf -t "$out/share/X11/fonts" '{}' \; cd "$out/share/X11/fonts" From 7661b5541760e3debca5c538174d05b7e975ab99 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sun, 25 Oct 2020 23:51:02 -0700 Subject: [PATCH 036/294] k3s: add modprobe to k3s's PATH Otherwise we get warnings like 'level=warning msg="failed to start br_netfilter module"' in k3s's logs. Adding modprobe to k3s's PATH fixes the warning at least. I'm not certain if it fixes any real issue or not. --- pkgs/applications/networking/cluster/k3s/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index ca0da973f2c6..ae98fbbcc2dc 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -9,6 +9,7 @@ , buildGoPackage , git , runc +, kmod , libseccomp , pkgconfig , ethtool @@ -226,6 +227,7 @@ stdenv.mkDerivation rec { # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 # Note the list in that issue is stale and some aren't relevant for k3s. k3sRuntimeDeps = [ + kmod socat iptables iproute From c9a6cd0a30f23e9c41b0930e8312f66253c808ec Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 26 Oct 2020 12:08:42 +0200 Subject: [PATCH 037/294] libsForQt5.qtutilities: 6.0.6 -> 6.3.0 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 388665f5aabd..916e381ab4da 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.0.6"; + version = "6.3.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0g3f18530w5f8dlzrh45k868hspga5p3m8qpz7pcg3nsdjda8cwz"; + sha256 = "sha256-vHx2JMPqioY8jUpBOIFdhhN1mIUV3LS8ayQOo3g7bY0="; }; buildInputs = [ qtbase cpp-utilities ]; From a5ca6e8e843ddb5212b6e28c63bb4ebbcfc33932 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 26 Oct 2020 12:10:40 +0200 Subject: [PATCH 038/294] syncthingtray: 0.11.0 -> 1.0.0 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index c45ea27c425e..bb4b3ac90ce1 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.11.0"; + version = "1.0.0"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "1lpjrij6y8l738hd7bfig0piglqinnqbadidzw9k0nm53bh4pqrr"; + sha256 = "sha256-mB23UOUrOfEmbFfVsAXyi3iod0NAfp/sl7Gkklqfmbo="; }; buildInputs = [ qtbase cpp-utilities qtutilities ] From 1829a89f844eb3cce64f761e31896d965e178c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 26 Oct 2020 11:29:28 +0100 Subject: [PATCH 039/294] raspberrypifw: 1.20200902 -> 1.20201022 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 6036eff2d984..70bcaa15d96e 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raspberrypi-firmware"; - version = "1.20200902"; + version = "1.20201022"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "1dj5vyhz2ljka7hwhl6s14hd017fspix1xp7zbm7lzdyys9jb9ni"; + sha256 = "0j5m50cmmr11m3h8kk89j1pqkdqr7mzdzg04ayiqvfhvy32qqlg8"; }; installPhase = '' From 722c94310c7a839beb5ec4074a685769a4f77565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 26 Oct 2020 13:58:41 +0100 Subject: [PATCH 040/294] asterisk: Bump all packages --- pkgs/servers/asterisk/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index b0e7d6aec56c..2cf40f3d026b 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -104,8 +104,8 @@ in rec { asterisk = asterisk_17; asterisk_13 = common { - version = "13.36.0"; - sha256 = "1p41xrxmzpqmjgvrl7f4vbigiqpmg60fd8bqg5rxbf4lxzpvknnp"; + version = "13.37.0"; + sha256 = "09wc6cqh4f15wm62drzdppwvh7nwgnbwapvz1kgb0qdgixsshn3v"; externals = { "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "addons/mp3" = mp3-202; @@ -113,8 +113,8 @@ in rec { }; asterisk_16 = common { - version = "16.13.0"; - sha256 = "01nja8hd6jk1966awc2vcz3hl46pvhi797k515q87vzmap1khlp9"; + version = "16.14.0"; + sha256 = "1y120p4jlhg4iwihdxlk64y3y3n8w7y785lwqxsyqg6zviz0ghx6"; externals = { "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "addons/mp3" = mp3-202; @@ -122,8 +122,8 @@ in rec { }; asterisk_17 = common { - version = "17.7.0"; - sha256 = "0lsglrh3l823200rmkay3pgy42k0fsij610s3s4vd3zv4jjb1g0s"; + version = "17.8.0"; + sha256 = "0xhwh8s8n8xg43gcdkqjj484assva7lm5ah1b306a5nf6j8p9bjy"; externals = { "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "addons/mp3" = mp3-202; From 4deb3a51df0701551e6ede217a1b0417d5113250 Mon Sep 17 00:00:00 2001 From: elseym Date: Mon, 26 Oct 2020 18:59:52 +0100 Subject: [PATCH 041/294] plex: 1.20.2.3402 -> 1.20.3.3483 --- pkgs/servers/plex/raw.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index c816f314863a..f06b0a486985 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.20.2.3402-0fec14d92"; + version = "1.20.3.3483-211702a9f"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0vylajkk6424cnxx4kg0yl53pg6w271pp71zgg1f4p2nhkbxd91c"; + sha256 = "0b05mxmvjn2sr0aqy8s2c41gz0vlpmwjwx42jpqddk3qzidvwkbd"; }; outputs = [ "out" "basedb" ]; From d2cd0230ee2851eff8d84a80ff0fed2d261a6cc3 Mon Sep 17 00:00:00 2001 From: Scriptkiddi Date: Tue, 27 Oct 2020 12:20:51 +0100 Subject: [PATCH 042/294] gif-for-cli: unstable-2018-08-14 -> 1.1.2 --- pkgs/tools/misc/gif-for-cli/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index fed22e518937..52d3e043ce9c 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, python3Packages, ffmpeg_3, zlib, libjpeg }: +{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: python3Packages.buildPythonApplication { pname = "gif-for-cli"; - version = "unstable-2018-08-14"; + version = "1.1.2"; src = fetchFromGitHub { owner = "google"; repo = "gif-for-cli"; - rev = "9696f25fea2e38499b7c248a3151030c3c68bb00"; - sha256 = "1rj8wjfsabn27k1ds7a5fdqgf2r28zpz4lvhbzssjfj1yf0mfh7s"; + rev = "31f8aa2d617d6d6e941154f60e287c38dd9a74d5"; + sha256 = "Bl5o492BUAn1KsscnlMIXCzJuy7xWUsdnxIKZKaRM3M="; }; checkInputs = [ python3Packages.coverage ]; - buildInputs = [ ffmpeg_3 zlib libjpeg ]; - propagatedBuildInputs = with python3Packages; [ pillow requests x256 ]; + buildInputs = [ zlib libjpeg ]; + propagatedBuildInputs = with python3Packages; [ ffmpeg pillow requests x256 ]; meta = with stdenv.lib; { description = "Render gifs as ASCII art in your cli"; From 922af1cd2d11715433b58dd06f66dabecd418d17 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 27 Oct 2020 13:51:04 +0100 Subject: [PATCH 043/294] python3Packages.trezor: make udev rules dependency linux-only --- pkgs/development/python-modules/trezor/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 0e0c6da021fb..bb85ca6b6f3c 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchPypi , isPy3k @@ -49,6 +50,7 @@ buildPythonPackage rec { rlp shamir-mnemonic typing-extensions + ] ++ lib.optionals stdenv.isLinux [ trezor-udev-rules ]; From 2e2eea4338ddf0cdb1bd588420c738f32942267e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 27 Oct 2020 14:48:35 +0100 Subject: [PATCH 044/294] matrix-synapse: 1.21.2 -> 1.22.0 https://github.com/matrix-org/synapse/releases/tag/v1.22.0 --- pkgs/servers/matrix-synapse/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f18c6f83ffc9..4aff60587065 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.21.2"; + version = "1.22.0"; src = fetchPypi { inherit pname version; - sha256 = "061b2mpdzqxyks1kj3p7xmw8i4akqfd2s9vb7v8w27k2qpcw7528"; + sha256 = "0dl4a5zirrjabbfibl9vj4zb16md11kqkz2v9l299gxbwwvzqc39"; }; patches = [ @@ -53,6 +53,7 @@ buildPythonApplication rec { typing-extensions authlib pyjwt + hiredis ] ++ lib.optional enableSystemd systemd; checkInputs = [ mock parameterized openssl ]; From 74504e85270c6a803ccd6004b6beea8b1b09a915 Mon Sep 17 00:00:00 2001 From: Jonathan Strickland Date: Tue, 20 Oct 2020 23:03:38 -0400 Subject: [PATCH 045/294] maintainers: add djanatyn --- maintainers/maintainer-list.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c0b1ae06abe5..5b06fe102f6f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1303,10 +1303,12 @@ name = "Vladimir Serov"; keys = [ # compare with https://keybase.io/cab404 - { longkeyid = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; + { + longkeyid = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; fingerprint = "rsa3072/0xCBDECF658C38079E"; } - { longkeyid = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; + { + longkeyid = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; fingerprint = "ed25519/0xB7EFFC271D55DB8A"; } ]; @@ -1431,10 +1433,12 @@ githubId = 2054509; name = "Constantine Evans"; keys = [ - { longkeyid = "rsa4096/0xB67DB1D20A93A9F9"; + { + longkeyid = "rsa4096/0xB67DB1D20A93A9F9"; fingerprint = "32B1 6EE7 DBA5 16DE 526E 4C5A B67D B1D2 0A93 A9F9"; } - { longkeyid = "rsa4096/0x1A1D58B86AE2AABD"; + { + longkeyid = "rsa4096/0x1A1D58B86AE2AABD"; fingerprint = "669C 1D24 5A87 DB34 6BE4 3216 1A1D 58B8 6AE2 AABD"; } ]; @@ -4373,7 +4377,7 @@ name = "Jeff Zellner"; }; kaction = { - name = "Dmitry Bogatov"; + name = "Dmitry Bogatov"; email = "KAction@disroot.org"; github = "kaction"; githubId = 44864956; @@ -7006,7 +7010,7 @@ purcell = { email = "steve@sanityinc.com"; github = "purcell"; - githubId = 5636; + githubId = 5636; name = "Steve Purcell"; }; puzzlewolf = { @@ -7275,10 +7279,12 @@ github = "rissson"; githubId = 18313093; keys = [ - { longkeyid = "rsa4096/0xF6FD87B15C263EC9"; + { + longkeyid = "rsa4096/0xF6FD87B15C263EC9"; fingerprint = "8A0E 6A7C 08AB B9DE 67DE 2A13 F6FD 87B1 5C26 3EC9"; } - { longkeyid = "ed25519/0xBBB7A6801DF1E03F"; + { + longkeyid = "ed25519/0xBBB7A6801DF1E03F"; fingerprint = "C0A7 A9BB 115B C857 4D75 EA99 BBB7 A680 1DF1 E03F"; } ]; @@ -9749,7 +9755,7 @@ name = "Asad Saeeduddin"; }; ngerstle = { - name = "Nicholas Gerstle"; + name = "Nicholas Gerstle"; email = "ngerstle@gmail.com"; github = "ngerstle"; githubId = 1023752; From c84ddc7bf448039a12757cb5cb18296662ab2ed3 Mon Sep 17 00:00:00 2001 From: Jonathan Strickland Date: Tue, 20 Oct 2020 21:56:08 -0400 Subject: [PATCH 046/294] peaclock: init at 0.4.3 Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com> --- pkgs/applications/misc/peaclock/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/peaclock/default.nix diff --git a/pkgs/applications/misc/peaclock/default.nix b/pkgs/applications/misc/peaclock/default.nix new file mode 100644 index 000000000000..e824bbaf583b --- /dev/null +++ b/pkgs/applications/misc/peaclock/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, libpthreadstubs, icu }: + +stdenv.mkDerivation rec { + pname = "peaclock"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "octobanana"; + repo = pname; + rev = version; + sha256 = "1582vgslhpgbvcd7ipgf1d1razrvgpq1f93q069yr2bbk6xn8i16"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libpthreadstubs icu ]; + + meta = with stdenv.lib; { + description = "A clock, timer, and stopwatch for the terminal"; + homepage = "https://octobanana.com/software/peaclock"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7997136ffb2a..0d369617ec76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22755,6 +22755,10 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; + peaclock = callPackage ../applications/misc/peaclock { + stdenv = gccStdenv; + }; + peek = callPackage ../applications/video/peek { }; pflask = callPackage ../os-specific/linux/pflask {}; From b016ae02e6f5b3ed76c043d65da6deec1b89d801 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Thu, 8 Oct 2020 15:02:07 -0500 Subject: [PATCH 047/294] hostctl: init at 1.0.14 --- pkgs/tools/system/hostctl/default.nix | 36 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/system/hostctl/default.nix diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/tools/system/hostctl/default.nix new file mode 100644 index 000000000000..6f557e05cd12 --- /dev/null +++ b/pkgs/tools/system/hostctl/default.nix @@ -0,0 +1,36 @@ +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: + +buildGoModule rec { + pname = "hostctl"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "guumaster"; + repo = pname; + rev = "v${version}"; + sha256 = "02bjii97l4fy43v2rb93m9b0ad8y6mjvbvp4sz6a5n0w9dm1z1q9"; + }; + + vendorSha256 = "1lqk3cda0frqp2vwkqa4b3xkdw814wgkbr7g9r2mwxn85fpdcq5c"; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd hostctl \ + --bash <($out/bin/hostctl completion bash) \ + --zsh <($out/bin/hostctl completion zsh) + ''; + + meta = with lib; { + description = "Your dev tool to manage /etc/hosts like a pro!"; + longDescription = '' + This tool gives you more control over the use of your hosts file. + You can have multiple profiles and switch them on/off as you need. + ''; + homepage = "https://guumaster.github.io/hostctl/"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12b0bc0a578d..7b360ab48f1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1108,6 +1108,8 @@ in hime = callPackage ../tools/inputmethods/hime {}; + hostctl = callPackage ../tools/system/hostctl { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; From 91b55655edf763da49e90a837a14ef8fee7b6812 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 27 Oct 2020 20:05:34 +0100 Subject: [PATCH 048/294] nginxMainline: 1.19.3 -> 1.19.4 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 934506c45ca9..7b7de1a00f4a 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.3"; - sha256 = "1w4dkq7bl5gyix3x0ap3d9lndh7zyvc3mscl693d4ybql57vgrci"; + version = "1.19.4"; + sha256 = "03h0hhrbfy3asla9gki2cp97zjn7idxbp5lk9xi0snlh4xlm9pv1"; } From c8147bd56c4c594508f632f9cfb40cba689aea99 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Oct 2020 00:24:36 +0000 Subject: [PATCH 049/294] you-get: 0.4.1456 -> 0.4.1475 --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 8314dc2c9a35..155081db36a1 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1456"; + version = "0.4.1475"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "14miw5gmj571584rmdzjxf88icmb1psrsfbwpabn8blz8l5aq6bv"; + sha256 = "432c04170bb5f4881ca6af9c802b6c90e81759811487b8d7918762dcd674697f"; }; meta = with stdenv.lib; { From 8d1c9bcdf9749cb3205926153cd21c45a7a3f90c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 28 Oct 2020 04:20:00 +0000 Subject: [PATCH 050/294] archiver: 3.3.2 -> 3.4.0 https://github.com/mholt/archiver/releases/tag/v3.4.0 --- pkgs/applications/misc/archiver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index fed1dc48470e..aec0b9d51186 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "archiver"; - version = "3.3.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "1fi86g27c660g3mv9c5rfm0mmvh5q08704c19xnvrpwlg65glqrz"; + sha256 = "16jawybywqfkp68035bnf206a2w4khjw239saa429a21lxrfyk4a"; }; - vendorSha256 = "1rqhra3rfarq8f750zszkrm0jcsxa4sjbfpmcdlj5z000df699zq"; + vendorSha256 = "0m89ibj3dm58j49d99dhkn0ryivnianxz7lkpkvhs0cdbzzc02az"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; From 2bb3a9da24ca60d9f5bed69f679a1ec50dbdf997 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Oct 2020 22:38:58 -0300 Subject: [PATCH 051/294] A directory-category for terminal emulators This is a mostly cosmetical commit, in the sense it doesn't change the contents of any package, but reorganizes the overall Nixpkgs expressions. Terminal emulators are an ubiquitous tool for any Unix user; even the beginners are routinely familiarized to it. And, manifestly, there are many implementations of terminal emulators out there, from those traditionally made in C and C++ to those written in Haskell and Go. Terminal emulators deserve more highlight. This commit does that by creating a category for them. --- doc/contributing/coding-conventions.xml | 10 +++ .../alacritty/default.nix | 0 .../aminal/default.nix | 0 .../cool-retro-term/default.nix | 0 .../eterm/default.nix | 0 .../evilvte/default.nix | 0 .../foot/default.nix | 0 .../guake/default.nix | 0 .../havoc/default.nix | 0 .../hyper/default.nix | 0 .../iterm2/default.nix | 0 .../iterm2/disable_updates.patch | 0 .../kitty/default.nix | 0 .../kitty/fix-paths.patch | 0 .../lilyterm/default.nix | 0 .../lxterminal/default.nix | 0 .../respect-xml-catalog-files-var.patch | 0 .../microcom/default.nix | 0 .../mlterm/default.nix | 0 .../mrxvt/default.nix | 0 .../nimmm/default.nix | 0 .../roxterm/default.nix | 0 .../rxvt-unicode-plugins/default.nix | 0 .../default.nix | 0 .../urxvt-bidi/default.nix | 0 .../urxvt-font-size/default.nix | 0 .../urxvt-perl/default.nix | 0 .../urxvt-perls/default.nix | 0 .../urxvt-resize-font/default.nix | 0 .../urxvt-tabbedex/default.nix | 0 .../urxvt-theme-switch/default.nix | 0 .../urxvt-vtwheel/default.nix | 0 .../rxvt-unicode/default.nix | 0 .../patches/256-color-resources.patch | 0 .../patches/9.06-font-width.patch | 0 .../rxvt-unicode/patches/makefile-phony.patch | 0 .../rxvt-unicode/wrapper.nix | 0 .../rxvt/default.nix | 0 .../sakura/default.nix | 0 .../st/default.nix | 0 .../{misc => terminal-emulators}/st/xst.nix | 0 .../stupidterm/default.nix | 0 .../terminator/default.nix | 0 .../terminus/default.nix | 0 .../termite/add_errno_header.patch | 0 .../termite/default.nix | 0 .../termite/remove_ldflags_macos.patch | 0 .../termite/url_regexp_trailing.patch | 0 .../termite/wrapper.nix | 0 .../termonad/default.nix | 0 .../tilda/default.nix | 0 .../tilix/default.nix | 0 .../wayst/default.nix | 0 .../wayst/utf8proc.patch | 0 .../x3270/default.nix | 0 .../xterm/default.nix | 0 .../xterm/sixel-256.support.patch | 0 .../xtermcontrol/default.nix | 0 .../yaft/default.nix | 0 pkgs/top-level/all-packages.nix | 76 +++++++++---------- 60 files changed, 48 insertions(+), 38 deletions(-) rename pkgs/applications/{misc => terminal-emulators}/alacritty/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/aminal/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/cool-retro-term/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/eterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/evilvte/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/foot/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/guake/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/havoc/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/hyper/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/iterm2/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/iterm2/disable_updates.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/kitty/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/kitty/fix-paths.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/lilyterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/lxterminal/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/lxterminal/respect-xml-catalog-files-var.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/microcom/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/mlterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/mrxvt/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/nimmm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/roxterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-bidi/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-font-size/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-perl/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-perls/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-resize-font/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-tabbedex/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-theme-switch/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-vtwheel/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/patches/256-color-resources.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/patches/9.06-font-width.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/patches/makefile-phony.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/wrapper.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/sakura/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/st/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/st/xst.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/stupidterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/terminator/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/terminus/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/termite/add_errno_header.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/termite/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/termite/remove_ldflags_macos.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/termite/url_regexp_trailing.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/termite/wrapper.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/termonad/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/tilda/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/tilix/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/wayst/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/wayst/utf8proc.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/x3270/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/xterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/xterm/sixel-256.support.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/xtermcontrol/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/yaft/default.nix (100%) diff --git a/doc/contributing/coding-conventions.xml b/doc/contributing/coding-conventions.xml index fcb6501f6159..e587275a6383 100644 --- a/doc/contributing/coding-conventions.xml +++ b/doc/contributing/coding-conventions.xml @@ -522,6 +522,16 @@ args.stdenv.mkDerivation (args // { + + + If it’s a terminal emulator: + + + + applications/terminal-emulators (e.g. alacritty or rxvt or termite) + + + If it’s for video playback / editing: diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix similarity index 100% rename from pkgs/applications/misc/alacritty/default.nix rename to pkgs/applications/terminal-emulators/alacritty/default.nix diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/terminal-emulators/aminal/default.nix similarity index 100% rename from pkgs/applications/misc/aminal/default.nix rename to pkgs/applications/terminal-emulators/aminal/default.nix diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix similarity index 100% rename from pkgs/applications/misc/cool-retro-term/default.nix rename to pkgs/applications/terminal-emulators/cool-retro-term/default.nix diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix similarity index 100% rename from pkgs/applications/misc/eterm/default.nix rename to pkgs/applications/terminal-emulators/eterm/default.nix diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix similarity index 100% rename from pkgs/applications/misc/evilvte/default.nix rename to pkgs/applications/terminal-emulators/evilvte/default.nix diff --git a/pkgs/applications/misc/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix similarity index 100% rename from pkgs/applications/misc/foot/default.nix rename to pkgs/applications/terminal-emulators/foot/default.nix diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix similarity index 100% rename from pkgs/applications/misc/guake/default.nix rename to pkgs/applications/terminal-emulators/guake/default.nix diff --git a/pkgs/applications/misc/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix similarity index 100% rename from pkgs/applications/misc/havoc/default.nix rename to pkgs/applications/terminal-emulators/havoc/default.nix diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix similarity index 100% rename from pkgs/applications/misc/hyper/default.nix rename to pkgs/applications/terminal-emulators/hyper/default.nix diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix similarity index 100% rename from pkgs/applications/misc/iterm2/default.nix rename to pkgs/applications/terminal-emulators/iterm2/default.nix diff --git a/pkgs/applications/misc/iterm2/disable_updates.patch b/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch similarity index 100% rename from pkgs/applications/misc/iterm2/disable_updates.patch rename to pkgs/applications/terminal-emulators/iterm2/disable_updates.patch diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix similarity index 100% rename from pkgs/applications/misc/kitty/default.nix rename to pkgs/applications/terminal-emulators/kitty/default.nix diff --git a/pkgs/applications/misc/kitty/fix-paths.patch b/pkgs/applications/terminal-emulators/kitty/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/kitty/fix-paths.patch rename to pkgs/applications/terminal-emulators/kitty/fix-paths.patch diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/terminal-emulators/lilyterm/default.nix similarity index 100% rename from pkgs/applications/misc/lilyterm/default.nix rename to pkgs/applications/terminal-emulators/lilyterm/default.nix diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix similarity index 100% rename from pkgs/applications/misc/lxterminal/default.nix rename to pkgs/applications/terminal-emulators/lxterminal/default.nix diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch rename to pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch diff --git a/pkgs/applications/misc/microcom/default.nix b/pkgs/applications/terminal-emulators/microcom/default.nix similarity index 100% rename from pkgs/applications/misc/microcom/default.nix rename to pkgs/applications/terminal-emulators/microcom/default.nix diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix similarity index 100% rename from pkgs/applications/misc/mlterm/default.nix rename to pkgs/applications/terminal-emulators/mlterm/default.nix diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix similarity index 100% rename from pkgs/applications/misc/mrxvt/default.nix rename to pkgs/applications/terminal-emulators/mrxvt/default.nix diff --git a/pkgs/applications/misc/nimmm/default.nix b/pkgs/applications/terminal-emulators/nimmm/default.nix similarity index 100% rename from pkgs/applications/misc/nimmm/default.nix rename to pkgs/applications/terminal-emulators/nimmm/default.nix diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix similarity index 100% rename from pkgs/applications/misc/roxterm/default.nix rename to pkgs/applications/terminal-emulators/roxterm/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch similarity index 100% rename from pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch rename to pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch diff --git a/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch similarity index 100% rename from pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch rename to pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch diff --git a/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch similarity index 100% rename from pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch rename to pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch diff --git a/pkgs/applications/misc/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode/wrapper.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt/default.nix rename to pkgs/applications/terminal-emulators/rxvt/default.nix diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix similarity index 100% rename from pkgs/applications/misc/sakura/default.nix rename to pkgs/applications/terminal-emulators/sakura/default.nix diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix similarity index 100% rename from pkgs/applications/misc/st/default.nix rename to pkgs/applications/terminal-emulators/st/default.nix diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix similarity index 100% rename from pkgs/applications/misc/st/xst.nix rename to pkgs/applications/terminal-emulators/st/xst.nix diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix similarity index 100% rename from pkgs/applications/misc/stupidterm/default.nix rename to pkgs/applications/terminal-emulators/stupidterm/default.nix diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix similarity index 100% rename from pkgs/applications/misc/terminator/default.nix rename to pkgs/applications/terminal-emulators/terminator/default.nix diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/terminal-emulators/terminus/default.nix similarity index 100% rename from pkgs/applications/misc/terminus/default.nix rename to pkgs/applications/terminal-emulators/terminus/default.nix diff --git a/pkgs/applications/misc/termite/add_errno_header.patch b/pkgs/applications/terminal-emulators/termite/add_errno_header.patch similarity index 100% rename from pkgs/applications/misc/termite/add_errno_header.patch rename to pkgs/applications/terminal-emulators/termite/add_errno_header.patch diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix similarity index 100% rename from pkgs/applications/misc/termite/default.nix rename to pkgs/applications/terminal-emulators/termite/default.nix diff --git a/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch similarity index 100% rename from pkgs/applications/misc/termite/remove_ldflags_macos.patch rename to pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch diff --git a/pkgs/applications/misc/termite/url_regexp_trailing.patch b/pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch similarity index 100% rename from pkgs/applications/misc/termite/url_regexp_trailing.patch rename to pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch diff --git a/pkgs/applications/misc/termite/wrapper.nix b/pkgs/applications/terminal-emulators/termite/wrapper.nix similarity index 100% rename from pkgs/applications/misc/termite/wrapper.nix rename to pkgs/applications/terminal-emulators/termite/wrapper.nix diff --git a/pkgs/applications/misc/termonad/default.nix b/pkgs/applications/terminal-emulators/termonad/default.nix similarity index 100% rename from pkgs/applications/misc/termonad/default.nix rename to pkgs/applications/terminal-emulators/termonad/default.nix diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/terminal-emulators/tilda/default.nix similarity index 100% rename from pkgs/applications/misc/tilda/default.nix rename to pkgs/applications/terminal-emulators/tilda/default.nix diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix similarity index 100% rename from pkgs/applications/misc/tilix/default.nix rename to pkgs/applications/terminal-emulators/tilix/default.nix diff --git a/pkgs/applications/misc/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix similarity index 100% rename from pkgs/applications/misc/wayst/default.nix rename to pkgs/applications/terminal-emulators/wayst/default.nix diff --git a/pkgs/applications/misc/wayst/utf8proc.patch b/pkgs/applications/terminal-emulators/wayst/utf8proc.patch similarity index 100% rename from pkgs/applications/misc/wayst/utf8proc.patch rename to pkgs/applications/terminal-emulators/wayst/utf8proc.patch diff --git a/pkgs/applications/misc/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix similarity index 100% rename from pkgs/applications/misc/x3270/default.nix rename to pkgs/applications/terminal-emulators/x3270/default.nix diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix similarity index 100% rename from pkgs/applications/misc/xterm/default.nix rename to pkgs/applications/terminal-emulators/xterm/default.nix diff --git a/pkgs/applications/misc/xterm/sixel-256.support.patch b/pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch similarity index 100% rename from pkgs/applications/misc/xterm/sixel-256.support.patch rename to pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/terminal-emulators/xtermcontrol/default.nix similarity index 100% rename from pkgs/applications/misc/xtermcontrol/default.nix rename to pkgs/applications/terminal-emulators/xtermcontrol/default.nix diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/terminal-emulators/yaft/default.nix similarity index 100% rename from pkgs/applications/misc/yaft/default.nix rename to pkgs/applications/terminal-emulators/yaft/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a81c1fcf146..ad7eb42b128d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -669,7 +669,7 @@ in albert = libsForQt5.callPackage ../applications/misc/albert {}; - alacritty = callPackage ../applications/misc/alacritty { + alacritty = callPackage ../applications/terminal-emulators/alacritty { inherit (xorg) libXcursor libXxf86vm libXi; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; @@ -2976,7 +2976,7 @@ in cpcfs = callPackage ../tools/filesystems/cpcfs { }; - cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; + cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { }; coreutils-full = coreutils.override { minimal = false; }; @@ -3431,7 +3431,7 @@ in wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - wayst = callPackage ../applications/misc/wayst { }; + wayst = callPackage ../applications/terminal-emulators/wayst { }; wev = callPackage ../tools/misc/wev { }; @@ -5477,7 +5477,7 @@ in mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; - microcom = callPackage ../applications/misc/microcom { }; + microcom = callPackage ../applications/terminal-emulators/microcom { }; microserver = callPackage ../servers/microserver { }; @@ -5830,7 +5830,7 @@ in nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; - nimmm = callPackage ../applications/misc/nimmm { }; + nimmm = callPackage ../applications/terminal-emulators/nimmm { }; nitrogen = callPackage ../tools/X11/nitrogen {}; @@ -7445,7 +7445,7 @@ in tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; - tilix = callPackage ../applications/misc/tilix { }; + tilix = callPackage ../applications/terminal-emulators/tilix { }; tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; @@ -8160,7 +8160,7 @@ in clipnotify = callPackage ../tools/misc/clipnotify { }; - x3270 = callPackage ../applications/misc/x3270 { }; + x3270 = callPackage ../applications/terminal-emulators/x3270 { }; xclip = callPackage ../tools/misc/xclip { }; @@ -8248,7 +8248,7 @@ in yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yaft = callPackage ../applications/misc/yaft { }; + yaft = callPackage ../applications/terminal-emulators/yaft { }; yarn = callPackage ../development/tools/yarn { }; @@ -20520,7 +20520,7 @@ in esniper = callPackage ../applications/networking/esniper { }; - eterm = callPackage ../applications/misc/eterm { }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; @@ -20528,7 +20528,7 @@ in etherape = callPackage ../applications/networking/sniffers/etherape { }; - evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); + evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; @@ -20634,7 +20634,7 @@ in foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; - foot = callPackage ../applications/misc/foot { }; + foot = callPackage ../applications/terminal-emulators/foot { }; fossil = callPackage ../applications/version-management/fossil { }; @@ -20927,7 +20927,7 @@ in gcalcli = callPackage ../applications/misc/gcalcli { }; - havoc = callPackage ../applications/misc/havoc { }; + havoc = callPackage ../applications/terminal-emulators/havoc { }; vcal = callPackage ../applications/misc/vcal { }; @@ -21146,7 +21146,7 @@ in gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { }; - guake = callPackage ../applications/misc/guake { }; + guake = callPackage ../applications/terminal-emulators/guake { }; guardian-agent = callPackage ../tools/networking/guardian-agent { }; @@ -21250,7 +21250,7 @@ in hydroxide = callPackage ../applications/networking/hydroxide { }; - hyper = callPackage ../applications/misc/hyper { }; + hyper = callPackage ../applications/terminal-emulators/hyper { }; hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { inherit (haskellPackages) ghcWithPackages; @@ -21695,7 +21695,7 @@ in ffmpeg = ffmpeg_2; }; - kitty = callPackage ../applications/misc/kitty { + kitty = callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; @@ -21929,7 +21929,7 @@ in jftui = callPackage ../applications/video/jftui { }; - lilyterm = callPackage ../applications/misc/lilyterm { + lilyterm = callPackage ../applications/terminal-emulators/lilyterm { inherit (gnome2) vte; gtk = gtk2; flavour = "stable"; @@ -22259,7 +22259,7 @@ in mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; - mrxvt = callPackage ../applications/misc/mrxvt { }; + mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; mtpaint = callPackage ../applications/graphics/mtpaint { }; @@ -23210,13 +23210,13 @@ in runc = callPackage ../applications/virtualization/runc {}; - rxvt = callPackage ../applications/misc/rxvt { }; + rxvt = callPackage ../applications/terminal-emulators/rxvt { }; - rxvt-unicode = callPackage ../applications/misc/rxvt-unicode/wrapper.nix { }; + rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; - rxvt-unicode-unwrapped = callPackage ../applications/misc/rxvt-unicode { }; + rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; - rxvt-unicode-plugins = import ../applications/misc/rxvt-unicode-plugins { inherit callPackage; }; + rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; }; uade123 = callPackage ../applications/audio/uade123 {}; @@ -23226,7 +23226,7 @@ in sacc = callPackage ../applications/networking/gopher/sacc { }; - sakura = callPackage ../applications/misc/sakura { }; + sakura = callPackage ../applications/terminal-emulators/sakura { }; sameboy = callPackage ../misc/emulators/sameboy { }; @@ -23324,7 +23324,7 @@ in ncurses = ncurses5; }; - stupidterm = callPackage ../applications/misc/stupidterm { + stupidterm = callPackage ../applications/terminal-emulators/stupidterm { gtk = gtk3; }; @@ -23338,13 +23338,13 @@ in sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; - st = callPackage ../applications/misc/st { + st = callPackage ../applications/terminal-emulators/st { conf = config.st.conf or null; patches = config.st.patches or []; extraLibs = config.st.extraLibs or []; }; - xst = callPackage ../applications/misc/st/xst.nix { }; + xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; stag = callPackage ../applications/misc/stag { curses = ncurses; @@ -23678,21 +23678,21 @@ in terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; - terminator = callPackage ../applications/misc/terminator { }; + terminator = callPackage ../applications/terminal-emulators/terminator { }; - terminus = callPackage ../applications/misc/terminus { }; + terminus = callPackage ../applications/terminal-emulators/terminus { }; tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; - lxterminal = callPackage ../applications/misc/lxterminal { }; + lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; - aminal = callPackage ../applications/misc/aminal { + aminal = callPackage ../applications/terminal-emulators/aminal { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; }; - termite-unwrapped = callPackage ../applications/misc/termite { }; + termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; }; + termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; termtosvg = callPackage ../tools/misc/termtosvg { }; @@ -23737,7 +23737,7 @@ in tig = gitAndTools.tig; - tilda = callPackage ../applications/misc/tilda { + tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; }; @@ -24590,16 +24590,16 @@ in xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { }; - xterm = callPackage ../applications/misc/xterm { }; + xterm = callPackage ../applications/terminal-emulators/xterm { }; - mlterm = callPackage ../applications/misc/mlterm { + mlterm = callPackage ../applications/terminal-emulators/mlterm { libssh2 = null; openssl = null; }; - roxterm = callPackage ../applications/misc/roxterm { }; + roxterm = callPackage ../applications/terminal-emulators/roxterm { }; - termonad-with-packages = callPackage ../applications/misc/termonad { + termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { inherit (haskellPackages) ghcWithPackages; }; @@ -28128,7 +28128,7 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - iterm2 = callPackage ../applications/misc/iterm2 {}; + iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; sccache = callPackage ../development/tools/misc/sccache { }; @@ -28193,7 +28193,7 @@ in houdini = callPackage ../applications/misc/houdini {}; - xtermcontrol = callPackage ../applications/misc/xtermcontrol {}; + xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {}; openfst = callPackage ../development/libraries/openfst {}; From c46b2a31bbe6eaa9876540c2c0292241d34be732 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 15 Oct 2020 11:18:25 +0200 Subject: [PATCH 052/294] electron: remove extra output from print-hashes script to make it more usable for automated update --- pkgs/development/tools/electron/print-hashes.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/print-hashes.sh index 45656a8f7b2b..de380fd52233 100755 --- a/pkgs/development/tools/electron/print-hashes.sh +++ b/pkgs/development/tools/electron/print-hashes.sh @@ -21,8 +21,8 @@ SYSTEMS=( hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)" -echo "Entry similar to the following goes in default.nix:" -echo +# Entry similar to the following goes in default.nix: + echo " electron_${VERSION%%.*} = mkElectron \"${VERSION}\" {" for S in "${!SYSTEMS[@]}"; do From c0743013169ac4fcf0c69ca711009b5b370f4fe8 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 2 Oct 2020 22:30:13 +0200 Subject: [PATCH 053/294] electron: 8.5.1 -> 8.5.2 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index c9df28e5cded..f3a066a87ad1 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -47,12 +47,12 @@ rec { aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; }; - electron_8 = mkElectron "8.5.1" { - x86_64-linux = "e58bf26ba52e43de77115b6e6844eba8a8cec2ac8aae500cf48fe862014202d9"; - x86_64-darwin = "cf0d42ecde7ca374ddf1b440aaaf441e16a02890112fcbffc03f37f8ec3b1958"; - i686-linux = "4c7ff6225b1ac4b710c454072d9fb8c04a66bb0353e7d6cffb89bcf6d4458d81"; - armv7l-linux = "13afd8b2e36eb8d1582687e16fac5394d6d3b9734d73f94d0d6ef843ba14cec2"; - aarch64-linux = "ff39e5e0e644cbf4ff1d29fc25e94b9eced7ea45d787d1b86fa4e50513336b7b"; + electron_8 = mkElectron "8.5.2" { + x86_64-linux = "c5b8c95b410436066b06165e9759b31336c907268339433db4f8610ccf644a51"; + x86_64-darwin = "079d951a28cfb7d1e0d3660e0fcb2dab85bd9e9f6848df5a06a7ac88ab3aa14c"; + i686-linux = "0d108ac2420a437100f7a8d06aa019cd8138da4372fb94039b6d23c6253a6aea"; + armv7l-linux = "f06ed475d1b206c3aa31e768add3517a64aabce5e2946e4d9707e615e6f398c0"; + aarch64-linux = "e9765584bbedad8a806f96ac1381c114a357fdbed8c67573decefde2d15d9cd7"; }; electron_9 = mkElectron "9.3.0" { From 2d3059624b1277898dd1a29afebc1381cb843bd5 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 2 Oct 2020 22:30:39 +0200 Subject: [PATCH 054/294] electron: 9.3.0 -> 9.3.3 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index f3a066a87ad1..373138902b42 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -55,12 +55,12 @@ rec { aarch64-linux = "e9765584bbedad8a806f96ac1381c114a357fdbed8c67573decefde2d15d9cd7"; }; - electron_9 = mkElectron "9.3.0" { - x86_64-linux = "0c34fa1dbf7708bd4a3f08fde50eafb9903b1c467104dca3e3ced5e7f764b302"; - x86_64-darwin = "25057470c2f3a1c40fa1c25086256041fa70419378fa3d41eeb805ebd3919b20"; - i686-linux = "ea09d10e496450d2d7bb7a37cab7124cc5484117dd7d7d6c4106586ff675d1d5"; - armv7l-linux = "a8b46d6c98546d605a02850c906408dc11104e8ee4366c3d8a956896fafdfcd3"; - aarch64-linux = "791d898d02e45975657ed15f2d83af31d5688e7db0075a6e20021db3420eb320"; + electron_9 = mkElectron "9.3.3" { + x86_64-linux = "17f4db5e040ea20ce89d1d492ac575ed0b9ba451ef9cb0e8cd50918505c85243"; + x86_64-darwin = "bb6188178ed1250ddaf29a2f232758c0f7878f1541ddb2ae2a0d20298599c7f4"; + i686-linux = "e413b0879247b32bfbcc114e8d49109267137b2ece97db13eaf0ce3ac6187881"; + armv7l-linux = "313abeb91efbc29d4f807a01937640580940a5fb2699c70b1c303b184ac7bec4"; + aarch64-linux = "263eb89ccb47920baef43898d373531d369d2adc8b2f9e5ebc6429fe44b2fd5a"; }; electron_10 = mkElectron "10.1.1" { From 0743d1591fee55aee74d98b1395b17e102dc98bc Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 2 Oct 2020 22:31:15 +0200 Subject: [PATCH 055/294] electron: 10.1.1 -> 10.1.5 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 373138902b42..1c024ee4e5b5 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -63,11 +63,11 @@ rec { aarch64-linux = "263eb89ccb47920baef43898d373531d369d2adc8b2f9e5ebc6429fe44b2fd5a"; }; - electron_10 = mkElectron "10.1.1" { - x86_64-linux = "4147e88bdbec6893bf9927f0d4f3dd090d26705f5b7f688223bc65253a8b0220"; - x86_64-darwin = "5b6814ae1064cc337efcdb2ad01ab9daa003a6a1d6e05d79288ede0a3665b991"; - i686-linux = "d29682b7ea44dcdca5e7265bd1e28046275295a9ac23982af3d216a7f47a7a57"; - armv7l-linux = "341a2eacb0381c1f409b8e28cf2c0fe6f75a61410614baf80309f51dd4201a34"; - aarch64-linux = "d5e5b069f3173ed89f4cca7e9723f28a5f7a720637b7addac02972c5db042b6c"; + electron_10 = mkElectron "10.1.5" { + x86_64-linux = "9db65dfe26d4fa9524b3005c6002d858ab256722cefb6a058de8e72e2d5c4083"; + x86_64-darwin = "30dc5d5a913c38c6ae7fa6913b1a907545f0230157efc066e2d5a7affd26cd1e"; + i686-linux = "bf8e1731e8b9b972c9054964b219d9b1b6baae9612afc8a5edf3503b815dd8c3"; + armv7l-linux = "e270eab1a87283d7ae25c8127d904a52f130d53cc399bd288af7f99563273f33"; + aarch64-linux = "03fa2418472f762377149fdd45d1e6ff0a324be3eb1b04e58c63d41df3dd0f16"; }; } From f29b4e60efa95f48a7aca7dacbc2c28c53f781a8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 28 Oct 2020 16:17:28 +0100 Subject: [PATCH 056/294] aptly: 1.3.0 -> 1.4.0 --- pkgs/tools/misc/aptly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 3c97c1684290..6af3238dbd77 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -2,14 +2,14 @@ let - version = "1.3.0"; + version = "1.4.0"; rev = "v${version}"; aptlySrc = fetchFromGitHub { inherit rev; owner = "aptly-dev"; repo = "aptly"; - sha256 = "032gw8qkxcgc0jyrvzqh7jkbmk4k0gf7j74hyhclfnjmd9548f5l"; + sha256 = "06cq761r3bxybb9xn58jii0ggp79mcp3810z1r2z3xcvplwhwnhy"; }; aptlyCompletionSrc = fetchFromGitHub { From c4f6310e753f8feb5e26420b98ac6f9d0f16480e Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 28 Oct 2020 16:18:41 +0100 Subject: [PATCH 057/294] grafana: 7.2.2 -> 7.3.0 https://github.com/grafana/grafana/releases/tag/v7.3.0 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c29c6cdf08f7..fe915e7adc0a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.2.2"; + version = "7.3.0"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "14i1h0v6bwb3y1xqs71dabriyd7gdgihb8wkf3gpjr4gnsywvsgm"; + sha256 = "0sxl06xaz474ir94ng0iak57qpcbh19hs3yjh1g44vf52k5cs70i"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "03jf5wnf89a3fawdayl5x5rfyc3dsf9wm5dm1ldz9fqk31biq8ky"; + sha256 = "1338x2sj11mzqqpb43dw2lxjpnv9q7zrwksyvj8ghjp4fad4pi9g"; }; - vendorSha256 = "03zvhznzdbi61kd0y0ldhx2n9zh3pwg1ias1shqgqyx46c9ysdzm"; + vendorSha256 = "0shaxm2y5i29rb0k5bfpcsxbw3ap913l1rb5qbr9hrx7l142dbx8"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ From 9ecd40908d2a8fb967b7f1bab573fac810229368 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Oct 2020 17:14:12 +0100 Subject: [PATCH 058/294] zsh-powerlevel10k: pin gitstatus version The required gitstatus version compatible with zsh-powerlevel10k has been pinned, as even though it is written by the same author, gitstatus has received updates which are not yet compatible with zsh-p10k. Fixes: #101946 --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 39cb1f247fcf..a978ac93a9b0 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -3,6 +3,20 @@ # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` +let + # match gitstatus version with given `gitstatus_version`: + # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info + gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec { + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "romkatv"; + repo = "gitstatus"; + rev = "v${version}"; + sha256 = "0xi5ab0rsj6xs4vqgn2j5rih1nncghr83yn395mk1is1f4bsmp0s"; + }; + }); +in stdenv.mkDerivation rec { pname = "powerlevel10k"; version = "1.13.0"; @@ -17,7 +31,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./gitstatusd.patch; - gitstatusdPath = "${pkgs.gitAndTools.gitstatus}/bin/gitstatusd"; + gitstatusdPath = "${gitstatus}/bin/gitstatusd"; }) ]; From 8880179b653648abce4208654695d9276e9fd036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Wed, 28 Oct 2020 13:03:22 -0300 Subject: [PATCH 059/294] libretro.mame2016: fix build with gnumake-4.3 Builds currently fail with `ar` trying to operate on what are clearly two paths concatenated together. It stems from a backward-incompatible change in Make: > Previously appending using '+=' to an empty variable would result in > a value starting with a space. Now the initial space is only added > if the variable already contains some value. Similarly, appending an > empty string does not add a trailing space. This issue was first reported on the MAME repository proper (https://github.com/mamedev/mame/issues/6248), and affects libretro's 2016 snapshot as well. A fix that is reported to work with previous versions of Make was upstreamed to: - GENie, the build system: https://github.com/bkaradzic/GENie/pull/493 - MAME: https://github.com/mamedev/mame/pull/6262 - libretro: https://github.com/libretro/mame2016-libretro/pull/47 The fetched patch comes from the last of these. --- pkgs/misc/emulators/retroarch/cores.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 17b1679ed5ba..2b9cb5e6d27e 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch +{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkgconfig, makeWrapper, python27, python37, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL , ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl @@ -630,6 +630,13 @@ in with stdenv.lib.licenses; rev = "02987af9b81a9c3294af8fb9d5a34f9826a2cf4d"; sha256 = "0gl7irmn5d8lk7kf484vgw6kb325fq4ghwsni3il4nm5n2a8yglh"; }; + patches = [ + (fetchpatch { + name = "fix_mame_build_on_make-4.3.patch"; + url = "https://github.com/libretro/mame2016-libretro/commit/5874fae3d124f5e7c8a91634f5473a8eac902e47.patch"; + sha256 = "061f1lcm72glksf475ikl8w10pnbgqa7049ylw06nikis2qdjlfn"; + }) + ]; description = "Port of MAME ~2016 to libretro"; license = gpl2Plus; extraNativeBuildInputs = [ python27 ]; From 8eeaad9129e265d36c7879765865793e66eee9a0 Mon Sep 17 00:00:00 2001 From: Matthew Piziak Date: Wed, 28 Oct 2020 12:12:04 -0400 Subject: [PATCH 060/294] tdlib: 1.6.0 -> 1.6.9 fix hash version 1.6.9 is not released, so use revision hash --- pkgs/development/libraries/tdlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 4bf49e297e33..06909c078609 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }: stdenv.mkDerivation rec { - version = "1.6.0"; + version = "1.6.9"; pname = "tdlib"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; - rev = "v${version}"; - sha256 = "0zlzpl6fgszg18kwycyyyrnkm255dvc6fkq0b0y32m5wvwwl36cv"; + rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01"; + sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n"; }; buildInputs = [ gperf openssl readline zlib ]; From 01b58c02401adffe34de99a06cb27e29e5b8cdfc Mon Sep 17 00:00:00 2001 From: meutraa Date: Wed, 28 Oct 2020 17:57:00 +0000 Subject: [PATCH 061/294] androidStudioPackages.{canary,dev}: 4.2.0.14 -> 4.2.0.15 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e16464fb8494..3a5bc63e1c38 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; }; latestVersion = { # canary & dev - version = "4.2.0.14"; # "Android Studio 4.2 Canary 14" - build = "202.6907010"; - sha256Hash = "sha256-A6nl4uN25CWOjpwBvOQG26EZnJP5tNvSrGtoF+IQmtY="; + version = "4.2.0.15"; # "Android Studio 4.2 Canary 15" + build = "202.6922807"; + sha256Hash = "sha256-PXFNnPSJbdp9NtkMDR3Vq+vpWqd85Io2FmXPhRLRk/8="; }; in { # Attributes are named by their corresponding release channels From dbc8525ab25b2c1e59b73303e81c2703f1dc520d Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 28 Oct 2020 13:31:27 +0100 Subject: [PATCH 062/294] gofumpt: 2019-11-11 -> 2020-10-27 --- pkgs/development/tools/gofumpt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index 080f4bd3305a..82ae3d4bb7b8 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "2019-11-11"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; - rev = "eb442649d62000da5d11671f3beb1afa1b746fd7"; - sha256 = "1cw9mmavxz8gxzzwsllvf5lwb2wwi19jbc7hcwxsi4ywp7a84gh0"; + rev = "85d5401eb0f699d87b0d6c949dd4c0d5fb23f2e0"; + sha256 = "0n72d7p4y89kfilcdx3qb63qy6xm8dyp6q8s8954wrkm2wlhkwiy"; }; - vendorSha256 = "14a3p163xy861xb6x160wy15hzjc75n36jdyzaxl877i17shba8z"; + vendorSha256 = "1s546hp4ngzqvfx7dbd43k7b94z0mvndgdkndh4ypkkl3rpd9kkz"; doCheck = false; From 7502d0e5d7baf74965c0db5a3e10354408c44cf5 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 28 Oct 2020 14:18:45 -0400 Subject: [PATCH 063/294] aws-google-auth: 0.0.34 -> 0.0.36 --- pkgs/tools/admin/aws-google-auth/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix index d96eadf0eab5..a9a49beda2f3 100644 --- a/pkgs/tools/admin/aws-google-auth/default.nix +++ b/pkgs/tools/admin/aws-google-auth/default.nix @@ -4,6 +4,7 @@ , beautifulsoup4 , boto3 , configparser +, filelock , keyring , keyrings-alt , lxml @@ -19,7 +20,7 @@ buildPythonApplication rec { pname = "aws-google-auth"; - version = "0.0.34"; + version = "0.0.36"; # Pypi doesn't ship the tests, so we fetch directly from GitHub # https://github.com/cevoaustralia/aws-google-auth/issues/120 @@ -27,13 +28,14 @@ buildPythonApplication rec { owner = "cevoaustralia"; repo = "aws-google-auth"; rev = version; - sha256 = "12c5ssdy870szrizhs4d7dzcpq3hvszjvl8ba60qf1ak5jsr1ay4"; + sha256 = "099r020v33sij2b3816cjp4fpy35c886l559szfxqx6kgy19y9z7"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = [ beautifulsoup4 boto3 configparser + filelock keyring keyrings-alt lxml @@ -43,10 +45,10 @@ buildPythonApplication rec { tabulate tzlocal ] ++ lib.optional withU2F python-u2flib-host; - - checkInputs = [ + + checkInputs = [ mock - nose + nose ]; preCheck = '' From ca45bb574ddd7c4e4a855bc41a7154f0b6edddd9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Oct 2020 19:38:28 +0100 Subject: [PATCH 064/294] nixos/rl-2009: minor typo fix --- nixos/doc/manual/release-notes/rl-2009.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c399c22eef55..01f113198eb9 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -1618,7 +1618,7 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; nixpkgs. It was a work in progress to package the Deepin Desktop Environment (DDE), including libraries, tools and applications, and it was still - missing a service to lauch the desktop environment. It has shown + missing a service to launch the desktop environment. It has shown to no longer be a feasible goal due to reasons discussed in issue #94870. The package netease-cloud-music has also been From 4ce6364e291d6853cee1bf8383e1e1e8b25abbcb Mon Sep 17 00:00:00 2001 From: eyjhb Date: Wed, 28 Oct 2020 16:15:05 +0100 Subject: [PATCH 065/294] ns-3: 3.30 -> 3.32 --- .../libraries/science/networking/ns-3/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index 73be2a8ca6c2..b611a2baf8e2 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -26,7 +26,7 @@ # All modules can be enabled by choosing 'all_modules'. # we include here the DCE mandatory ones -, modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"] +, modules ? [ "core" "network" "internet" "point-to-point" "point-to-point-layout" "fd-net-device" "netanim" ] , lib }: @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "ns-3"; - version = "30"; + version = "32"; src = fetchFromGitLab { owner = "nsnam"; repo = "ns-3-dev"; rev = "ns-3.${version}"; - sha256 = "0smdi3gglmafpc7a20hj2lbmwks3d5fpsicpn39lmm3svazw0bvp"; + sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k"; }; nativeBuildInputs = [ wafHook ]; @@ -60,6 +60,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs doc/ns3_html_theme/get_version.sh + # FIX/Remove when https://github.com/NixOS/nixpkgs/pull/69310 gets merged + sed -i 's/program.ns3_module_dependencies.copy()/program.ns3_module_dependencies[:]/g' wscript ''; wafConfigureFlags = with stdenv.lib; [ From 3fce2724784984f07ec86b6f144399da2e21fa0f Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 2 Oct 2020 20:31:38 +0200 Subject: [PATCH 066/294] nixos/shiori: harden service with systemd --- nixos/modules/services/web-apps/shiori.nix | 51 +++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/shiori.nix b/nixos/modules/services/web-apps/shiori.nix index 1817a2039352..9083ddfa2206 100644 --- a/nixos/modules/services/web-apps/shiori.nix +++ b/nixos/modules/services/web-apps/shiori.nix @@ -37,11 +37,60 @@ in { description = "Shiori simple bookmarks manager"; wantedBy = [ "multi-user.target" ]; + environment.SHIORI_DIR = "/var/lib/shiori"; + serviceConfig = { ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}'"; + DynamicUser = true; - Environment = "SHIORI_DIR=/var/lib/shiori"; StateDirectory = "shiori"; + # As the RootDirectory + RuntimeDirectory = "shiori"; + + # Security options + + BindReadOnlyPaths = [ + "/nix/store" + + # For SSL certificates, and the resolv.conf + "/etc" + ]; + + CapabilityBoundingSet = ""; + + DeviceAllow = ""; + + LockPersonality = true; + + MemoryDenyWriteExecute = true; + + PrivateDevices = true; + PrivateUsers = true; + + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + + RestrictNamespaces = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictRealtime = true; + RestrictSUIDSGID = true; + + RootDirectory = "/run/shiori"; + + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + + "~@chown" "~@cpu-emulation" "~@debug" "~@ipc" "~@keyring" "~@memlock" + "~@module" "~@obsolete" "~@privileged" "~@process" "~@raw-io" + "~@resources" "~@setuid" + ]; }; }; }; From ff9487703e1a7ceacfbddbfe17d67a74c9d5d524 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Oct 2020 21:05:22 +0100 Subject: [PATCH 067/294] matrix-synapse: make dependency for `hiredis` optional This is only needed for replication which isn't even supported by the current NixOS module. --- pkgs/servers/matrix-synapse/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4aff60587065..04700a9e209e 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, python3, openssl , enableSystemd ? stdenv.isLinux, nixosTests +, enableRedis ? false }: with python3.pkgs; @@ -53,14 +54,15 @@ buildPythonApplication rec { typing-extensions authlib pyjwt - hiredis - ] ++ lib.optional enableSystemd systemd; + ] ++ lib.optional enableSystemd systemd + ++ lib.optional enableRedis hiredis; checkInputs = [ mock parameterized openssl ]; doCheck = !stdenv.isDarwin; checkPhase = '' + ${lib.optionalString (!enableRedis) "rm -r tests/replication # these tests need the optional dependency 'hiredis'"} PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests ''; From 3b4631d601887ee5c39ad91baa6797552f6048b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 11 Oct 2020 02:18:51 +0200 Subject: [PATCH 068/294] yle-dl: 2.31 -> 20200807 --- pkgs/tools/misc/yle-dl/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 00624a482c8e..9c233e36f892 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,28 +1,28 @@ -{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg_3 }: +{ stdenv, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "2.31"; + version = "20200807"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "0k93p9csyjm0w33diwl5s22kzs3g78jl3n9k8nxxpqrybfjl912f"; + sha256 = "0jiah6gfp75rc80kzha0cr51cxiy6n3wa9g3z8zgy2nhcf8m2vxq"; }; - propagatedBuildInputs = with pythonPackages; [ - lxml pyamf pycrypto requests future ffmpeg_3 setuptools + propagatedBuildInputs = with python3Packages; [ + attrs ConfigArgParse ffmpeg_3 future lxml requests ]; - pythonPath = [ rtmpdump php ]; + pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access - checkInputs = with pythonPackages; [ pytest pytestrunner ]; + checkInputs = with python3Packages; [ ffmpeg_3 pytest pytestrunner ]; meta = with stdenv.lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; homepage = "https://aajanki.github.io/yle-dl/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; }; From ee2e2c10327a1f0cbf47d173f7604e5623876673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Oct 2020 11:56:30 +0100 Subject: [PATCH 069/294] yle-dl: 20200807 -> 20201022 --- pkgs/tools/misc/yle-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 9c233e36f892..2c2165ef5621 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20200807"; + version = "20201022"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "0jiah6gfp75rc80kzha0cr51cxiy6n3wa9g3z8zgy2nhcf8m2vxq"; + sha256 = "0p56pb3wxdzqgs4fsh4hn06xs0mgzgznqqr0bn2vkkkibnkr1asp"; }; propagatedBuildInputs = with python3Packages; [ From cedc271c918c0478967865260295d6ab6aa41582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Oct 2020 12:08:00 +0100 Subject: [PATCH 070/294] yle-dl: Add SuperSandro2000 as maintainer --- pkgs/tools/misc/yle-dl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 2c2165ef5621..4e0f2787fdbe 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; homepage = "https://aajanki.github.io/yle-dl/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg SuperSandro2000 ]; platforms = platforms.linux; }; } From 99bf27cc456297b481560fb2f1a21e0a93dbd8ba Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 27 Oct 2020 15:03:10 +0100 Subject: [PATCH 071/294] yle-dl: enable on unix Thanks @sikmir Co-authored-by: Nikolay Korotkiy --- pkgs/tools/misc/yle-dl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 4e0f2787fdbe..40bf214f4630 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -24,6 +24,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://aajanki.github.io/yle-dl/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dezgeg SuperSandro2000 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 135f6b62ddf007187307eac6566a689a7ae7a441 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Oct 2020 21:44:22 +0100 Subject: [PATCH 072/294] element-web: 1.7.10 -> 1.7.12 https://github.com/vector-im/element-web/releases/tag/v1.7.11 https://github.com/vector-im/element-web/releases/tag/v1.7.12 --- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index a71bc086370a..0d3e771630fd 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.7.10"; + version = "1.7.12"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1xcvydjpdp6cy5g0da5yaa49gjxsmf4hsyi2q4l3p8qvs4qajn0r"; + sha256 = "173hdg09cw13vqh0lvz6kl0mq4i3rsacjxhspkpydh2qd1g3hjrs"; }; installPhase = '' From 9d5c765e33972ebbdee97b656aaf480be2edb195 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Oct 2020 21:44:46 +0100 Subject: [PATCH 073/294] element-desktop: 1.7.10 -> 1.7.12 https://github.com/vector-im/element-desktop/releases/tag/v1.7.11 https://github.com/vector-im/element-desktop/releases/tag/v1.7.12 --- .../element/element-desktop-package.json | 4 ++-- .../element/element-desktop-yarndeps.nix | 8 ++++---- .../instant-messengers/element/element-desktop.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 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 05f7af332436..364f5a25d0af 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": "src/electron-main.js", - "version": "1.7.10", + "version": "1.7.12", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -62,7 +62,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "10.1.1", + "electronVersion": "10.1.3", "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 2a611aa630a2..21374014c886 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -4394,11 +4394,11 @@ }; } { - name = "npm_user_validate___npm_user_validate_1.0.0.tgz"; + name = "npm_user_validate___npm_user_validate_1.0.1.tgz"; path = fetchurl { - name = "npm_user_validate___npm_user_validate_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz"; - sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951"; + name = "npm_user_validate___npm_user_validate_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz"; + sha1 = "31428fc5475fe8416023f178c0ab47935ad8c561"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index cb5e598c1211..b31841c5e79a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.10"; + version = "1.7.12"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "06ygqfhbsld4s274kakb6a5nx75jki44r8lwk3n0pi5mnkn626gl"; + sha256 = "08d9llrglap5bbicdkbdl9l71wba2kkyhdyd0a4iqdz3l2jvv698"; }; electron = electron_9; From 520114c59e6181c142ee53aaa1fb0dc385216315 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Wed, 28 Oct 2020 13:46:23 -0700 Subject: [PATCH 074/294] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 674 ++++++++++++++-------------- 1 file changed, 337 insertions(+), 337 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 14c05727e9c2..cd36f40f2792 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-10-01"; + version = "2020-10-15"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "2d3ed956b944132e1d520446493fa5c9aa8a309f"; - sha256 = "0mlx6g87h9mcvb5fbpx4j06mx7kpjmi8nh11kzm7bfni7bhyjhx4"; + rev = "557a1ed5da70cb443a8650766f4e8ea95e8c0da3"; + sha256 = "105rp35mp6nr79vyz93v36x48yjja38n9n4ngxnpsnm7qf9q8x5n"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,12 +89,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2020-07-13"; + version = "2020-10-15"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "cfdde31672bce2f60bedc36842ab9bca8d28ba5b"; - sha256 = "01lpnvdym9izaq29kbgwa7kl303nnzsn0cpqq75bv7glymglbn0m"; + rev = "7abb04c115742ec9a5f90b86170f0118680cf8ec"; + sha256 = "185b4dari7y05p99756bqld4kk3d124ry4m4j7an8qm0zmpq648m"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -137,12 +137,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-09-17"; + version = "2020-10-21"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "20a279b079452dba6e841755f8e9cc5aed75d05e"; - sha256 = "0fsafx0h3nmsrsscg233cyfhm2vj6n1k0n37l2mg0kbv77pzicga"; + rev = "2107094f83e58818ec9b8ca033a75eeeb49db163"; + sha256 = "0bxxl1jj1bigwnvd07wb0ypsp5rn0b5c864m4k44llw7v1r3nrms"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -197,12 +197,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-09-11"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "41a0d9ea4dac077c2050ceaf144f9ed72d6849d8"; - sha256 = "12ivlzyw0iq9jsj3ll2wwbya0ssl4vdk1vvjpg7v4xhxgh96s3jr"; + rev = "6ab7034fde6e6e4307df83d8735643b0fe1ff641"; + sha256 = "0ds3xxb2w645aspn2d1n5543h9vpn869aihq68z0ajkvvl8mr66z"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -281,12 +281,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-08-15"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "9b2dcc18ba104820eac1701aaca44dcc24d90eb4"; - sha256 = "1vy0np1i8whyw9wfkcx564kvlxspwvrp4sznk6iixjln6ha7ngil"; + rev = "84335b66be1e323002380280f265983dc635fd99"; + sha256 = "0p9f7hy751ayjh6pna8gi0vi09lk0dwpi69rh21nidiqiph6n5l5"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -305,12 +305,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-06-01"; + version = "2020-10-09"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "0725e7c273e2c39d8730adc78e0fd20e0d57d173"; - sha256 = "14rsjy5lllmb84vs5q111cb17c6nwc37zf460kh8ii1ijziyqhy2"; + rev = "26279f70cdfe5da2226cd15d7dd832ef6242ed26"; + sha256 = "0sdkcbh0rxx9wf5qa7wwvm8zjk57vvclvss4cadll54zi6q8xq1s"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; @@ -389,36 +389,36 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-09-28"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "c8cc53707a11192ce7b3d6ef62750fea1ea1e9ce"; - sha256 = "08zq9axfyj4c8wvn09dj6dbw9iq7w4pxgms6yh34p3qf8km6pl91"; + rev = "9e3fdc4079255b7e77207011119bf47aae8c08f5"; + sha256 = "0jkm2qf01w8m5x50h24y79l5qmxvwpv2hrl8v34bqhz6jvm10zz4"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-09-03"; + version = "2020-10-22"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "2047783c1c9f7bcc020612a719d932e848a2d39d"; - sha256 = "15fxpip9zz5z8np3qrsgadh7p8y8446bxb9vbcr80fcq3j8fmq0v"; + rev = "ca80d81fdb61d1ea32cfaa498153e1f0cb651994"; + sha256 = "1p5i415jk6af4yiqzkgghrhs52x491nrz4d3wrdxad8ydlf64jvx"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-markdownlint = buildVimPluginFrom2Nix { pname = "coc-markdownlint"; - version = "2020-09-29"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "876ce05c7a249f2065f4953ea1bfb0a0dadf764c"; - sha256 = "0qxbb45djq724yhfna0s9d7m99wcrv8vkw5ilvp1yz2vfg1b78x9"; + rev = "abdd6450aee119750ddb4dff4a7ab82355a89418"; + sha256 = "1p0wafvn8xzi4bm9bn2fnp8kavw8s6hchpz81ms9770jrx02z5xi"; }; meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; }; @@ -461,12 +461,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-09-26"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "2b83490cb1228abe4bf2c2557f1407321f6af734"; - sha256 = "10pgj0kh4vd0wvsb68l3k2af5rhmh249a2cf4mhbl8jb1g76bnrl"; + rev = "6a903340710a808401120bd1a32f204529f00935"; + sha256 = "1cznyvwgdgbg60hfd423h0fqdyzxhwwy5w88b5rmf44maspjr41i"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -522,24 +522,24 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-10-01"; + version = "2020-10-23"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "52ccd7c344dca90b62de4ea997c4aa328ce7f020"; - sha256 = "035my2dzahf6svx3f97frv6xx56k4vxxiw0qcwgsbvdp3s4jmb9g"; + rev = "3b6774ed1c1b4720efe3385f06883483f5e16884"; + sha256 = "1vldm13lbfmphim946lnyl30276chw4gnnnq2hxnf67k8a9x8ssc"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; completion-tabnine = buildVimPluginFrom2Nix { pname = "completion-tabnine"; - version = "2020-10-01"; + version = "2020-10-03"; src = fetchFromGitHub { owner = "aca"; repo = "completion-tabnine"; - rev = "49771bca86f185c8cd1017f28b025addae82fe09"; - sha256 = "1kc9ck62k7rj09i3bqhz36661z1501z7ns7q6dr4n07nqylcn5kb"; + rev = "a7e6e2e249fec79f4260f388cd0c8adb38c0b3ad"; + sha256 = "1hnbhr4sgl7a8mj2ygma9avc7hfsv18wxrxypik62x7vijsnv9aq"; }; meta.homepage = "https://github.com/aca/completion-tabnine/"; }; @@ -570,12 +570,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-09-20"; + version = "2020-10-17"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "a9431410d74f2281ae626727342a5d23d4a12552"; - sha256 = "00b73dxirn3m0rvagskgc00vyrkkcnbxfkn22jnzv84fjvvcj375"; + rev = "0e63269e176232cdd9f1c20d94dfd3b8ad5702a1"; + sha256 = "0ixryjfszx09g27awdaqf5xrc7yjb5mlpc57ph3w61hdv65yps7b"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -594,12 +594,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2020-09-29"; + version = "2020-10-23"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "3c9d27a1a15da1d0f6128402fa766d9e9feebc1e"; - sha256 = "064ldkah460azqibc03cj42vbrl6ns4sj439wsbkqb0qxni5cp57"; + rev = "2aa48079243de581b498f11bb3c4e8aba9e09f71"; + sha256 = "07bxcvvxrfvifxk9yyg0vnisj0fsrb1mzlrrzg8qjrr571cjvj6x"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -642,12 +642,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-09-02"; + version = "2020-10-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "e23f03632ad2544f0232b824dd5520fd0b58d235"; - sha256 = "12b127v6yxwik7q2wbyqag4082yzp44sm0x4xwnv55xhlz4w6xws"; + rev = "350af4840991142230103e4f4fc58581d9c07812"; + sha256 = "1ibmrz1h51iy5ffvwalfydgjvdsfjvbpz1s1zmsalpv8mlswrhij"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -690,12 +690,12 @@ let ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp-vim"; - version = "2020-09-21"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "ae5237f8eb9bbc1ad7f8903738e0dc2af194f740"; - sha256 = "18inmxhqzw40sm5ixybbliikbhs10zrqp58qjcd8qc4grj8z6lcp"; + rev = "3866ae170a342fb40d83e1538c37c81c7977b821"; + sha256 = "1ksi46g33ghdrp0nff0fyysxnzw0sr1x5b1ln6xzjv4hkdxiz51k"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -738,12 +738,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-09-24"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "a84cb7f88afc904123858b226240c3339b7ca814"; - sha256 = "1ryc0ahrjjc20344jbvxz9miyrqdjs7gz6r2awkf0ayyz6nx5gch"; + rev = "77956f66722f3a8b7d7e1c86092a3ac84af70b90"; + sha256 = "0iqib5fgz2hal3qm4az4glikml6i33sfk7fgwmdy5kgkx512vqb8"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -786,12 +786,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-09-23"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "cb06d89aaded0bc2418d03a8fbb263ca0ef70406"; - sha256 = "0dk4w6yljnhf4qwhgamnw2bnmqikgqb8nshifn5l767sm3hk7d2h"; + rev = "48f485e080c2b6a21a374b5b2000c091d30c5f56"; + sha256 = "0wg1dz57hz0rq14f5lyqh9hbdyw3c1hdwpgwckd7qrncbcfbvbw2"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1004,11 +1004,11 @@ let deoplete-vim-lsp = buildVimPluginFrom2Nix { pname = "deoplete-vim-lsp"; - version = "2020-07-24"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = "deoplete-vim-lsp"; - rev = "2ea06074dc07c67ccffc24b976b92e17e9d795d1"; + rev = "cb5af558e892a70648587e673fc251409ac3dc72"; sha256 = "03rpw1z5fgglba7vymi3ln810nh5x3x9hjqlm41shdik9pgmg867"; }; meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; @@ -1028,12 +1028,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-09-12"; + version = "2020-10-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "895fafe572585b807a31d4ba2835188d7b38cc41"; - sha256 = "1irhdp1bdwpyj9g40mb4n1mjw2f1hxswhgf2f1nkv1cx0j8pvkzd"; + rev = "c09da81e9824fc113323573abea3a2ec13c04409"; + sha256 = "0b8sp5kj6nnv3wlkpy2q14k9v9qxsf8lskb11rssrjwhfys12bn0"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1076,12 +1076,12 @@ let direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; - version = "2020-09-27"; + version = "2020-10-10"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "c2b9f7834c1a2d28c4e022485b870c19de0c6ada"; - sha256 = "0qk1kywr4zdhvvpc77868g3aclwbmm5p4zvsxj65qb4bpzddxvrd"; + rev = "983bbce66b39cd17e4b8348078a41a5782cd73a0"; + sha256 = "1n144nihbcaljgbxv4kfg8af3dxvf9i4cxdz5qq12rzslwqgdsi1"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; @@ -1100,36 +1100,36 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2020-07-19"; + version = "2020-10-19"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "b64b22affafca7d3831a20949115b91031d596ec"; - sha256 = "1f5hwfcrsfq3yk53kkn4syaxmri8wh8h6rpq867468b8rdcnhq01"; + rev = "80d2667818492e2e7630894f2b3eb7fdae1e240f"; + sha256 = "1bq52larf3bbhrrzqg2gx737zc1xrg8qa916ny2qh9w7lsjjwf4h"; }; meta.homepage = "https://github.com/dracula/vim/"; }; echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-06-08"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "4719626bfd477f1189dd9992614ff452d3ea3caf"; - sha256 = "0bpaav7yf06wlzfiyx6iylxan8a9hici041pnmlw7kgf176h6w7b"; + rev = "2a6d6bd6255fbfe152da6bb7f2404afa29479941"; + sha256 = "18nm20ivkcjlh0rgf3c1wdxf1wsc4r95znm2dhgmw1ym4wmh0v4s"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2020-06-02"; + version = "2020-10-21"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "0a3c1d8082e38a5ebadcba7bb3a608d88a9ff044"; - sha256 = "1w60rsij0ag74vjal2l75k4g4xv8438a0izvzpy5xir4bby2g7dz"; + rev = "8f6eba5fd6c306e0480ea72917902a2bde162d73"; + sha256 = "057k0fdqgc6m1d6zzql5m1q5lsdsp2s28s9f80h9sgxvrzy36z7y"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -1161,12 +1161,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2020-06-20"; + version = "2020-10-21"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "dc6cb4fd074f4c371158eeab0c8e4ce4af33534b"; - sha256 = "1cy201c5imbw2pw65f1s0nn8p6vwm00nqlvxwygh18dhy2qv4gfa"; + rev = "60930a968d26fc7abf4f8fd5c3926bdcda2dd787"; + sha256 = "1sf0518rq9idj0sbyplh7y9a481i3y57wwkvdakqvngbpm4bf6ms"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mattn/emmet-vim/"; @@ -1258,12 +1258,12 @@ let flake8-vim = buildVimPluginFrom2Nix { pname = "flake8-vim"; - version = "2017-02-17"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "andviro"; repo = "flake8-vim"; - rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795"; - sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g"; + rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994"; + sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/andviro/flake8-vim/"; @@ -1331,36 +1331,36 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-09-11"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "3348aef05d02828cd8b071ab29476af2029ea3d3"; - sha256 = "0jyk9c3ksxss8zjk0qqkm95074glbf31a5w78sdzwn352xm8nakp"; + rev = "7d45724fdd323d5eb7d39c8caa2e38e63c5e84a7"; + sha256 = "1v9ry3k8si26h2f9as7dnxrh5qihl3a1spinqqlwsk9faq7d511w"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; gen_tags-vim = buildVimPluginFrom2Nix { pname = "gen_tags-vim"; - version = "2019-06-28"; + version = "2020-10-12"; src = fetchFromGitHub { owner = "jsfaint"; repo = "gen_tags.vim"; - rev = "208cd0490547bc8f7615eea1b26e4635d2e60a96"; - sha256 = "00s1kxi1bsvz06z7x78kls0k6ncnbqdyz14fvdxxq82f6s1kdvdw"; + rev = "f888a2f8732e08d9f2b638b144c5c826a30953a3"; + sha256 = "16gkczlaani0c0v3hkklriabhkgcs0mg9mrbn8jzfsap15cnkgk5"; }; meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2020-06-05"; + version = "2020-10-07"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "47b6900c425614d4ba22223c13a23920f0618d9f"; - sha256 = "0agswv1r5nxbnw0nddhw9vqvrfsvsgh18nwrg83c01sj97075qmv"; + rev = "3d90ee5686e54fb1c3242f10e644a789579a4372"; + sha256 = "0qvfqw38vk9ijwhgivjwh289vnmzc2p7cp6jiqpj98zsnank0yw2"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -1475,12 +1475,12 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2020-05-23"; + version = "2020-10-04"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "933b6cc35a0f180ff488ef20c7b534c9c3b6701a"; - sha256 = "0w10hcz66dgilx6fv07bb3zsf5c0x9gv4vhp15c5fp2rzwxi10bn"; + rev = "9e71159ffa93be1e772d2cb3c78ee940f7b308ba"; + sha256 = "0n3jzzjbfrs3r26bagry3pvqcy2asb1jkcfqvabmycs6y6w8sx01"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -1499,12 +1499,12 @@ let gv-vim = buildVimPluginFrom2Nix { pname = "gv-vim"; - version = "2020-05-22"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "61d877d23caaad9009d672f90fe2ab576ab93d2d"; - sha256 = "00h4d6jah0fdr5m8x9c1gmmm9wskplixnvbbalfbbpc599xhgj83"; + rev = "486b5c4e960d5ec9e79888939534b7b2fc7453ad"; + sha256 = "07pj94s5kf8qgwdz73xbb7b2h3w6gkv4sw9faicdb6hla3i19d9b"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -1547,12 +1547,12 @@ let hoon-vim = buildVimPluginFrom2Nix { pname = "hoon-vim"; - version = "2020-02-19"; + version = "2020-10-15"; src = fetchFromGitHub { owner = "urbit"; repo = "hoon.vim"; - rev = "116f29971a2fbec8e484daeba8afd9d60f85800f"; - sha256 = "029rm8njpsa0lhhh504975lmw7yr2bkvxi2gag1l9279r629vp2r"; + rev = "aeb307427f2ffaf756cb04574f5ed0d77626d51e"; + sha256 = "11nsws8q54lya6lk51zkwhv47rmidg1wclgd4vq7v4jwc25gw8id"; }; meta.homepage = "https://github.com/urbit/hoon.vim/"; }; @@ -1643,12 +1643,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-09-04"; + version = "2020-10-12"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "5bf49035522dea94b72638d039828c6f84b7ae34"; - sha256 = "098ng8f2dv29pgvai4nsm2d5qyw44gd9dxjmdc3mdznzmn0clvvf"; + rev = "6107214eff0cac5d9810d29ae8614ddfdfcd986b"; + sha256 = "1aycs427w9w5hjnif5c13wf3jd872a3i94zzdfisfrispbs3ad2m"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -1691,12 +1691,12 @@ let is-vim = buildVimPluginFrom2Nix { pname = "is-vim"; - version = "2017-10-30"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "haya14busa"; repo = "is.vim"; - rev = "61d5029310c69bde700b2d46a454f80859b5af17"; - sha256 = "1nnf6y62mc0rj7hbrapfkmr91ypsqkzhwgpfx7pahz8m3a2324q6"; + rev = "d393cb346dcdf733fecd7bbfc45b70b8c05e9eb4"; + sha256 = "03rvhvqx59c6lp9xh6zry3ynppngqn53swl3v9gmc3ynh3l1jdzq"; }; meta.homepage = "https://github.com/haya14busa/is.vim/"; }; @@ -1764,12 +1764,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-09-07"; + version = "2020-10-14"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "33116e1135ffa0c09997c111785beb5232efc7cf"; - sha256 = "1qx1xpnnzvb5h86mrywx56yqw5lbma9xmwdgi6dh6x8mzald7agw"; + rev = "a4bc8a2032e9da4dbfc5f527c2415b68fc09b9bd"; + sha256 = "1ir0yj0f0ggndxfpg8119vcb1l7qagf5qsl9s94ghbka6qqvlia3"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -1836,12 +1836,12 @@ let lean-vim = buildVimPluginFrom2Nix { pname = "lean-vim"; - version = "2019-10-04"; + version = "2020-10-10"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean.vim"; - rev = "2ace010eb32603a65af7921954a0594a02523c6b"; - sha256 = "0wq2lw4xx2qhz1xii9g7i6wz0y43b2icqrm6ypr9jmaac1rhiq7c"; + rev = "c3a99f34a92af8a86e162134276222309e01e896"; + sha256 = "09kz4iy0flwdawhd0phy6jl6zkxp3qdyhl8snl0n12sbskzq7i1b"; }; meta.homepage = "https://github.com/leanprover/lean.vim/"; }; @@ -1872,12 +1872,12 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2020-06-11"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "8eef4095f0ca4ec37b6877b7b01047146e987c6b"; - sha256 = "17clfc8shmv485r6anpkkcq88x6n2pm54ir1pjy852spzykycika"; + rev = "e541328a67fe10f1323630a30a37b58c934d7819"; + sha256 = "09w33f4cyg9wdj8jas5h43cc7byqfmmm9wyc0xjaw9jxcp78ygg9"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -1896,12 +1896,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-09-30"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "df2a495aac2dae95e9869c35d79ed26313f0e7c3"; - sha256 = "1hc4vsyb616qj0irak1c28kgsk7aszk3x94mhrbgy6yxkiv9asgn"; + rev = "b5959b4fa3635d9a7eac587a5c223effca14a970"; + sha256 = "0rfl5c2bf0j6kn1knzg4kywi7xvqhr6impwfh5466ncb4p529vlk"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -1932,36 +1932,36 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-09-25"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "2afc3ab4dda191c75764d3239d1cf56356759dd4"; - sha256 = "0yvinwvzhqb87nqg38azd19c9w0yrkl06mx3agji2mvn23p66ab5"; + rev = "8769bbb84cd22b475275cc4f9f06a25445357a49"; + sha256 = "1q1pmfvzvdsknw67zi00b3bn8y10mx7wjfc1nxfy1h33vzhl2g2r"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; limelight-vim = buildVimPluginFrom2Nix { pname = "limelight-vim"; - version = "2020-09-07"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "815c6122504361d52e10172601471b416d040ca8"; - sha256 = "1af9jz05iphp6738vvfchnvhfxw7wx2hxqs0iyjkmi7w43hsw0sy"; + rev = "4412a84d7fbfd01281bf23d801e95c45c1eacc09"; + sha256 = "1qab2pd1pyfrw0llxd5j11imzqxa3lnnfhr1w2fjn3yanbsxvlvd"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions-nvim"; - version = "2020-09-06"; + version = "2020-10-19"; src = fetchFromGitHub { owner = "tjdevries"; repo = "lsp_extensions.nvim"; - rev = "7c3f907c3cf94d5797dcdaf5a72c5364a91e6bd2"; - sha256 = "0c9glx0hn28m5jzz52ny1rcp63s9fdlznvywy4gzwwqi9rscqznz"; + rev = "85ce064c36b93cd8856d6dfc41ea5089764ec1c6"; + sha256 = "0vljxb9cvq042f70cq01n5mf2vd2wg2qpj75nlva9rjhiw9q3qw8"; }; meta.homepage = "https://github.com/tjdevries/lsp_extensions.nvim/"; }; @@ -2292,12 +2292,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-09-27"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "78098f6d1e03fd87ca90a522a752106357dfdc6f"; - sha256 = "0hpml222gj203svm7f9sghzgg0ccjvf0xw9lbnfmn8naxqqqmzw6"; + rev = "2033ca4fa0a820658f07e6a2ffcfb0434d5be071"; + sha256 = "0mz237rbymlq6ksmyakc6mqvskic72fgaw88jywg3cmnjjskqvi2"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2340,12 +2340,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-09-24"; + version = "2020-10-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "886a414e339fe40a47f30da8aa6012a6e0906018"; - sha256 = "0rnqa2cc7imapizg52r5dxzq2x2m8sxvds2q27ablzcvvghsjh96"; + rev = "7448233dfd40e7f0a1075fefa76d1d5a84e5d28a"; + sha256 = "0dy7fgdhkz06720ws4r5gyksqg60hb2v157vkbzii3jqd5fx8mkf"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2436,24 +2436,24 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-08-18"; + version = "2020-10-14"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "577ddc73f0a1d2fd6166ed3268ab8536111037e0"; - sha256 = "0bccr18nr42vwbb4i765yxjw18piyiyd12sm4snbkkxahp9yswf7"; + rev = "14af89743ac1c31ff9bb43682025eda50333a7d5"; + sha256 = "1q50cc9z91v809s65w0zq2s0z5smvghy0fbdjn64mr894ndvrmcv"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2020-09-25"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "85c4bed898d2d755a2a2ffbfc2433084ce107cdd"; - sha256 = "1m8s5x30k875812fbznvbq3pch5jpy29jr5rpzr0pr2ni5wkv6a4"; + rev = "01b84c63b9ba48628285779fbdfd046dd2bc2970"; + sha256 = "1bmnm5my7r8ranafanwc33qksic444p47i23qsnkkphxk2hiq5q7"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -2472,12 +2472,12 @@ let nim-vim = buildVimPluginFrom2Nix { pname = "nim-vim"; - version = "2019-04-26"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "zah"; repo = "nim.vim"; - rev = "88f5e708a739fb26be6364ab2fabadf9fffb8d7b"; - sha256 = "0ja8qx9c5g7k4phllvk3vz6s62iwpwsn40w6c32sybjs98jkrw7y"; + rev = "7a8737a4532239c06116ebde0329d8156f3d3b55"; + sha256 = "05xhac416c8zsgqlchc80f7gbjxbyngi6cxziqagdhr6kccc73gi"; }; meta.homepage = "https://github.com/zah/nim.vim/"; }; @@ -2580,12 +2580,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-10-01"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "5debe931333b20fe2b352dd92c03ded837e3df4b"; - sha256 = "1mw5v1qpqz7h9vb89bj1m8wrqk7yvfycmal7y1b5wizl45ssx40m"; + rev = "d9454afd93b8396fb72ff15179b5c59df21713c3"; + sha256 = "0kx2ljal46fj2pgvv2cpflxp6s0qzlry8i5mk0in27qs8bix79jn"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2640,12 +2640,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2020-06-11"; + version = "2020-10-14"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "3aa42a39ed3cddde0c53976a700b81b8a7067890"; - sha256 = "0x01c7930hlzvjac3r2wbkdha8j6mmhyk7nwgdazh1z4sxqjyj1l"; + rev = "89923117bc49dd1e0c6b7fdd34bc6dc4d425fe1f"; + sha256 = "0d3d9sp88b41j8yhkn99b0g1y3jbcm3hhf8dw6kq50scrb84g5y3"; }; meta.homepage = "https://github.com/sonph/onehalf/"; }; @@ -2676,12 +2676,12 @@ let palenight-vim = buildVimPluginFrom2Nix { pname = "palenight-vim"; - version = "2020-09-08"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "drewtempelmeyer"; repo = "palenight.vim"; - rev = "294f190da3bd50a7c91fed1b94c92fd0930791ec"; - sha256 = "0s9mna0dcpszz3wyz1qmmrm76rxkjlmyxn7697k5vz4l49zzyi39"; + rev = "847fcf5b1de2a1f9c28fdcc369d009996c6bf633"; + sha256 = "0v7jkg6rpwmyq0wl6lymm2j07r0mzab8lbsnxb0jw34hcpx0rfis"; }; meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; @@ -2796,12 +2796,12 @@ let purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2018-12-10"; + version = "2020-10-08"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f"; - sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8"; + rev = "5b4fa3e2970be1353f7d77735c0c9b42dc9885f3"; + sha256 = "11d2jfzimdi6idvs61gjhy7d1g8yk90dfvvw5m8rn9620xrypbgn"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -3108,12 +3108,12 @@ let skim-vim = buildVimPluginFrom2Nix { pname = "skim-vim"; - version = "2019-07-31"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim.vim"; - rev = "4e9d9a3deb2060e2e79fede1c213f13ac7866eb5"; - sha256 = "0vpfn2zivk8cf2l841jbd78zl1vzdw1wjf9p0dm6pgr84kj9pkx4"; + rev = "2908249af6b759c79c7834862bd42af3a8bc6d4e"; + sha256 = "1819niha13yzhk7sya1mx8qigjwacd4mdp6s2hkk03l1s6x84dj7"; }; meta.homepage = "https://github.com/lotabout/skim.vim/"; }; @@ -3228,12 +3228,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-09-21"; + version = "2020-10-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "7148cbc3b9c4f70cea9fdccb72ae246b6d499c20"; - sha256 = "0smaghrigmr8jmw919pmlcvv6a7w7rw2j12gnbks30pi45y547jm"; + rev = "1c1b94a6aa218c429421c82bcc56a216301b6e85"; + sha256 = "1jkny1ag82zvkfjvbzrkkh4s54jcf9hq5n9ak3g691zcddhmrp17"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3337,12 +3337,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-09-29"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "a1e0e7a57144a0af26e219d16f6f00098b271e25"; - sha256 = "04c0s7q7gg1znvzgfdyicscfgbpxj7z5ym7v8zpcg9bfhg29nngv"; + rev = "aa8c59220148640d66e779c1da495e6c5dfa78a9"; + sha256 = "17ll4hgf67pc24r0bf9zz4l4g5xd3bchgh8i7acd2svsxckjjy3z"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3373,12 +3373,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-08-23"; + version = "2020-10-09"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "25bdb50a6c5934d4ac9313cef0d7d2168d84803b"; - sha256 = "04dmdydrc4v055qkjn5gfvibyzd30fg00abnk8ijvabfcmhvlh40"; + rev = "cfd1360119f5d41ed161cdf8a3e8502680f2fb4c"; + sha256 = "040vwmgqlhnvjc8d32d9lw3a5lr7flgj4h6gnz6m1zw9jw5l68gh"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -3470,12 +3470,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-09-24"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "8ea8d8b98e61cddaff159b4328310f4096c7bb2b"; - sha256 = "1fs7j7v72nv5374pqpx68xjc8kl3fyyhwz4hc029kljqlvgg0lrj"; + rev = "1fb8738cf1e4db06423396dd3576592a94255935"; + sha256 = "0jl7m04rly8y1kslmcmi9f83a87qb3fbk6isqqqd5xgrxxmcj753"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -3494,12 +3494,12 @@ let tsuquyomi = buildVimPluginFrom2Nix { pname = "tsuquyomi"; - version = "2020-03-10"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "85fffd5939c8fc5750b35a937b965af2ad5b0b15"; - sha256 = "1j5wdh0xa5yld4fy2msyjf1qvj8zx0iccc1bw63zzbrcl6rs30gx"; + rev = "144526df5340d3bd0b413e6127c0393de171889a"; + sha256 = "1amizvbpv4mwpi39x9xn5aj1kjkgl4sgh54irnhs4ga76zn0s09d"; }; meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; @@ -3518,12 +3518,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-09-08"; + version = "2020-10-21"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "7941f98337564d4e86cf2b7467b64def4d212794"; - sha256 = "0miihbj9h3ay6iq1ld13ixij3l4h02yrmc7bq8iarw776l89gin0"; + rev = "e6478871c04bb75f3c6cb9b90e171fffbf9c8ff3"; + sha256 = "17f1q0hv89l5mdiv3xrk1l3lnlxj6gbg8pnzcpx5dk4sd14xivd3"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -3542,12 +3542,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-08-10"; + version = "2020-10-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "e9b21134f4e8bc8cd09fa6145749511ac8800f98"; - sha256 = "0rfkd11arkmc2z2m9lz5hnqxfcp2b98hmzgf424s44xyhrn98y16"; + rev = "5f21e3e7e60f6d032daa4769e7ee84885fb0ce4d"; + sha256 = "0sfbv620zl8lqdzsypxcn9gasaaqpwarsynjxa25c4cd843cz3d2"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -3590,12 +3590,12 @@ let vCoolor-vim = buildVimPluginFrom2Nix { pname = "vCoolor-vim"; - version = "2018-10-06"; + version = "2020-10-14"; src = fetchFromGitHub { owner = "KabbAmine"; repo = "vCoolor.vim"; - rev = "8fc037e453f4c2274f590bde4f9fb56167b14e57"; - sha256 = "193cjxfha5xcpfjqqpyfa6xidys1zmmmwlcj7w2cxbr5j5bdnybm"; + rev = "bc19d684af09b1e146cf72176eea1ecded84882c"; + sha256 = "03vaghwqr3k0nls365wk4qwzmvdvdvq41q02c3l5qv2vsdikmz5i"; }; meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/"; }; @@ -3866,24 +3866,24 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-09-26"; + version = "2020-10-18"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "9614105d09ff0d6e1043ab33028615f107fe94a5"; - sha256 = "11kkzl473l4nrz3k13264sn23pmpr1pdcnmxkzndpx1k0r3f87qy"; + rev = "8608270bd39e9aa31bbdb8cd22b2ba776037feb6"; + sha256 = "1g9nq313zdmklwcnn4lakyndc96qiq2zp9l3cg119i5470y7i1lz"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-08-27"; + version = "2020-10-08"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "155bce6665ab8c83447102e8402cc9d3b7c3b3f3"; - sha256 = "1qavi386va4wnalaf03b19lfxypbkjcjdiiasbdzfnlqpz7d4rwy"; + rev = "e1b0d9f86cf89e84b15c459683fd72730e51a054"; + sha256 = "1mlp2yvam11cyscqy6ifn4chhm4w9ccf5hvjd4g3v2nb31zw5h3f"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -3938,12 +3938,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-09-29"; + version = "2020-10-18"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "ed8ea34b649c100c0b60167f8bde12e804627044"; - sha256 = "0dwql5s2j3bmdz0zfmx2f5fdky72mfa91q7kc301rgd9lr5jhqbg"; + rev = "ba41779884d23fc1f865c5077dfea7b53377e7b2"; + sha256 = "1qfq3clgizk7h992x0j3khh53snxm4jjdaq46cy1mgapw4za7d2a"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -4046,12 +4046,12 @@ let vim-carbon-now-sh = buildVimPluginFrom2Nix { pname = "vim-carbon-now-sh"; - version = "2019-02-14"; + version = "2020-10-25"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-carbon-now-sh"; - rev = "789b15d17966a1100ed2889d670923dd6d9ff063"; - sha256 = "1vfhdqv8mf8w0s4nv8k2rqzvahvh1lxm4zsd3ks1n334f580w8x4"; + rev = "f348932f5b65bfccaaa54cfc018fbd251240434f"; + sha256 = "17hj0mfl636hdw4m37xgjg8lahiir3g8bh9rfyq0avqqscjhzc58"; }; meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/"; }; @@ -4082,12 +4082,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-09-30"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "c6ed3de48693d754ef47ec9422ecb065200f8a70"; - sha256 = "1wnz8fx7nkl4maszghl4q0csw3zi26vnavrvzc447il077sff3wq"; + rev = "6bf6a490c27737f04b92082a5859357ad43887c9"; + sha256 = "1nl3bzkqkzxya5a4wpqiads7xyx4prxyzllp9anyg0imbvqd54ms"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4118,12 +4118,12 @@ let vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; - version = "2020-04-09"; + version = "2020-10-09"; src = fetchFromGitHub { owner = "alvan"; repo = "vim-closetag"; - rev = "90cf416c03ed841ad7f3d44f4d6f3192f216176a"; - sha256 = "0kxba7s0s66m2k4j1v8iwq6m5j9843ha67br03dg7d9ya4qiyyw9"; + rev = "bd6bbc33c7e178673aa1dd17a5d249bbd4e3a6a6"; + sha256 = "0nqzjma6mqg19cxq0ck2lym51ajb1x97z497zf9pbp47hkg5875j"; }; meta.homepage = "https://github.com/alvan/vim-closetag/"; }; @@ -4274,12 +4274,12 @@ let vim-cue = buildVimPluginFrom2Nix { pname = "vim-cue"; - version = "2020-09-28"; + version = "2020-10-26"; src = fetchFromGitHub { owner = "jjo"; repo = "vim-cue"; - rev = "1c802d17f86c775d879b2cdebe84efd40dc4bbfd"; - sha256 = "1gp0s4094prxqyzk39igigjqppha7bmy4j36wxl16ns1v8yq4qp1"; + rev = "9e8bef1198817b6bae1143fecd965403d65d2466"; + sha256 = "0rq74znq9mx5p925jd120l5apjqdqp6xy6llzhf2gq5cxpg62hjl"; }; meta.homepage = "https://github.com/jjo/vim-cue/"; }; @@ -4358,12 +4358,12 @@ let vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; - version = "2020-03-31"; + version = "2020-10-12"; src = fetchFromGitHub { owner = "will133"; repo = "vim-dirdiff"; - rev = "5bf29d8a41b4ec93e6c04b9d4a6c626b408c27c5"; - sha256 = "0nvhsj12gsjgncpmvg8b1qz675ghfcsib5gj22p7j4l4brih563r"; + rev = "6e4b04c252be6537b888e88e5bef959308a7c993"; + sha256 = "0n5g78021xzswfnghhzfgv5acaqv6s9k10d8kp84b846bjxc5hb7"; }; meta.homepage = "https://github.com/will133/vim-dirdiff/"; }; @@ -4454,11 +4454,11 @@ let vim-easymotion = buildVimPluginFrom2Nix { pname = "vim-easymotion"; - version = "2020-09-29"; + version = "2020-10-25"; src = fetchFromGitHub { owner = "easymotion"; repo = "vim-easymotion"; - rev = "6c9c0547bfcca6a059dfaaf39dcac1b8c4e814c4"; + rev = "41bbb8ce8a3c3acc837895ebd79f8a8bc07b99b3"; sha256 = "1lbn844pv5pnla3qhc01wyyrx3czmr83gax8pr3w6283jwp4di6y"; }; meta.homepage = "https://github.com/easymotion/vim-easymotion/"; @@ -4586,12 +4586,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-09-23"; + version = "2020-10-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "f936a7671888638dec54b86f2e49001a0e5e6005"; - sha256 = "0yvvwi4kf6frrgdwd86p2bpcgh4x2lrhav1yl58q6mrdp2qjl446"; + rev = "a465d598b23b4fa04f0cd61895918cca498f1c9b"; + sha256 = "0ydpx8x931wix35fv9hamms4bl4s1hvzawsalhfi4cg4qnp3dkj8"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4646,12 +4646,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-09-16"; + version = "2020-10-19"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "dfaecd8d3fede970a1e4c38e2287e0fa5a264253"; - sha256 = "0wkhib4cawh6hq1ihq851afdj6chkxw4a4dqgjkvz2f6krhpblj5"; + rev = "f6654e2f9c29bd85039a11f305acd4e5222b03f8"; + sha256 = "07bh7hkajfg5gchmi0psy0anaz2rdvhii3p09xml9dfkvrapzdrx"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -4694,12 +4694,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-09-30"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "4189bdb580743a92f0e81d0ba9359a1c3b253a3c"; - sha256 = "0pbmi9p87bqvf2l5jxq1wdkjjgwn0m3r1lswdbxrn070s8c8rg0a"; + rev = "1a77f1c00e12e8460f39098ec3289c5433d32512"; + sha256 = "14w43j0gnh10kyshikz4cl6m3f04a6hpiqasn2n71isvdd1p24kp"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -4718,12 +4718,12 @@ let vim-gist = buildVimPluginFrom2Nix { pname = "vim-gist"; - version = "2020-01-29"; + version = "2020-10-04"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-gist"; - rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79"; - sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4"; + rev = "4a210316550577c1b6a5cb13b09ce79fba602b9c"; + sha256 = "1c3k2yfaxijg0c8fvh70jqmrc6zyhh57hid7rm77v2kymvimvazg"; }; meta.homepage = "https://github.com/mattn/vim-gist/"; }; @@ -4754,12 +4754,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-09-11"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "ea79bc01c2efc84cf8e71fbe5fd8adbf4242739d"; - sha256 = "0dv69ganm4rv2909yy9w13y82bik4maa5x1z3kpv0hrd55qay40z"; + rev = "e480eb2b63e337b07e7e5fef288df0b77c06cac5"; + sha256 = "16vidy7kws3n29x9cm4pvb8cvam183wnv2ybvr8iyn8y3p9w3l2j"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4790,12 +4790,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-09-28"; + version = "2020-10-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "e8da3621d6177e5b0beca318a0f9f5baa44d9350"; - sha256 = "0q7i7c6d7infybw870qlbdgpqddykzw14142ikz8x0sb30ijigxq"; + rev = "a5e2535d31aa1d7c0fa8a4e77ee96b92ad185be5"; + sha256 = "0ixpy4vvvh7kgwq4wvyiw8cm3aj89mql2phf49rmi60d9kli3kn9"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -4814,12 +4814,12 @@ let vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-09-14"; + version = "2020-10-04"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "b06a6e62db170f085aa4af7f2439ae7e453eb1d3"; - sha256 = "12qwz7m652jgn86210mbbg1glcmshm67wdhrsb36bxqrx39g1ghh"; + rev = "51c5b178cce145c3aaa22fbc37fd5d64065baebc"; + sha256 = "0kgnyc94fd5i7456vdnad58yn1qcanfp0lg7xdf5dbs1nbarzywg"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -5030,12 +5030,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2020-08-25"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "56e7df8f402a8302fa7f6cb21760d366a105d94c"; - sha256 = "0j4986pdh06q5d0bq4k6lq0b6bgi1fazng106ykhg3aaxjqqhs37"; + rev = "3f8a03701f271c3dc44313fa1254527021afe748"; + sha256 = "1nwzdp708s5j63qldrmf1vvq2vy6vl89hmlnfygdch9dvmzhbvha"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -5126,12 +5126,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2020-07-29"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "80cf31797a85012b7408701073d743a45a3fbf36"; - sha256 = "19ci5n8rkf4wf4ivqj2mjig4m6phvy14k0zplkbafccaadnc0k21"; + rev = "e25876fd386bb2feda519335587c22e493c78541"; + sha256 = "0g92806r8g243apl0g4i1c9mhmqyy2n10776alii5bgyk6jblh82"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -5187,12 +5187,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-08-31"; + version = "2020-10-10"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "5bbe872ee41e50bd5b99bf6204d6147dab39cdc5"; - sha256 = "0jmmkqzan5mkc0j05243f5layqj7fny92rl1vlj32ipv8wgdmczn"; + rev = "548767343ff221a4efd0c055a43c022d23fcafc5"; + sha256 = "0scmpjav4zapglybdqilimqb3n805k8gqc46qvkiihprq9j9za4d"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5283,12 +5283,12 @@ let vim-lawrencium = buildVimPluginFrom2Nix { pname = "vim-lawrencium"; - version = "2019-04-10"; + version = "2020-10-10"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-lawrencium"; - rev = "e0c127cb4e4224453cb88faffd4627b7da499bcb"; - sha256 = "1gvvr04x17157iz83rv45nlbj1qaz90j0l96q3fki3h1b0fw0099"; + rev = "4592f24a50386e02870fa8d508cc7ba8454dc102"; + sha256 = "158hslq4chlqr9mhdpcrbxnygjk4j1pc2caqc3zrwqh9qdk8mvha"; }; meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; @@ -5379,24 +5379,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-09-28"; + version = "2020-10-17"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "1f6e440c5485b26a75ca1db90bd793cb9a81d57b"; - sha256 = "147rvcjq1h03x3bwgg0ii5jvsxvh4j6bk47z1hk349rn4ssi6fmr"; + rev = "9230c11dfb630ef4a9dadf491f1e1c1b2d86ace8"; + sha256 = "13w3fjwy3iy6j48f16g3bg956dd0fl9ynywd1nqvk4ba305g6crx"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-09-26"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "d2b6922250e2fc8fdf7c94c6ca6f0871fe9be1e1"; - sha256 = "1kxqafjfl1f32q05xgkmczfcjg8zr87w1r0hyw054fdzf7krcnmp"; + rev = "fdb69ab91317ce37c167b9820fcce2c35bce47ef"; + sha256 = "13jxzdi3yp4qhlrx9fk0591db1gx3kzmwrmlq3bvicaziip2izsy"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -5511,24 +5511,24 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-09-30"; + version = "2020-10-23"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "054194afce3fdafea33cf21fbfc4d6b3c0e30fc8"; - sha256 = "036w39fwxj75mh9m5nqiakzyhn2ynsxmbq2rp45zf83nr6mm2h5q"; + rev = "9f8d7de3848e32c592b168f898f82ec4356128af"; + sha256 = "1xrwx75dq46snjsrrv0yh4p409w1blmqpw4i5vlxwi5vn29qpnvs"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; vim-monokai-pro = buildVimPluginFrom2Nix { pname = "vim-monokai-pro"; - version = "2020-05-07"; + version = "2020-10-02"; src = fetchFromGitHub { owner = "phanviet"; repo = "vim-monokai-pro"; - rev = "baf3046bb44cdffe3bf9a571b3ec24039e2c9f88"; - sha256 = "0rszkf070d8w94dhgjpsl1kyn19j7bqyz434qshz4j88jk7hap6h"; + rev = "05e534f9fea9a8e4cbf69a1523c785845deabe4e"; + sha256 = "0hf3iy2ydr6jpraf5zyqg2hl7ma5hn301jyxf6m9ffdsz7722jwm"; }; meta.homepage = "https://github.com/phanviet/vim-monokai-pro/"; }; @@ -5679,12 +5679,12 @@ let vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2020-09-14"; + version = "2020-10-11"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "acee4ad4d65ddaf81895cca9e28baea4c13fa76a"; - sha256 = "0rrjcc5i1isia74nrrik5avkd0casbjhgyqb2ph2176gywz6h5y5"; + rev = "023a2a464e7a096779d3e541ee7d1dbe61148f6a"; + sha256 = "0wj945n3da9bzcj5n8002m4vrzv9cgk6sqcc7nyc1x34y9452z94"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -5739,12 +5739,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2020-07-14"; + version = "2020-10-15"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "ad5f154a5bd9daffb7cf50719f0cc945f445af85"; - sha256 = "09x3x53vf2fir9jhi38v9sai7dx5i40ylx1yk42459bgig2vv1aa"; + rev = "b7bce17005cf114b0961d0b5576bf584a2574774"; + sha256 = "1kpg858qazv465k2w8343hkiz9lzclkcx91vcysip77diandn523"; }; meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; @@ -5823,12 +5823,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2020-08-10"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "59680708cdc98c3fae9acb6c261374bfd808335a"; - sha256 = "1yiczv4l2rg8wva2gbjvv7k9s6y9p0gwmlazdd9rnq28nhmxx3gv"; + rev = "2521e2e9b99a3550e1a20f24e09fa46679cbbbc7"; + sha256 = "02023bnvc9m98m45krld1b7gy13z335jv88fx4ybz019wc0mv35g"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -5919,12 +5919,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-09-08"; + version = "2020-10-22"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "d16273e07231260e02412625f98651bc6ceebb56"; - sha256 = "0ckglxbnxq50jfigbmgjwaj2vj1g6xjwyipzxbph2b64yi2kklg5"; + rev = "ab940f624ae1df24605a8ff1bf427de7a76e5911"; + sha256 = "0v985v9a7kspchfvr2lvj5jqnlkg05agyay0wn0c6mg5bf2mw8q1"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -5943,12 +5943,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-09-30"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "3ad297db5c1cf94660e4297ffa81b6281eab2884"; - sha256 = "0v7dzidqp24shm00w79xvg912qvdbsn2119j5gw70q1xjsi3sxav"; + rev = "05e21a9e252b283b2d71568ad3b671d7f28fe0bc"; + sha256 = "039wha51p2zwnjyjm0qxca63dgrp54l43ba74639gf0hp5h2wvfa"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -5991,12 +5991,12 @@ let vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2020-04-20"; + version = "2020-10-12"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "95f78bd0f719fee96569f30fd5f4199c4461efb7"; - sha256 = "1ix04f3nxxmxd36kzalx0hrbks30v44ydz15apvl1h8l8663hda2"; + rev = "e735468710a5cd6037b6d4c0e4c8c2bc1353cf4b"; + sha256 = "0ava297hpm1cf8j18ypfrziwavqcv982hisvh1d8yjxal521pam1"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -6063,12 +6063,12 @@ let vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2019-12-20"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "b04de1dadb7dfe372d22f7529a001af1b5e19f4f"; - sha256 = "1pxl70l0g4i8cbnpjhb9pyjhz982flkrng07y9xwzbdl2jx42i8s"; + rev = "77853c3ff98a868dcbbdfa4eb8f0e659b57993ff"; + sha256 = "14v90gchmpl1nkiic3f3kiz8akbw2wmpish794xakvz63iys703y"; }; meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; @@ -6087,12 +6087,12 @@ let vim-racer = buildVimPluginFrom2Nix { pname = "vim-racer"; - version = "2020-06-18"; + version = "2020-10-21"; src = fetchFromGitHub { owner = "racer-rust"; repo = "vim-racer"; - rev = "250e9fd496edde1516a5e68e9837ccf5e46cc895"; - sha256 = "1ar5wv776xslxrs2mmxr5kzz5pp4a4v8jydh9s6cqbfzglgr9kw5"; + rev = "4c8b8843de2bbf4a6b44a570f284534d5e75a989"; + sha256 = "1rkp75q0m8w9br35nngdbdlvfpha4x4yilaff40d62mcmb8xmhvj"; }; meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; @@ -6339,12 +6339,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2020-08-06"; + version = "2020-10-25"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "db486eaa39f14d130ddf6338aaa02127aa04b272"; - sha256 = "1x9vflsbdl1b03irkvfpapb0c4mw9lymfghcjy1wxjl2vpq630ia"; + rev = "4e319f2bde4e65ab2f21719cb5c0371221d19f51"; + sha256 = "01zjg2r103p543lcyrkssw6agrj58m1ymqhf7fbzhpra9ykdpsp6"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -6399,24 +6399,24 @@ let vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2020-03-27"; + version = "2020-10-02"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "b80367fefc2188c9d6c4a9eb1830360b09e13476"; - sha256 = "0qq81hcavmaq76r38qfy1cxlmhj0aswbd41k2k9fyzilzq4r0bg8"; + rev = "68eebf9dabe5c1d1964e78dda188765f224bab34"; + sha256 = "1mxa373ry17zwszd089k99lbgr5pg46x5dlahpk0l68ksxpkbxir"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-10-01"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "78a9ca0fa3e4d16b73f5f642ec56298b7fec7803"; - sha256 = "1k4rvkbfixp1yi5gz8kffnq7k7xd7bc5cb521jb6h0z6f74qrk70"; + rev = "d48c1e2dae8f40391b2bd4b4daf97527c4d75130"; + sha256 = "04dmcikkxlx2vm3lnhw94nw59wi4x1yf27k6j85a0lifwgra1a2m"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6483,12 +6483,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2020-04-18"; + version = "2020-10-07"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "593388d3dbe7bfdcc06a714550d3253442b2fc65"; - sha256 = "1k0sgx8r3gi3k4ira1ilvc1jmj0k5apiv7x71dqnh41gfrz1i12h"; + rev = "f2fc11844b234479d37bef37faa7ceb2aade788b"; + sha256 = "18n16hpkqadq18gpgppbr4s516jpc8qwd357vb2c7069q79kfx39"; }; meta.homepage = "https://github.com/mhinz/vim-startify/"; }; @@ -6567,12 +6567,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-08-19"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "3476c4e517aa86bc131c707d32f2e508bd5be468"; - sha256 = "0vglazxlsg7ai4c5znxaddpjnfhz6a9slzs0kzzqvmhd3xr7vfg1"; + rev = "659ba4f39caa38e6913f88c9f4369c00e852160f"; + sha256 = "0fqj9l7i052mvw0wlyg30bmihzi937svk3ggsp0rc9wlr30frg2p"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -6603,12 +6603,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-09-23"; + version = "2020-10-10"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "f77a07617a649684148de97e5a9115e659166f6a"; - sha256 = "01rgbiddczyx56b6fha6jgxmr0kfhjz8d9rmbfnqlnynmy5545ic"; + rev = "6fd491d6a2ae40fef3aa6c414e096ce07664f030"; + sha256 = "0iczgn4ifhlzszgwv1w43w7qzrf1pp8zpfv4vdpm82mli58xlnhc"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -6628,12 +6628,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-09-29"; + version = "2020-10-22"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "fd9fb9b29c265d86fa30c672df1fea9a5a757860"; - sha256 = "0qhjmpamhk89h9hjzwc9j88yngf945fk5jd9015qajfk0l15k8x9"; + rev = "58dde91c0477fa58d18d5c0fde10b2a60a526b0f"; + sha256 = "1l23fb1q86ikrz8dg4n23l7bqp1xa68fwdhv0j0by73ymcp4zn1s"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -6748,12 +6748,12 @@ let vim-tmux-focus-events = buildVimPluginFrom2Nix { pname = "vim-tmux-focus-events"; - version = "2019-12-09"; + version = "2020-10-05"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; - rev = "e80960715c09aef8ab9204848ed1683805a93a33"; - sha256 = "0ds6qw2i1r67jhxh9ff36al45bafsmbxxdc127l6iy2vl5wj0d3d"; + rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941"; + sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1"; }; meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; @@ -6832,12 +6832,12 @@ let vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2020-09-07"; + version = "2020-10-06"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "c0edb8a684f624d6f177c2625fc9db617a3d539f"; - sha256 = "13fm3mgnvbhm93cn0jglnqm8hhmwvh5xg088pn5wmwrn9bjj00gz"; + rev = "efe1d29979bd2b65d22cf49f08524d6e27e5244b"; + sha256 = "0xqn39apmy6d8vqzbzvv6ic7p2pd5lpdgd4jay1afg2q73yi1rbv"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; @@ -6916,24 +6916,24 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-09-23"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "ec25ffcdf793dd5af6d73ce75d21709a60a4689f"; - sha256 = "07gkygdspxn0fwlgcyhli85nlgg8g4y4v991n80vmk0rhsxqdh90"; + rev = "562cabf644314c97224a025ad2594a47966e6207"; + sha256 = "1i1b8la3w9x8lay63kqx958k4csxnqmdw9bfmhyh2vf1p0cdqv6l"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2020-08-19"; + version = "2020-10-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "4a076bea73e307738ac5d08f60a0936cab391efd"; - sha256 = "1jx6ijmj48ffymfn20d0syp1ywv19gmjvf3hb6rdwsk421y58chv"; + rev = "383573b9b07fd37caf98247dfdbb1d4711eecee9"; + sha256 = "1kavjyr53cbg630snri2x94f7h80p2vl6vlskqfwi3djfdvn68x6"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -6976,24 +6976,24 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-09-29"; + version = "2020-10-02"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "641df563764d68454ab752a6815d783c452274be"; - sha256 = "00wn2jvjazkjagf4bfpz3fh7xh2w495qn8kilz89lab6pvzx79rp"; + rev = "30c0810b012a7acdccc6b72f0e99c0388986844f"; + sha256 = "18rflksd58mwkq0lc64frfimj1l1k8cc0l45jpv0z4w118v92jyv"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; vim-wordy = buildVimPluginFrom2Nix { pname = "vim-wordy"; - version = "2019-11-22"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-wordy"; - rev = "f0391713fa83771d64b065868331ef4754d861ed"; - sha256 = "0v5cl3rrg2vrdb2al67hbh730rw8m2zvhb1vippv64k65mknkgp5"; + rev = "667426a0171787b2620dffa5b2d7c01c9040237f"; + sha256 = "1lcrisv2wcd8iw76prql03wd11jgmknm3rvbcw7vv4v5r2s9rv5z"; }; meta.homepage = "https://github.com/reedes/vim-wordy/"; }; @@ -7012,12 +7012,12 @@ let vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2020-05-22"; + version = "2020-10-07"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "f54fd6a7357d43a8773313504da72d1bd96d6f1a"; - sha256 = "0542prcclaw6s4f6dlp0ywz5zp10brb7br7hx4lhhizslcakg09v"; + rev = "8fb3d07e5c9809f292dddb034db2c02d649b29fb"; + sha256 = "08j0r68ps4jisgbx6lg2vz3wxyx7yzrklsi112bqjxizxjpjb132"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -7120,12 +7120,12 @@ let vimoutliner = buildVimPluginFrom2Nix { pname = "vimoutliner"; - version = "2020-02-09"; + version = "2020-10-26"; src = fetchFromGitHub { owner = "vimoutliner"; repo = "vimoutliner"; - rev = "1031b16e6b0069229fe0f33a66489f81174fa4d9"; - sha256 = "1gn21b8yr0bjg0y1nidk13zcl4f6z8wkrxncgkd1hlc14d99jkg0"; + rev = "d198aa72c70270f1330f4237bbf853efaaa79723"; + sha256 = "05wcqs36qn8f3vcy9xi2cf0yyp7yzawlxqvpjhbad6lm52vzsabs"; }; meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; @@ -7180,12 +7180,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-09-27"; + version = "2020-10-23"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "692a0d8d39bfbd048119df9644e4b2fab2e01abe"; - sha256 = "1msf62l8bvcgk0g5rknfy44kjfh0r081y78xi15xyyc1mibpvx06"; + rev = "7b048367f7d4921e4eeea1bb82e6f368b418d89a"; + sha256 = "0n1kqiki5gag7nd5c5gmnv6czv90kzsfndbb92n3wzvwxhpf1ff6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7193,12 +7193,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-09-29"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "bfdaec19bf236fad1c9c192a0cf43e299cf1682a"; - sha256 = "12z29gs9h81rv0w3zm49r4b4s3bj0gzqxl5x1gyjk7pijvnnxfbg"; + rev = "eb7d89178319fd21601d2fe057e3f7cae2130b74"; + sha256 = "14gj3n54q475cw9j6h12ir3lynn048829zjrb6nyhrzplikhpc9n"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7241,12 +7241,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-09-29"; + version = "2020-10-10"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "bcb50336188074c9cfc1aad4b463f4c0e698a68c"; - sha256 = "0kckpj2v0yabp7hz9a6qdh8vspdn6fldk2q1pygyn35bii8x86dh"; + rev = "27889ff58d4340167bb8dd4abbe9ff4a8869da8f"; + sha256 = "1asc8fqyv6rfmdd0g5n78mzzssn7rcanzy2d30gddgfa3gr65yms"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7361,12 +7361,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-09-27"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "7c904cf443f5fd4900e1b4aad6dba6af96b4a395"; - sha256 = "0ap2jh0j5ssv1mv51syvw2y7352ydf4qmk3s7f2rlcq3nba3y6rr"; + rev = "0635a855ff1c56073d5e372001a3843e15c8aedb"; + sha256 = "0883lz5sv4w38awwxgff8lx2n1fcy6lw6dd1f8zkambvd7n4v19l"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -7374,12 +7374,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-09-30"; + version = "2020-10-25"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "12376a7b179939612f834735f50015436e30c6e7"; - sha256 = "0caf6xd9gxx136gi92hnw0myfil74wh3qg264ykfd0km34lysf3h"; + rev = "dd61ad7a101e0c0467f2c9942c7cbd3f31f6a06b"; + sha256 = "0xjy6zpz02db5fcwwpdw3kp7kjgrvhlm3bk62syn0hxjghgd7pyb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7423,24 +7423,24 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-09-20"; + version = "2020-10-09"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "9979e503e675b432c55a83891238c631f7f16a01"; - sha256 = "05cmc3173yscmk2r976280z53z3z7v8ysyy4i0z4v998l804hq5c"; + rev = "fa5f6d7c5be47bd32dcc69ccf980fc585575cc38"; + sha256 = "0szrnp27ccl93fbn1j9ybsld1l6j3xdrnx6dsf01gdxidm3w60f3"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zoomwintab-vim = buildVimPluginFrom2Nix { pname = "zoomwintab-vim"; - version = "2020-04-10"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "troydm"; repo = "zoomwintab.vim"; - rev = "63a70b9e12617d6565a0489c68efe44708d19cf8"; - sha256 = "1dsi2d6wrv5x6w2hrrjzqivsspxxav0hdj0pymml6gry2jcbj4s9"; + rev = "3b33368ed2ff6138d07f7ee148306cce7d7f6b7c"; + sha256 = "0jx6860ajw50fn0l5p3dm3fcfwklqs1lf22yyrb09iljavixj777"; }; meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; From bcec9042d55218b72550244d45b093e4a92877f6 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Wed, 28 Oct 2020 13:46:39 -0700 Subject: [PATCH 075/294] vimPlugins: resolve github repository redirects --- pkgs/misc/vim-plugins/generated.nix | 4 ++-- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index cd36f40f2792..ded185a30e77 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1958,12 +1958,12 @@ let pname = "lsp_extensions-nvim"; version = "2020-10-19"; src = fetchFromGitHub { - owner = "tjdevries"; + owner = "nvim-lua"; repo = "lsp_extensions.nvim"; rev = "85ce064c36b93cd8856d6dfc41ea5089764ec1c6"; sha256 = "0vljxb9cvq042f70cq01n5mf2vd2wg2qpj75nlva9rjhiw9q3qw8"; }; - meta.homepage = "https://github.com/tjdevries/lsp_extensions.nvim/"; + meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; lushtags = buildVimPluginFrom2Nix { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2b1d6337f665..0d0eec878e08 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -369,6 +369,7 @@ numirias/semshi nvie/vim-flake8 nvim-lua/completion-nvim nvim-lua/diagnostic-nvim +nvim-lua/lsp_extensions.nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter ocaml/vim-ocaml @@ -494,7 +495,6 @@ thirtythreeforty/lessspace.vim thosakwe/vim-flutter tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl -tjdevries/lsp_extensions.nvim tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux From 7fd9976af3ee5c952f931e98b785608f0d0aa44c Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Wed, 28 Oct 2020 13:47:00 -0700 Subject: [PATCH 076/294] vimPlugins: document update proces --- doc/languages-frameworks/vim.section.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 8e4826232e1a..84ad567e8c21 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -265,6 +265,20 @@ To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This sc Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of Language Server Protocol integration with vim/neovim. +## Updating plugins in nixpkgs + +Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token). + +```sh +GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py +``` + +Alternatively, set the number of processes to a lower count to avoid rate-limiting. + +```sh +./pkgs/misc/vim-plugins/update.py --proc 1 +``` + ## Important repositories - [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository From 0dc7ad6f1fc3c8cd5164cb19468162c0c498e523 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Wed, 28 Oct 2020 17:37:39 -0400 Subject: [PATCH 077/294] bluejeans: 2.4.0 -> 2.17.0.11 (#101973) --- .../networking/instant-messengers/bluejeans/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index f8bcdc4bef7c..8b6348340587 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -39,11 +39,12 @@ stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.4.0"; + version = "2.17.0"; + buildNumber = "11"; src = fetchurl { - url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm"; - sha256 = "180hc854ngwfn6y6nsrfn74rv78cxhq6sgshrca5zqv6wq3l98g0"; + url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm"; + sha256 = "1h5jbnp5bwy6bpma9a1ia08v7bpz09fm66jsip470k1r7vjjwa68"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; From 5a6acc6a7fc89ef0f7d92751d3da71a195d5bc3f Mon Sep 17 00:00:00 2001 From: Matthew Piziak Date: Wed, 28 Oct 2020 17:38:40 -0400 Subject: [PATCH 078/294] tdlib: 1.6.0 -> 1.6.9 fix hash version 1.6.9 is not released, so use revision hash add a comment to the rev about why we are not using `v${version}` anymore --- pkgs/development/libraries/tdlib/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 06909c078609..80defd4a5439 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -7,7 +7,13 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tdlib"; repo = "td"; + + # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision hash because 1.6.9 + # is not a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`. + # Please return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow + # `nixpkgs-update` to update the package automatically. rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01"; + sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n"; }; From 263c9eabef60fe1513e024a2ddf953b1109dd04c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 29 Oct 2020 08:33:31 +1000 Subject: [PATCH 079/294] fzf: 0.24.0 -> 0.24.1 https://github.com/junegunn/fzf/releases/tag/0.24.1 --- pkgs/tools/misc/fzf/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 86819d77a9e4..6bd7f1ac3ed4 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "0a1jhlkv6z5msw8p3wccy3axwpdvpnri6qps9fmvz57gfm9a3jmr"; + sha256 = "03f9fdqicw1a2hcjiasya0dq72jvdz6fqw7dfig4kv5l14pwf3v9"; }; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; @@ -19,7 +19,9 @@ buildGoModule rec { buildInputs = [ ncurses ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + buildFlagsArray = [ + "-ldflags=-s -w -X main.version=${version} -X main.revision=${src.rev}" + ]; # The vim plugin expects a relative path to the binary; patch it to abspath. patchPhase = '' From a30a084b371a364f684adaed66fbab83324a6a56 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 28 Oct 2020 22:42:07 +0000 Subject: [PATCH 080/294] gopls: don't build integration tests or documentation generator (#101641) Not only are these not used, but they also have super generic names, which is confusing when they appear on the path, and possibly leads to conflicts with other binaries. --- pkgs/development/tools/gopls/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 66582969714f..290500376e85 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -15,6 +15,9 @@ buildGoModule rec { doCheck = false; + # Only build gopls, and not the integration tests or documentation generator. + subPackages = [ "." ]; + meta = with stdenv.lib; { description = "Official language server for the Go language"; homepage = "https://github.com/golang/tools/tree/master/gopls"; From 0d41c9a9c623b62ce5f700d2d7bd36eb970f9b4e Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Thu, 29 Oct 2020 01:43:24 +0300 Subject: [PATCH 081/294] buildkite-agent: 3.17.0 -> 3.25.0, use buildGoModule, add darwin to platforms (#101954) --- .../buildkite-agent/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index ceaa704b565c..97f75a99c079 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,8 +1,8 @@ -{ fetchFromGitHub, stdenv, buildGoPackage, +{ fetchFromGitHub, stdenv, buildGoModule, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: -buildGoPackage rec { +buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.17.0"; + version = "3.25.0"; goPackagePath = "github.com/buildkite/agent"; @@ -10,17 +10,18 @@ buildGoPackage rec { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "0a7x919kxnpdn0pnhc5ilx1z6ninx8zgjvsd0jcg4qwh0qqp5ppr"; + sha256 = "VxAGi2NpXpc3U+GNIvGJSkdHGODrX2s8oY+dQ8QXIHQ="; }; + + vendorSha256 = "X1K6uKiMFXTDT1PcedGQ8HLGox8ePP7Cz0Ihf4m9ts8="; + postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash ''; nativeBuildInputs = [ makeWrapper ]; - # on Linux, the TMPDIR is /build which is the same prefix as this package - # remove once #35068 is merged - noAuditTmpdir = stdenv.isLinux; + doCheck = false; postInstall = '' # Fix binary name @@ -43,6 +44,6 @@ buildGoPackage rec { homepage = "https://buildkite.com/docs/agent"; license = licenses.mit; maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; - platforms = platforms.unix; + platforms = with platforms; unix ++ darwin; }; } From 12314c6299b3f6370279246c01994663c7a96f93 Mon Sep 17 00:00:00 2001 From: Matthew Piziak Date: Wed, 28 Oct 2020 18:44:02 -0400 Subject: [PATCH 082/294] tdlib: 1.6.0 -> 1.6.9 fix hash version 1.6.9 is not released, so use revision hash add a comment to the rev about why we are not using `v${version}` anymore use unstable-2020-10-25 --- pkgs/development/libraries/tdlib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 80defd4a5439..f430b10c64c0 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { owner = "tdlib"; repo = "td"; - # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision hash because 1.6.9 - # is not a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`. - # Please return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow + # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision because 1.6.9 is not + # a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`. Please + # return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow # `nixpkgs-update` to update the package automatically. - rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01"; + rev = "unstable-2020-10-25"; sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n"; }; From da519e3a2b74d6506aeb461369f35307581c40da Mon Sep 17 00:00:00 2001 From: Scriptkiddi Date: Wed, 28 Oct 2020 19:21:49 +0100 Subject: [PATCH 083/294] python3Packages.python-jose: 3.1.0 -> 3.2.0 --- .../python-modules/python-jose/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 09a424583110..6b8104516ea9 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "python-jose"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "mpdavis"; repo = "python-jose"; rev = version; - sha256 = "1gnn0zy03pywj65ammy3sd07knzhjv8n5jhx1ir9bikgra9v0iqh"; + sha256 = "cSPIZrps0xFd4pPcQ4w/jFWOk2XYgd3mtE/sDzlytvY="; }; checkInputs = [ @@ -23,6 +23,13 @@ buildPythonPackage rec { cryptography # optional dependency, but needed in tests ]; + # relax ecdsa deps + patchPhase = '' + substituteInPlace setup.py \ + --replace 'ecdsa<0.15' 'ecdsa' \ + --replace 'ecdsa <0.15' 'ecdsa' + ''; + disabledTests = [ # https://github.com/mpdavis/python-jose/issues/176 "test_key_too_short" From aa94abac64d19f3b23d4f86be492b1400641337d Mon Sep 17 00:00:00 2001 From: Scriptkiddi Date: Wed, 28 Oct 2020 19:22:17 +0100 Subject: [PATCH 084/294] python3Packages.pycognito: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/pycognito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index 8101b76b62cf..a30c1cd344b4 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pycognito"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "pvizeli"; repo = "pycognito"; rev = version; - sha256 = "0wy6d274xda7v6dazv10h2vwig2avfyz8mh2lpd1a5k7i06r335r"; + sha256 = "HLzPrRon+ipcUZlD1l4nYSwSbdDLwOALy4ejGunjK0w="; }; postPatch = '' From da2e83490c96890356db09e3aa8aaf741ac6f157 Mon Sep 17 00:00:00 2001 From: Scriptkiddi Date: Wed, 28 Oct 2020 19:22:32 +0100 Subject: [PATCH 085/294] python3Packages.hass-nabucasa: 0.34.6 -> 0.37.1 --- .../python-modules/hass-nabucasa/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 61c63b28ab60..6ecd91580931 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.34.6"; + version = "0.37.1"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "1lkqwj58qr0vn7zf5mhrhaz973ahj9wjp4mgzvyja1gcdh6amv34"; + sha256 = "/GFNrLi1I69gUDIwnHa2q/pxkiRl9PKxpKtb56JrmuA="; }; postPatch = '' @@ -18,24 +18,12 @@ buildPythonPackage rec { sed -i 's/"cryptography.*"/"cryptography"/' setup.py ''; - patches = [ - # relax pytz dependency - (fetchpatch { - url = "https://github.com/NabuCasa/hass-nabucasa/commit/419e80feddc36c68384c032feda0057515b53eaa.patch"; - sha256 = "14dgwci8615cwcf27hg7b42s7da50xhyjys3yx446q7ipk8zw4x6"; - }) - ]; - propagatedBuildInputs = [ acme aiohttp atomicwrites snitun attrs warrant pycognito ]; checkInputs = [ pytest pytest-aiohttp asynctest ]; - # Asynctest's mocking is broken with python3.8 - # https://github.com/Martiusweb/asynctest/issues/132 - doCheck = pythonOlder "3.8"; - checkPhase = '' pytest tests/ ''; From 437dc4c047b9d7c5c8932ec6587fccb9793cac2a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 28 Oct 2020 23:24:01 +0000 Subject: [PATCH 086/294] zstd: Fix MinGW build --- pkgs/tools/compression/zstd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 8ce434741a55..c26ca507525f 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ bash ]; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix bash; patches = [ ./playtests-darwin.patch @@ -72,7 +72,9 @@ stdenv.mkDerivation rec { --replace "zstdcat" "$bin/bin/zstdcat" ''; - outputs = [ "bin" "dev" "man" "out" ]; + outputs = [ "bin" "dev" ] + ++ stdenv.lib.optional stdenv.hostPlatform.isUnix "man" + ++ [ "out" ]; meta = with stdenv.lib; { description = "Zstandard real-time compression algorithm"; From 9bb8fdf84299ab43bc030d6128eb22037c221eed Mon Sep 17 00:00:00 2001 From: Scriptkiddi Date: Tue, 27 Oct 2020 12:52:41 +0100 Subject: [PATCH 087/294] teleprompter: 2.3.4 -> 2.4.0 --- pkgs/applications/misc/teleprompter/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/teleprompter/default.nix b/pkgs/applications/misc/teleprompter/default.nix index 37b3f10329b9..96265356ead7 100644 --- a/pkgs/applications/misc/teleprompter/default.nix +++ b/pkgs/applications/misc/teleprompter/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, electron_4, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}: +{ lib, stdenv, fetchurl, electron_10, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}: let - electron = electron_4; + electron = electron_10; in stdenv.mkDerivation rec { pname = "teleprompter"; - version = "2.3.4"; + version = "2.4.0"; src = fetchurl { - url = "mirror://sourceforge/teleprompter-imaginary-films/imaginary-${pname}-${version}-64bit.tar.gz"; - sha256 = "084ml2l3qg46bsazaapyxdx4zavvxp0j4ycsdpdwk3f94g9xb120"; + url = "https://github.com/ImaginarySense/Imaginary-Teleprompter-Electron/releases/download/${lib.versions.majorMinor version}/imaginary-teleprompter-${version}.tar.gz"; + sha256 = "bgdtK8l5d26avv1WUw9cfOgZrIL1q/a9890Ams4yidQ="; }; dontBuild = true; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The most complete, free, teleprompter app on the web"; - license = [ licenses.gpl3 ]; + license = [ licenses.gpl3Plus ]; homepage = "https://github.com/ImaginarySense/Teleprompter-Core"; platforms = platforms.linux; maintainers = with maintainers; [ Scriptkiddi ]; From 09bbd4017fa5a6c76cc586b331a439c2ab7c9556 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Oct 2020 01:13:01 +0100 Subject: [PATCH 088/294] grafana-loki: 1.6.1 -> 2.0.0 Convert to use buildGoModule and add a patch for a test failing on golang>=1.15. --- pkgs/servers/monitoring/loki/default.nix | 30 ++++++++++++++---------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index ec9d56f2cbb7..c4bfeed8c88d 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,24 +1,28 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, systemd, fetchpatch }: -buildGoPackage rec { - version = "1.6.1"; +buildGoModule rec { + version = "2.0.0"; pname = "grafana-loki"; - goPackagePath = "github.com/grafana/loki"; - - doCheck = true; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "0bakskzizazc5cd6km3n6facc5val5567zinnxg3yjy29xdi64ww"; + sha256 = "09a0mqdmk754vigd1xqijzwazwrmfaqcgdr2c6dz25p7a65568hj"; }; - postPatch = '' - substituteInPlace pkg/distributor/distributor_test.go --replace \ - '"eth0", "en0", "lo0"' \ - '"lo"' - ''; + vendorSha256 = null; + + subPackages = [ "..." ]; + + patches = [ + (fetchpatch { + # Fix expected return value in Test_validateDropConfig + # https://github.com/grafana/loki/issues/2519 + url = "https://github.com/grafana/loki/commit/1316c0f0c5cda7c272c4873ea910211476fc1db8.patch"; + sha256 = "06hwga58qpmivbhyjgyqzb75602hy8212a4b5vh99y9pnn6c913h"; + }) + ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; @@ -28,6 +32,8 @@ buildGoPackage rec { --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; + doCheck = true; + meta = with stdenv.lib; { description = "Like Prometheus, but for logs"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a81c1fcf146..09687d62f7c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16565,9 +16565,7 @@ in grafana = callPackage ../servers/monitoring/grafana { }; - grafana-loki = callPackage ../servers/monitoring/loki { - buildGoPackage = buildGo114Package; - }; + grafana-loki = callPackage ../servers/monitoring/loki { }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; From 7a498aba3e892b5d3239667efd165e6ca004a9d6 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 29 Oct 2020 00:30:32 +0100 Subject: [PATCH 089/294] monero: 0.17.1.0 -> 0.17.1.1 --- pkgs/applications/blockchains/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 7d55a5f6f34c..29acbd0f37b3 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.0"; + version = "0.17.1.1"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "1cngniv7sndy8r0fcfgk737640k53q3kwd36g891p5igcb985qdw"; + sha256 = "18x27dm24k04vx0yz57zi02rk0wrmbn4wr8alqf48dq6z9wr0fhp"; fetchSubmodules = true; }; From 79a81f81aa5d5f34e001bbee62e639ed02b5c2d3 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 29 Oct 2020 00:30:45 +0100 Subject: [PATCH 090/294] monero-gui: 0.17.1.0 -> 0.17.1.1 --- pkgs/applications/blockchains/monero-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index c079fa88a703..431d667d1534 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.0"; + version = "0.17.1.1"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "07r78ipv4g3i6z822kq380vi3qwlb958rccsy6lyybkhj9y0rx84"; + sha256 = "0aqhp4rmqsgwjb875kgh6qwz0wyyiag1fksyic9cnhgg5j5y95nx"; }; nativeBuildInputs = [ From 9f05c50be198a396eb6c555fc239a2e0da42c9a5 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 29 Oct 2020 00:38:45 +0000 Subject: [PATCH 091/294] libarchive: Fix Windows build --- pkgs/development/libraries/libarchive/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index d1917de37d6a..3c97ce21ce07 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -2,8 +2,10 @@ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, - # Optional but increases closure only negligibly. - xarSupport ? true, + # Optional but increases closure only negligibly. Also, while libxml2 + # builds fine on windows, but libarchive has trouble linking windows + # things it depends on for some reason. + xarSupport ? stdenv.hostPlatform.isUnix, }: assert xarSupport -> libxml2 != null; @@ -22,7 +24,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ sharutils zlib bzip2 openssl xz lzo zstd ] + buildInputs = + stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils + ++ [ zlib bzip2 openssl xz lzo zstd ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] ++ stdenv.lib.optional xarSupport libxml2; From 5b5aac40d5675f04f6b0d987dd75e20337d487e0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 28 Oct 2020 12:34:17 -0300 Subject: [PATCH 092/294] Terminal emulators: whitespace cleanup and regroup Because editorconfig complains, and also why not to organize them "ascii-betically"? --- .../urxvt-vtwheel/default.nix | 4 +- .../rxvt-unicode/wrapper.nix | 2 +- pkgs/top-level/all-packages.nix | 202 +++++++++--------- 3 files changed, 105 insertions(+), 103 deletions(-) diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix index aebbedacef64..eb520f38bedb 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; }; - + installPhase = '' sed -i 's|#! perl|#! ${perl}/bin/perl|g' vtwheel mkdir -p $out/lib/urxvt/perl @@ -23,5 +23,5 @@ stdenv.mkDerivation { maintainers = with maintainers; [ danbst ]; platforms = with platforms; unix; }; - + } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index 38978799b5a8..b03acb99530a 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -29,7 +29,7 @@ let # This provides simple way to customize urxvt using # the `.override` mechanism. wrapper = { configure, ... }: - let + let config = configure { inherit availablePlugins; }; plugins = config.plugins or (builtins.attrValues availablePlugins); extraDeps = config.extraDeps or [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad7eb42b128d..47d2c9c7fc7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -669,11 +669,113 @@ in albert = libsForQt5.callPackage ../applications/misc/albert {}; + ### APPLICATIONS/TERMINAL-EMULATORS + alacritty = callPackage ../applications/terminal-emulators/alacritty { inherit (xorg) libXcursor libXxf86vm libXi; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; + aminal = callPackage ../applications/terminal-emulators/aminal { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; + }; + + cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; + + eterm = callPackage ../applications/terminal-emulators/eterm { }; + + evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); + + foot = callPackage ../applications/terminal-emulators/foot { }; + + guake = callPackage ../applications/terminal-emulators/guake { }; + + havoc = callPackage ../applications/terminal-emulators/havoc { }; + + hyper = callPackage ../applications/terminal-emulators/hyper { }; + + iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; + + kitty = callPackage ../applications/terminal-emulators/kitty { + harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; + }; + + lilyterm = callPackage ../applications/terminal-emulators/lilyterm { + inherit (gnome2) vte; + gtk = gtk2; + flavour = "stable"; + }; + + lilyterm-git = lilyterm.override { + flavour = "git"; + }; + + lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; + + microcom = callPackage ../applications/terminal-emulators/microcom { }; + + mlterm = callPackage ../applications/terminal-emulators/mlterm { + libssh2 = null; + openssl = null; + }; + + mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; + + nimmm = callPackage ../applications/terminal-emulators/nimmm { }; + + roxterm = callPackage ../applications/terminal-emulators/roxterm { }; + + rxvt = callPackage ../applications/terminal-emulators/rxvt { }; + + rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; + + rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; }; + + rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; + + sakura = callPackage ../applications/terminal-emulators/sakura { }; + + st = callPackage ../applications/terminal-emulators/st { + conf = config.st.conf or null; + patches = config.st.patches or []; + extraLibs = config.st.extraLibs or []; + }; + xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; + + stupidterm = callPackage ../applications/terminal-emulators/stupidterm { + gtk = gtk3; + }; + + terminator = callPackage ../applications/terminal-emulators/terminator { }; + + terminus = callPackage ../applications/terminal-emulators/terminus { }; + + termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { + termite = termite-unwrapped; + }; + termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; + + termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { + inherit (haskellPackages) ghcWithPackages; + }; + + tilda = callPackage ../applications/terminal-emulators/tilda { + gtk = gtk3; + }; + + tilix = callPackage ../applications/terminal-emulators/tilix { }; + + wayst = callPackage ../applications/terminal-emulators/wayst { }; + + x3270 = callPackage ../applications/terminal-emulators/x3270 { }; + + xterm = callPackage ../applications/terminal-emulators/xterm { }; + + xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {}; + + yaft = callPackage ../applications/terminal-emulators/yaft { }; + aldo = callPackage ../applications/radio/aldo { }; almanah = callPackage ../applications/misc/almanah { }; @@ -2976,8 +3078,6 @@ in cpcfs = callPackage ../tools/filesystems/cpcfs { }; - cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - coreutils = callPackage ../tools/misc/coreutils { }; coreutils-full = coreutils.override { minimal = false; }; coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; @@ -3431,8 +3531,6 @@ in wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - wayst = callPackage ../applications/terminal-emulators/wayst { }; - wev = callPackage ../tools/misc/wev { }; wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; @@ -5477,8 +5575,6 @@ in mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; - microcom = callPackage ../applications/terminal-emulators/microcom { }; - microserver = callPackage ../servers/microserver { }; midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; @@ -5830,8 +5926,6 @@ in nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; - nimmm = callPackage ../applications/terminal-emulators/nimmm { }; - nitrogen = callPackage ../tools/X11/nitrogen {}; nms = callPackage ../tools/misc/nms { }; @@ -7445,8 +7539,6 @@ in tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; - tilix = callPackage ../applications/terminal-emulators/tilix { }; - tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; tinycbor = callPackage ../development/libraries/tinycbor { }; @@ -8160,8 +8252,6 @@ in clipnotify = callPackage ../tools/misc/clipnotify { }; - x3270 = callPackage ../applications/terminal-emulators/x3270 { }; - xclip = callPackage ../tools/misc/xclip { }; xcur2png = callPackage ../tools/graphics/xcur2png { }; @@ -8248,8 +8338,6 @@ in yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yaft = callPackage ../applications/terminal-emulators/yaft { }; - yarn = callPackage ../development/tools/yarn { }; yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; @@ -20520,16 +20608,12 @@ in esniper = callPackage ../applications/networking/esniper { }; - eterm = callPackage ../applications/terminal-emulators/eterm { }; - eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; etesync-dav = callPackage ../applications/misc/etesync-dav {}; etherape = callPackage ../applications/networking/sniffers/etherape { }; - evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); - evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; exercism = callPackage ../applications/misc/exercism { }; @@ -20634,8 +20718,6 @@ in foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; - foot = callPackage ../applications/terminal-emulators/foot { }; - fossil = callPackage ../applications/version-management/fossil { }; freebayes = callPackage ../applications/science/biology/freebayes { }; @@ -20927,8 +21009,6 @@ in gcalcli = callPackage ../applications/misc/gcalcli { }; - havoc = callPackage ../applications/terminal-emulators/havoc { }; - vcal = callPackage ../applications/misc/vcal { }; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; @@ -21146,8 +21226,6 @@ in gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { }; - guake = callPackage ../applications/terminal-emulators/guake { }; - guardian-agent = callPackage ../tools/networking/guardian-agent { }; guitone = callPackage ../applications/version-management/guitone { @@ -21250,8 +21328,6 @@ in hydroxide = callPackage ../applications/networking/hydroxide { }; - hyper = callPackage ../applications/terminal-emulators/hyper { }; - hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { inherit (haskellPackages) ghcWithPackages; packages = self: with self; []; @@ -21695,11 +21771,6 @@ in ffmpeg = ffmpeg_2; }; - kitty = callPackage ../applications/terminal-emulators/kitty { - harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; - }; - kiwix = callPackage ../applications/misc/kiwix { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; @@ -21929,16 +22000,6 @@ in jftui = callPackage ../applications/video/jftui { }; - lilyterm = callPackage ../applications/terminal-emulators/lilyterm { - inherit (gnome2) vte; - gtk = gtk2; - flavour = "stable"; - }; - - lilyterm-git = lilyterm.override { - flavour = "git"; - }; - lime = callPackage ../development/libraries/lime { }; luakit = callPackage ../applications/networking/browsers/luakit { @@ -22259,8 +22320,6 @@ in mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; - mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - mtpaint = callPackage ../applications/graphics/mtpaint { }; mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { }; @@ -23210,14 +23269,6 @@ in runc = callPackage ../applications/virtualization/runc {}; - rxvt = callPackage ../applications/terminal-emulators/rxvt { }; - - rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; - - rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; - - rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; }; - uade123 = callPackage ../applications/audio/uade123 {}; udevil = callPackage ../applications/misc/udevil {}; @@ -23226,8 +23277,6 @@ in sacc = callPackage ../applications/networking/gopher/sacc { }; - sakura = callPackage ../applications/terminal-emulators/sakura { }; - sameboy = callPackage ../misc/emulators/sameboy { }; sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; @@ -23324,10 +23373,6 @@ in ncurses = ncurses5; }; - stupidterm = callPackage ../applications/terminal-emulators/stupidterm { - gtk = gtk3; - }; - styx = callPackage ../applications/misc/styx { }; tecoc = callPackage ../applications/editors/tecoc { }; @@ -23338,14 +23383,6 @@ in sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; - st = callPackage ../applications/terminal-emulators/st { - conf = config.st.conf or null; - patches = config.st.patches or []; - extraLibs = config.st.extraLibs or []; - }; - - xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; - stag = callPackage ../applications/misc/stag { curses = ncurses; }; @@ -23678,22 +23715,8 @@ in terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; - terminator = callPackage ../applications/terminal-emulators/terminator { }; - - terminus = callPackage ../applications/terminal-emulators/terminus { }; - tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; - lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; - - aminal = callPackage ../applications/terminal-emulators/aminal { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; - }; - - termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - - termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; - termtosvg = callPackage ../tools/misc/termtosvg { }; inherit (callPackage ../applications/graphics/tesseract {}) @@ -23737,10 +23760,6 @@ in tig = gitAndTools.tig; - tilda = callPackage ../applications/terminal-emulators/tilda { - gtk = gtk3; - }; - timbreid = callPackage ../applications/audio/pd-plugins/timbreid { fftw = fftwSinglePrec; }; @@ -24590,19 +24609,6 @@ in xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { }; - xterm = callPackage ../applications/terminal-emulators/xterm { }; - - mlterm = callPackage ../applications/terminal-emulators/mlterm { - libssh2 = null; - openssl = null; - }; - - roxterm = callPackage ../applications/terminal-emulators/roxterm { }; - - termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { - inherit (haskellPackages) ghcWithPackages; - }; - xtrace = callPackage ../tools/X11/xtrace { }; xtruss = callPackage ../tools/X11/xtruss { }; @@ -28128,8 +28134,6 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; - sccache = callPackage ../development/tools/misc/sccache { }; sequeler = callPackage ../applications/misc/sequeler { }; @@ -28193,8 +28197,6 @@ in houdini = callPackage ../applications/misc/houdini {}; - xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {}; - openfst = callPackage ../development/libraries/openfst {}; opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {}; From 7559a99131a41d23bc084863ef026e18547ac9df Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Thu, 15 Oct 2020 18:25:19 -0400 Subject: [PATCH 093/294] marker: init at 2020.04.04 --- pkgs/applications/editors/marker/default.nix | 49 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/editors/marker/default.nix diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix new file mode 100644 index 000000000000..758cb0c30eba --- /dev/null +++ b/pkgs/applications/editors/marker/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wrapGAppsHook +, gtk3 +, gtksourceview +, gtkspell3 +, webkitgtk +, pandoc +}: + +stdenv.mkDerivation rec { + pname = "marker"; + version = "2020.04.04"; + + src = fetchFromGitHub { + owner = "fabiocolacio"; + repo = "Marker"; + rev = "${version}"; + fetchSubmodules = true; + sha256 = "1iy7izyprf050bix8am1krqivgyxnhx3jm775v8f80cgbqxy7m5r"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + gtksourceview + gtkspell3 + webkitgtk + pandoc + ]; + + meta = with stdenv.lib; { + homepage = "https://fabiocolacio.github.io/Marker/"; + description = "Markdown editor for the Linux desktop"; + maintainers = with maintainers; [ trepetti ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + changelog = "https://github.com/fabiocolacio/Marker/releases/tag/${version}"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab0a1cf5c2f5..76e9a478108a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21187,6 +21187,8 @@ in lwm = callPackage ../applications/window-managers/lwm { }; + marker = callPackage ../applications/editors/marker { }; + musikcube = callPackage ../applications/audio/musikcube {}; pinboard-notes-backup = haskell.lib.overrideCabal From c69407d60608b239a8f90f04e66fc8f9aa91c7db Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Thu, 29 Oct 2020 04:49:39 +0100 Subject: [PATCH 094/294] gallery-dl: 1.15.1 -> 1.15.2 (#101977) * gallery-dl: 1.15.1 -> 1.15.2 --- pkgs/applications/misc/gallery-dl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ffe7d4ec47de..8135dce4d7a3 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.15.1"; + version = "1.15.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1pysh0gz3f3dxk5bfkzaii4myrgik396mf6vlks50inpbnslmqsl"; + sha256 = "0f2d1ixg0ir7ispxxggv378dc0m55k9y19075swf893maxf07f35"; }; propagatedBuildInputs = with python3Packages; [ requests ]; @@ -15,6 +15,7 @@ python3Packages.buildPythonApplication rec { pytestFlagsArray = [ # requires network access "--ignore=test/test_results.py" + "--ignore=test/test_downloader.py" ]; meta = { From 4d5c38797de0ef78aa4bca1fb2612fb14faab214 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 29 Oct 2020 05:51:18 +0200 Subject: [PATCH 095/294] gotools: 2020-04-21 -> 2020-10-27 (#101961) --- pkgs/development/tools/gotools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 11926b3b0c66..606092e8cdcb 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotools-unstable"; - version = "2020-04-21"; - rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; + version = "2020-10-27"; + rev = "eafbe7b904eb2418efc832e36ac634dc09084f10"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; + sha256 = "0884znfbm44f4ddjkm0g7qg2a257kwzv1ismd2m225f3c69n3mdg"; }; # The gopls folder contains a Go submodule which causes a build failure. @@ -25,7 +25,7 @@ buildGoModule rec { rm -rf gopls ''; - vendorSha256 = "0pplmqxrnc8qnr5708igx4dm7rb0hicvhg6lh5hj8zkx38nb19s0"; + vendorSha256 = "18qpjmmjpk322fvf81cafkpl3spv7hpdpymhympmld9isgzggfyz"; doCheck = false; From 2ccfc2962ea81b40dae4fc1f2b191ea6daba5284 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 22 Oct 2020 08:14:16 +0200 Subject: [PATCH 096/294] opa: build with OCaml 4.03 --- pkgs/development/compilers/opa/default.nix | 6 +++- .../compilers/opa/ocaml-4.03.patch | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/opa/ocaml-4.03.patch diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index c20e0d0ef991..864bb8e1b263 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3"; }; + patches = [ ./ocaml-4.03.patch ]; + # Paths so the opa compiler code generation will use the same programs as were # used to build opa. codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ]; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { patchShebangs . ( cat ./compiler/buildinfos/buildInfos.ml.pre - ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt + ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt echo let opa_git_version = ${version} echo 'let opa_git_sha = "xxxx"' cat ./compiler/buildinfos/buildInfos.ml.post @@ -34,6 +36,8 @@ stdenv.mkDerivation rec { done export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf + export OCAMLBUILD=${ocamlPackages.ocamlbuild}/bin/ocamlbuild + substituteInPlace _tags --replace ', warn_error_A' "" ''; prefixKey = "-prefix "; diff --git a/pkgs/development/compilers/opa/ocaml-4.03.patch b/pkgs/development/compilers/opa/ocaml-4.03.patch new file mode 100644 index 000000000000..5e2a3e2522e6 --- /dev/null +++ b/pkgs/development/compilers/opa/ocaml-4.03.patch @@ -0,0 +1,35 @@ +--- a/compiler/passes/surfaceAstRenaming.ml ++++ b/compiler/passes/surfaceAstRenaming.ml +@@ -1110,7 +1110,7 @@ let find_opt_local_or_global name all_env = + | None -> find_opt_global name all_env + | v -> v + +-let path_expr_to_module_aux p = function ++let path_expr_to_module_aux p : _ -> _ result = function + | Some (OpenedIdent (tree, ident, path)) -> + (match Tree.get_path_opt tree p with + (* the path is not in the tree, which means a 'dot' access +diff --git a/ocamllib/libbase/baseInt64.mli b/ocamllib/libbase/baseInt64.mli +index fb544706..734437f9 100644 +--- a/ocamllib/libbase/baseInt64.mli ++++ b/ocamllib/libbase/baseInt64.mli +@@ -40,7 +40,9 @@ external shift_right_logical : int64 -> int -> int64 = "%int64_lsr" + external of_int : int -> int64 = "%int64_of_int" + external to_int : int64 -> int = "%int64_to_int" + external of_float : float -> int64 = "caml_int64_of_float" ++ "caml_int64_of_float_unboxed" [@@unboxed] [@@noalloc] + external to_float : int64 -> float = "caml_int64_to_float" ++ "caml_int64_to_float_unboxed" [@@unboxed] [@@noalloc] + external of_int32 : int32 -> int64 = "%int64_of_int32" + external to_int32 : int64 -> int32 = "%int64_to_int32" + external of_nativeint : nativeint -> int64 = "%int64_of_nativeint" +@@ -48,7 +50,9 @@ external to_nativeint : int64 -> nativeint = "%int64_to_nativeint" + external of_string : string -> int64 = "caml_int64_of_string" + val to_string : int64 -> string + external bits_of_float : float -> int64 = "caml_int64_bits_of_float" ++ "caml_int64_bits_of_float_unboxed" [@@unboxed] [@@noalloc] + external float_of_bits : int64 -> float = "caml_int64_float_of_bits" ++ "caml_int64_float_of_bits_unboxed" [@@unboxed] [@@noalloc] + type t = int64 + val compare : t -> t -> int + external format : string -> int64 -> string = "caml_int64_format" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f70602bc361..104f8e8d4cb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9698,7 +9698,7 @@ in ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocaml-ng.ocamlPackages_4_02; + ocamlPackages = ocaml-ng.ocamlPackages_4_03; }; opaline = callPackage ../development/tools/ocaml/opaline { }; From 1b27fadae0f52c576942f9ea23312d878be655e5 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Thu, 29 Oct 2020 08:43:43 +0300 Subject: [PATCH 097/294] super-slicer: 2.2.54.1 -> 2.2.54.2 Signed-off-by: Vladimir Serov --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 1e8f9fc99528..2bc59e855a08 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -3,7 +3,7 @@ }: let appname = "SuperSlicer"; - version = "2.2.54.1"; + version = "2.2.54.2"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; override = super: { @@ -12,7 +12,7 @@ let src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-0NWrck9nqAlc8xX3nTrRlnzjso4MRRjJSW7bUvCX6Y4="; + sha256 = "sha256-ThmsxFXI1uReK+JwpHrIWzHpBdIOP77kDjv+QaK+Azk="; rev = version; }; From 8f897b0f9c47fd04e71221505e28225998310002 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 29 Oct 2020 08:34:13 +0100 Subject: [PATCH 098/294] pdns-recursor: 4.3.5 -> 4.4.0 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index d3b440f1d09a..df886ffe9dc9 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.3.5"; + version = "4.4.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0mggqi4588mg6vpgplk9b4ak6msdf279lxkblv563l2vjiyfmfcc"; + sha256 = "12z59xf63iskid08c3y55h238ma2chgvcbks0zprag7i00p97g06"; }; nativeBuildInputs = [ pkgconfig ]; From 438a67de33a02724d995c33fd9d46c59305582f3 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Thu, 29 Oct 2020 15:38:47 +0800 Subject: [PATCH 099/294] electrum-ltc: enable hardware wallets --- pkgs/applications/misc/electrum/ltc.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 2c6fb39fa433..7d6480b4696c 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -27,6 +27,8 @@ python3Packages.buildPythonApplication rec { dnspython jsonrpclib-pelix pysocks + trezor + btchip ]; preBuild = '' From b0a06f1786a6bba1e2b55be8c7570f003c4d82fb Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 29 Oct 2020 08:53:31 +0100 Subject: [PATCH 100/294] monero-gui: fixup of 7a498ab The INSTALL_PATH has been fixed upstream and this was causing the binary to be under $out/bin/bin/. --- pkgs/applications/blockchains/monero-gui/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 431d667d1534..8cd03f34286f 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -75,11 +75,7 @@ stdenv.mkDerivation rec { 'add_subdirectory(monero EXCLUDE_FROM_ALL)' ''; - preConfigure = '' - # because $out needs to be expanded - cmakeFlagsArray+=("-DCMAKE_INSTALL_PREFIX=$out/bin") - cmakeFlagsArray+=("-DARCH=${arch}") - ''; + cmakeFlags = [ "-DARCH=${arch}" ]; desktopItem = makeDesktopItem { name = "monero-wallet-gui"; From fe3041b879a27aa1d7c00c1363885adf8d366ae5 Mon Sep 17 00:00:00 2001 From: Even Brenden Date: Thu, 29 Oct 2020 09:26:00 +0100 Subject: [PATCH 101/294] jotta-cli: 0.6.24251 -> 0.7.33634 --- pkgs/applications/misc/jotta-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 70ca28b46783..a924bd181c0e 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.6.24251"; + version = "0.7.33634"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "0f26fg5fqpz0f6jxp72cj5f2kf76jah5iaqlqsl87250y0hm330g"; + sha256 = "0apbdk4fvmn52w9qyh6hvpk3k0sa810jvvndpsbysnlmi7gv5w62"; stripRoot = false; }; From bf62d8f6294d4520a47b0d8f7acdd45ae90435f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 08:31:05 +0000 Subject: [PATCH 102/294] android-udev-rules: 20200613 -> 20201003 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 946aa7beea41..b6fe86d1b26a 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20200613"; + version = "20201003"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "0cf5br8x6iwxc1cifv0i1klw7skgs8hghdx6qlqby68kyqg81bb2"; + sha256 = "07s5fdjbk5q4km6gz9759ngdavrqdgbnkd2b7z9z5lqw1q0b2422"; }; installPhase = '' From a3d3a1ec750fa5654e55131218015fdcd8d5ebd7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 08:39:11 +0000 Subject: [PATCH 103/294] atlantis: 0.15.0 -> 0.15.1 --- pkgs/applications/networking/cluster/atlantis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index d3e18ce691f1..15c5f0e97c4c 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atlantis"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "0nb0dm4yn6f5pw7clgb2d1khcwcxiidqyc0sdh38wwqg0zyil0cz"; + sha256 = "0xxg48f28ac7x6kap6w1hgsimdc604ivkck4dx7p5p7xd3s7gld5"; }; vendorSha256 = null; From 2eb161072503ac6d319ce6383e353c5225eb87b9 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 29 Oct 2020 09:50:26 +0100 Subject: [PATCH 104/294] neovimUtils: neovim utilities to handle more usecases Current nixpkgs always wraps neovim with the "-u" which has sideeffects as explained in https://github.com/NixOS/nixpkgs/issues/55376 : 1. vim won't set the variable $MYVIMRC as explained #34215 2. vim skips loading folder-specific .vimrc / .nvimrc I wanted to provide a way for users to better control what flags are used to wrap neovim. This is achived by introducing wrapNeovimUnstable et neovimUtils, utilities to help with that. We provide a compatibility layer so that wrapNeovim still works and to let us experiment with wrapNeovimUnstable to better control neovim configuration, plugin dependencies, haskell environment etc so that it becomes easier to generate per-project neovim config. With this commit, it's possible for instance for home-manager to wrap neovim without the `-u` and just write the config in the expected $XDG_CONFIG_HOME/nvim/init.vim . Expect wrapNeovimUnstable interface to evolve in the upcoming months. --- pkgs/applications/editors/neovim/utils.nix | 163 +++++++++++++++++++ pkgs/applications/editors/neovim/wrapper.nix | 128 +++------------ pkgs/top-level/all-packages.nix | 8 +- 3 files changed, 196 insertions(+), 103 deletions(-) create mode 100644 pkgs/applications/editors/neovim/utils.nix diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix new file mode 100644 index 000000000000..1c49f6e0fbe1 --- /dev/null +++ b/pkgs/applications/editors/neovim/utils.nix @@ -0,0 +1,163 @@ +{ lib +, vimUtils +, nodejs +, neovim-unwrapped +, bundlerEnv +, ruby +, pythonPackages +, python3Packages +, writeText +, wrapNeovimUnstable +}: +let + # returns everything needed for the caller to wrap its own neovim: + # - the generated content of the future init.vim + # - the arguments to wrap neovim with + # The caller is responsible for writing the init.vim and adding it to the wrapped + # arguments (["-u" writeText "init.vim" GENERATEDRC)]). + # This makes it possible to write the config anywhere: on a per-project basis + # .nvimrc or in $XDG_CONFIG_HOME/nvim/init.vim to avoid sideeffects. + # Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc wont be loaded + # anymore, $MYVIMRC wont be set etc + makeNeovimConfig = + { + withPython2 ? false + /* the function you would have passed to python.withPackages */ + , extraPython2Packages ? (_: [ ]) + , withPython3 ? true + /* the function you would have passed to python3.withPackages */ + , extraPython3Packages ? (_: [ ]) + , withNodeJs ? false + , withRuby ? true + + # same values as in vimUtils.vimrcContent + , configure ? { } + + # for forward compability, when adding new environments, haskell etc. + , ... + }: + let + rubyEnv = bundlerEnv { + name = "neovim-ruby-env"; + gemdir = ./ruby_provider; + postBuild = '' + ln -sf ${ruby}/bin/* $out/bin + ''; + }; + + + requiredPlugins = vimUtils.requiredPlugins configure; + getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ])); + + pluginPython2Packages = getDeps "pythonDependencies" requiredPlugins; + python2Env = pythonPackages.python.withPackages (ps: + [ ps.pynvim ] + ++ (extraPython2Packages ps) + ++ (lib.concatMap (f: f ps) pluginPython2Packages)); + + pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; + python3Env = python3Packages.python.withPackages (ps: + [ ps.pynvim ] + ++ (extraPython3Packages ps) + ++ (lib.concatMap (f: f ps) pluginPython3Packages)); + + + # Mapping a boolean argument to a key that tells us whether to add or not to + # add to nvim's 'embedded rc' this: + # let g:_host_prog=$out/bin/nvim- + # Or this: + # let g:loaded_${prog}_provider=1 + # While the latter tells nvim that this provider is not available + hostprog_check_table = { + node = withNodeJs; + python = withPython2; + python3 = withPython3; + ruby = withRuby; + }; + ## Here we calculate all of the arguments to the 1st call of `makeWrapper` + # We start with the executable itself NOTE we call this variable "initial" + # because if configure != {} we need to call makeWrapper twice, in order to + # avoid double wrapping, see comment near finalMakeWrapperArgs + makeWrapperArgs = + let + binPath = lib.makeBinPath (lib.optionals withRuby [ rubyEnv ] ++ lib.optionals withNodeJs [ nodejs ]); + + flags = lib.concatLists (lib.mapAttrsToList ( + prog: withProg: [ + "--cmd" (genProviderSettings prog withProg) + ] + ) + hostprog_check_table); + in + [ + "--argv0" "$0" "--add-flags" (lib.escapeShellArgs flags) + ] ++ lib.optionals withRuby [ + "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" + ] ++ lib.optionals (binPath != "") [ + "--suffix" "PATH" ":" binPath + ]; + + manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; }); + neovimRcContent = vimUtils.vimrcContent configure; + in + { + wrapperArgs = makeWrapperArgs; + inherit neovimRcContent; + inherit manifestRc; + inherit rubyEnv; + inherit python2Env; + inherit python3Env; + }; + + genProviderSettings = prog: withProg: + if withProg then + "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'" + else + "let g:loaded_${prog}_provider=1" + ; + + # to keep backwards compatibility + legacyWrapper = neovim: { + extraMakeWrapperArgs ? [] + , withPython ? true + /* the function you would have passed to python.withPackages */ + , extraPythonPackages ? (_: []) + /* the function you would have passed to python.withPackages */ + , withPython3 ? true, extraPython3Packages ? (_: []) + , withNodeJs ? false + , withRuby ? true + , vimAlias ? false + , viAlias ? false + , configure ? {} + }: + let + /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */ + compatFun = funOrList: (if builtins.isList funOrList then + (_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList) + else funOrList); + + res = makeNeovimConfig { + withPython2 = withPython; + extraPythonPackages = compatFun extraPythonPackages; + inherit withPython3; + extraPython3Packages = compatFun extraPython3Packages; + inherit withNodeJs withRuby; + + inherit configure; + }; + in + wrapNeovimUnstable neovim (res // { + wrapperArgs = res.wrapperArgs + ++ [ + "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" + ] + ++ (if builtins.isList extraMakeWrapperArgs then extraMakeWrapperArgs + else lib.warn "Passing a string as extraMakeWrapperArgs to the neovim wrapper is + deprecated, please use a list instead") + ; + }); +in +{ + inherit makeNeovimConfig; + inherit legacyWrapper; +} diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index cdc9a441dc5d..06ef920e2767 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -13,124 +13,41 @@ neovim: let wrapper = { - extraMakeWrapperArgs ? "" - , withPython ? true, extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */ - , withPython3 ? true, extraPython3Packages ? (_: []) /* the function you would have passed to python.withPackages */ + # should contain all args but the binary + wrapperArgs ? [] + , manifestRc ? null + , withPython2 ? true, python2Env ? null + , withPython3 ? true, python3Env ? null , withNodeJs? false - , withRuby ? true + , withRuby ? true, rubyEnv ? null , vimAlias ? false , viAlias ? false - , configure ? {} + , ... }: let - rubyEnv = bundlerEnv { - name = "neovim-ruby-env"; - gemdir = ./ruby_provider; - postBuild = '' - ln -sf ${ruby}/bin/* $out/bin - ''; - }; - - /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */ - compatFun = funOrList: (if builtins.isList funOrList then - (_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList) - else funOrList); - extraPythonPackagesFun = compatFun extraPythonPackages; - extraPython3PackagesFun = compatFun extraPython3Packages; - - requiredPlugins = vimUtils.requiredPlugins configure; - getDeps = attrname: map (plugin: plugin.${attrname} or (_:[])); - - pluginPythonPackages = getDeps "pythonDependencies" requiredPlugins; - pythonEnv = pythonPackages.python.withPackages(ps: - [ ps.pynvim ] - ++ (extraPythonPackagesFun ps) - ++ (concatMap (f: f ps) pluginPythonPackages)); - - pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; - python3Env = python3Packages.python.withPackages (ps: - [ ps.pynvim ] - ++ (extraPython3PackagesFun ps) - ++ (concatMap (f: f ps) pluginPython3Packages)); - - binPath = makeBinPath (optionals withRuby [rubyEnv] ++ optionals withNodeJs [nodejs]); - - # Mapping a boolean argument to a key that tells us whether to add or not to - # add to nvim's 'embedded rc' this: - # - # let g:_host_prog=$out/bin/nvim- - # - # Or this: - # - # let g:loaded_${prog}_provider=1 - # - # While the later tells nvim that this provider is not available - # - hostprog_check_table = { - node = withNodeJs; - python = withPython; - python3 = withPython3; - ruby = withRuby; - }; - ## Here we calculate all of the arguments to the 1st call of `makeWrapper` - # We start with the executable itself NOTE we call this variable "initial" - # because if configure != {} we need to call makeWrapper twice, in order to - # avoid double wrapping, see comment near finalMakeWrapperArgs - initialMakeWrapperArgs = - let - flags = lib.concatLists (lib.mapAttrsToList ( - prog: - withProg: - [ - "--cmd" - (if withProg then - "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'" - else - "let g:loaded_${prog}_provider=1" - ) - ] - ) hostprog_check_table); - in [ - "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" - "--argv0" "$0" - "--add-flags" (lib.escapeShellArgs flags) - ] ++ lib.optionals withRuby [ - "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" - ] ++ lib.optionals (binPath != "") [ - "--suffix" "PATH" ":" binPath - ]; # If configure != {}, we can't generate the rplugin.vim file with e.g # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in # the wrapper. That's why only when configure != {} (tested both here and # when postBuild is evaluated), we call makeWrapper once to generate a # wrapper with most arguments we need, excluding those that cause problems to # generate rplugin.vim, but still required for the final wrapper. - finalMakeWrapperArgs = initialMakeWrapperArgs - # this relies on a patched neovim, see - # https://github.com/neovim/neovim/issues/9413 - ++ lib.optionals (configure != {}) [ - "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" - "--add-flags" "-u ${configFile}" - ]; - configFile = writeText "init.vim" "${vimUtils.vimrcContent configure}"; + finalMakeWrapperArgs = + [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ wrapperArgs ++ + [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ]; in symlinkJoin { name = "neovim-${stdenv.lib.getVersion neovim}"; # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon - postBuild = '' - rm $out/bin/nvim - makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs} - '' - + lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.isLinux '' rm $out/share/applications/nvim.desktop substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ --replace 'Name=Neovim' 'Name=WrappedNeovim' '' - + optionalString withPython '' - makeWrapper ${pythonEnv}/bin/python $out/bin/nvim-python --unset PYTHONPATH + + optionalString withPython2 '' + makeWrapper ${python2Env}/bin/python $out/bin/nvim-python --unset PYTHONPATH '' + optionalString withPython3 '' makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH @@ -147,9 +64,14 @@ let + optionalString viAlias '' ln -s $out/bin/nvim $out/bin/vi '' - + optionalString (configure != {}) '' + + optionalString (manifestRc != null) (let + manifestWrapperArgs = + [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ wrapperArgs; + in '' echo "Generating remote plugin manifest" export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim + makeWrapper ${lib.escapeShellArgs manifestWrapperArgs} + # Some plugins assume that the home directory is accessible for # initializing caches, temporary files, etc. Even if the plugin isn't # actively used, it may throw an error as soon as Neovim is launched @@ -165,8 +87,8 @@ let # (swap/viminfo) and redirect errors to stderr. # Only display the log on error since it will contain a few normally # irrelevant messages. - if ! $out/bin/nvim \ - -u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \ + if ! $out/bin/nvim-wrapper \ + -u ${writeText "manifest.vim" manifestRc} \ -i NONE -n \ -E -V1rplugins.log -s \ +UpdateRemotePlugins +quit! > outfile 2>&1; then @@ -174,7 +96,11 @@ let echo -e "\nGenerating rplugin.vim failed!" exit 1 fi - makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${extraMakeWrapperArgs} + rm "${placeholder "out"}/bin/nvim-wrapper" + '') + + '' + rm $out/bin/nvim + makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ''; paths = [ neovim ]; @@ -182,7 +108,7 @@ let preferLocalBuild = true; buildInputs = [makeWrapper]; - passthru = { unwrapped = neovim; inherit configFile; }; + passthru = { unwrapped = neovim; }; meta = neovim.meta // { # To prevent builds on hydra diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 104f8e8d4cb2..11a8a1ccae33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23972,8 +23972,11 @@ in vimpc = callPackage ../applications/audio/vimpc { }; - wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; - + # this is a lower-level alternative to wrapNeovim conceived to handle + # more usecases when wrapping neovim. The interface is being actively worked on + # so expect breakage. use wrapNeovim instead if you want a stable alternative + wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; + wrapNeovim = neovimUtils.legacyWrapper; neovim-unwrapped = callPackage ../applications/editors/neovim { lua = # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879 @@ -23981,6 +23984,7 @@ in luajit; }; + neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; neovim = wrapNeovim neovim-unwrapped { }; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; From 451e41f6ef369254b72b3be8fc12ebc02ae5aa58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 08:55:03 +0000 Subject: [PATCH 105/294] azure-storage-azcopy: 10.6.0 -> 10.6.1 --- pkgs/development/tools/azcopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 3d0fe8513c8a..096e321fe700 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.6.0"; + version = "10.6.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "0izjnbldgf0597j4rh2ir9jsc2nzp9vwxcgllvkm5lh1xqf6i0nf"; + sha256 = "1gmpdyc55mkzdkkhyzvy9517znvcj8hd9x3rpkpr86vfzgjv9qyv"; }; subPackages = [ "." ]; From a74a5c9d9237abfe8c2312e9ca9e2574cbab9e58 Mon Sep 17 00:00:00 2001 From: braunse Date: Thu, 29 Oct 2020 10:01:18 +0100 Subject: [PATCH 106/294] CastXML: refactor to avoid python2 dependency (#101996) Switch pythonPackages.sphinx to python3Packages.sphinx. Should only affect the build of the man-page. --- pkgs/development/tools/castxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index 0a455b4d7cdf..90be513bd50f 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pythonPackages +, python3Packages , cmake , llvmPackages , libffi, libxml2, zlib @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4"; }; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ python3Packages.sphinx ]; clangVersion = lib.getVersion llvmPackages.clang; From b64d91e92e95fba388b54ca634466c3a55e92506 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 29 Oct 2020 10:02:35 +0100 Subject: [PATCH 107/294] promscale: 0.1.0 -> 0.1.1 Changelog: - Add QueryRow to our connection interface - Add SQL API for managing metric compression setting - Add code documentation for query/read path of the connector - Adds support for checking pg version on startup - BUGFIX reset pendingBuffer epoch when we're done - Epoch-Based cache validation - First pass documenting the write path - Fix bug with deletion of metric name labels. - Fix erroneous PromQL query in end-to-end tests - Fix error reporting to prevent panic - Fix golden file tests - Fix logging output to match rest of the project - Fix views on Vanilla PG and add tests - Make example docker-compose clearer (#305) - Mask password while printing config - Prepare for the 0.1.1 release - Prepare for the next development cycle - REFACTOR rearrange mocks - REFACTOR switch TestPGXInserterInsertData to the new mock - REFACTOR switch TestPGXInserterInsertSeries to the new mock - Start a pgmodel Readme Source: https://github.com/timescale/promscale/releases/tag/0.1.1 --- pkgs/servers/monitoring/prometheus/promscale.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index 1bf5d511e287..37e3ec0375cb 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -5,20 +5,20 @@ buildGoModule rec { pname = "promscale"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "${version}"; - sha256 = "sha256:0535sq640b9x9vi2sfazi9qs6arwjdn7nff16km2agncvs449dn4"; + sha256 = "sha256:00mhkp3nf6h2zsvmmwyza1lahvmm05isfi7rqkx24c0dmkmif3x9"; }; vendorSha256 = "sha256:1ilciwf08678sciwwrjalwvcs5bp7x254nxc3nhdf88cf0bp2nxi"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; - doCheck = false; + doCheck = false; # Requires access to a docker daemon meta = with stdenv.lib; { description = "An open-source analytical platform for Prometheus metrics"; From 0cc9ad72d46f19292d3fae576c77edc547aafab2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 29 Oct 2020 13:26:44 +0800 Subject: [PATCH 108/294] ffmpeg-full: patch for libsrt deprecated API --- pkgs/development/libraries/ffmpeg-full/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index c23fb87f2fae..df7043cd44ed 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -244,6 +244,15 @@ stdenv.mkDerivation rec { pname = "ffmpeg-full"; inherit (ffmpeg) src version; + # this should go away in the next release + patches = [ + (fetchpatch { + url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315"; + sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o="; + name = "fix_libsrt.patch"; + }) + ]; + prePatch = '' patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' From d55feede21ac95817ab229467044e061b0146f42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 09:06:48 +0000 Subject: [PATCH 109/294] bazel-kazel: 0.1.1 -> 0.1.2 --- pkgs/development/tools/bazel-kazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix index 20b17de0c211..516ad2a64a09 100644 --- a/pkgs/development/tools/bazel-kazel/default.nix +++ b/pkgs/development/tools/bazel-kazel/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "0d59kf0y12sa1bki7gzcb2nzppwj3gxlv133bsnl9gc8vx1d8ldg"; + sha256 = "1fn6ppyjgg3v80n9rc9712xms5yq3xkkd95zyd64l5gh9mshjn86"; }; vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; From 835fd4ffa6828c423d3bdcea7bb7e92916d22d0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 09:14:28 +0000 Subject: [PATCH 110/294] bazelisk: 1.7.3 -> 1.7.4 --- pkgs/development/tools/bazelisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index eba096644a11..2a20888426d0 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "0l4y8z44hwd6rnhnyk6l9abrvk342w72bah9k9zz6caa5i4xz2vz"; + sha256 = "1mc1l2g2qrg9djpyyz203a6dpx5fxllisybmhrpmikyza15w935q"; }; vendorSha256 = "116wy1a7gmi2w8why9hszhcybfvpwp4iq62vshb25cdcma6q4mjh"; From fc856b89e5b4c8a90d643f71029a125c72a244a2 Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 29 Oct 2020 10:32:04 +0100 Subject: [PATCH 111/294] nixos/murmur: add murmur group, don't run as nogroup fixes #101980 --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/networking/murmur.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index cd21a1609c91..4e0f8ba718eb 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -468,7 +468,7 @@ in #minecraft = 114; # unused vault = 115; #ripped = 116; # unused - #murmur = 117; # unused + murmur = 117; foundationdb = 118; newrelic = 119; starbound = 120; diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index b384f436861d..c6e5649ec479 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -278,6 +278,10 @@ in home = "/var/lib/murmur"; createHome = true; uid = config.ids.uids.murmur; + group = "murmur"; + }; + users.groups.murmur = { + gid = config.ids.gids.murmur; }; systemd.services.murmur = { @@ -300,6 +304,7 @@ in RuntimeDirectory = "murmur"; RuntimeDirectoryMode = "0700"; User = "murmur"; + Group = "murmur"; }; }; }; From 019fa5f6086b2744c5c0f3ce6a756f9a8aa70e74 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Thu, 29 Oct 2020 11:18:29 +0100 Subject: [PATCH 112/294] htslib: 1.10.2 -> 1.11 (#100812) --- pkgs/development/libraries/science/biology/htslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 7ee63e9bb413..9da6595e7a43 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.10.2"; + version = "1.11"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0f8rglbvf4aaw41i2sxlpq7pvhly93sjqiz0l4q3hwki5zg47dg3"; + sha256 = "1mrq4mihzx37yqhj3sfz6da6mw49niia808bzsw2gkkgmadxvyng"; }; # perl is only used during the check phase. From 4e35d03c8ec32e7fb386e655d944134879eb4eae Mon Sep 17 00:00:00 2001 From: wheelsandmetal Date: Thu, 29 Oct 2020 10:19:10 +0000 Subject: [PATCH 113/294] add myselft to maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eeb23378b6a2..bb9c1f460c6d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9210,6 +9210,12 @@ email = "kirill.wedens@gmail.com"; name = "wedens"; }; + wheelsandmetal = { + email = "jakob@schmutz.co.uk"; + github = "wheelsandmetal"; + githubId = 13031455; + name = "Jakob Schmutz"; + }; WhittlesJr = { email = "alex.joseph.whitt@gmail.com"; github = "WhittlesJr"; From 166eadee60ade4793b8209ec1aca3b57e114df94 Mon Sep 17 00:00:00 2001 From: wheelsandmetal Date: Thu, 29 Oct 2020 10:24:59 +0000 Subject: [PATCH 114/294] nuraft: init at 1.1.2 --- pkgs/development/libraries/nuraft/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/nuraft/default.nix diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/development/libraries/nuraft/default.nix new file mode 100644 index 000000000000..1554e1678156 --- /dev/null +++ b/pkgs/development/libraries/nuraft/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }: + +stdenv.mkDerivation rec { + pname = "nuraft"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "eBay"; + repo = "NuRaft"; + rev = "v${version}"; + sha256 = "sha256-l6rG8f+JAWfAJxEZPKRHZo2k8x9WbtSJC3gGCSMHYfs="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost172 asio openssl zlib ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/eBay/NuRaft"; + description = "C++ implementation of Raft core logic as a replication library"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ wheelsandmetal ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3065dcb8069c..b53ef40c8114 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14671,6 +14671,8 @@ in ntrack = callPackage ../development/libraries/ntrack { }; + nuraft = callPackage ../development/libraries/nuraft { }; + nuspell = callPackage ../development/libraries/nuspell { }; nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; From af7ee3031920aaa9709bf8b68400314933d3f43b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 10:40:21 +0000 Subject: [PATCH 115/294] cargo-tarpaulin: 0.14.3 -> 0.15.0 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 48805d168089..099837fbafa2 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = "${version}"; - sha256 = "03d8h5b174699yivaamlvaqzck9zs119jk29yf70dvxw7cs0nngv"; + sha256 = "0ga2zfq4365hxvr3wd3isc146ibivy3bfcy24rb6cq3av3b90a8k"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "0zzp2wyq48j6n64fm37qfl65cg4yzf9ysichhkmkc6viq8x0f66d"; + cargoSha256 = "1ij1bic95315kba7k7igix33kmwr2va0c2hbysjs0bl5kcnai4f7"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; From 4b8611c959408c12a4ceefa53c43c738a22f1ae5 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Thu, 29 Oct 2020 11:16:31 +0100 Subject: [PATCH 116/294] blockbook-frontend: fix&update extraConfig example --- .../networking/blockbook-frontend.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/blockbook-frontend.nix b/nixos/modules/services/networking/blockbook-frontend.nix index dde24522756a..ca323e495ec1 100644 --- a/nixos/modules/services/networking/blockbook-frontend.nix +++ b/nixos/modules/services/networking/blockbook-frontend.nix @@ -158,15 +158,21 @@ let type = types.attrs; default = {}; example = literalExample '' { - alternative_estimate_fee = "whatthefee-disabled"; - alternative_estimate_fee_params = "{\"url\": \"https://whatthefee.io/data.json\", \"periodSeconds\": 60}"; - fiat_rates = "coingecko"; - fiat_rates_params = "{\"url\": \"https://api.coingecko.com/api/v3\", \"coin\": \"bitcoin\", \"periodSeconds\": 60}"; - coin_shortcut = "BTC"; - coin_label = "Bitcoin"; - xpub_magic = 76067358; - xpub_magic_segwit_p2sh = 77429938; - xpub_magic_segwit_native = 78792518; + "alternative_estimate_fee" = "whatthefee-disabled"; + "alternative_estimate_fee_params" = "{\"url\": \"https://whatthefee.io/data.json\", \"periodSeconds\": 60}"; + "fiat_rates" = "coingecko"; + "fiat_rates_params" = "{\"url\": \"https://api.coingecko.com/api/v3\", \"coin\": \"bitcoin\", \"periodSeconds\": 60}"; + "coin_shortcut" = "BTC"; + "coin_label" = "Bitcoin"; + "parse" = true; + "subversion" = ""; + "address_format" = ""; + "xpub_magic" = 76067358; + "xpub_magic_segwit_p2sh" = 77429938; + "xpub_magic_segwit_native" = 78792518; + "mempool_workers" = 8; + "mempool_sub_workers" = 2; + "block_addresses_to_keep" = 300; }''; description = '' Additional configurations to be appended to coin.conf. From 9019cf90332fc2160f001a49e502a48cf8b1d9ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 10:58:56 +0000 Subject: [PATCH 117/294] cfssl: 1.4.1 -> 1.5.0 --- pkgs/tools/security/cfssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 1aef7b5bd567..d926aaca68fb 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cfssl"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cfssl"; rev = "v${version}"; - sha256 = "07qacg95mbh94fv64y577zyr4vk986syf8h5l8lbcmpr0zcfk0pd"; + sha256 = "1yzxz2l7h2d3f8j6l9xlm7g9659gsa17zf4q0883s0jh3l3xgs5n"; }; subPackages = [ From cb28da0a0ca6681a63bd1a785051cae2bac8fb36 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 11:12:50 +0000 Subject: [PATCH 118/294] checksec: 2.2.3 -> 2.4.0 --- pkgs/os-specific/linux/checksec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 5a66e536956f..eb33aedd1d49 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.2.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "0hw8bd7dj71m1ml9zvfab2j87jacs542z7a89nziapckmg6kmh6f"; + sha256 = "1gbbq85d3g3mnm3xvgvi2085aba7qc3cmsbwn76al50ax1518j2q"; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; From 82b35843255a7694921b36cf157cf152dd5dd5c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 11:37:49 +0000 Subject: [PATCH 119/294] cloudflared: 2020.10.0 -> 2020.10.2 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 47e2cc04b398..d61d32e40e95 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.10.0"; + version = "2020.10.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "1ssmyll13pf19fxq34iw4x7ps8p4mcg9nwlx00hp5sahhwx4iz01"; + sha256 = "0ppl74gb46r2x65hl7z1hjdqlr8la0pvhy8af8isk11sbxmprqjj"; }; vendorSha256 = null; From a15f5f379bd082d958babd985777aec40c064cc7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 12:31:08 +0000 Subject: [PATCH 120/294] croc: 8.5.2 -> 8.6.5 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 36fc5583439f..6d6c08a1efe0 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.5.2"; + version = "8.6.5"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0i71p3cwm8w3zlw10if3cbpfb65rq407nw4yva1l58ck7sbp61ha"; + sha256 = "1lzprv4qbmv2jjjp02z87819k54wdlsf8i6zvl3vchkqvygdkk6v"; }; - vendorSha256 = "0afg645hs7lf3036c2g6sn956zz9s08r747c0czb1aj0jrbf7fs8"; + vendorSha256 = "02mai9bp9pizbq6b8dj05rngxp3lfm9gh37zs8jknx56gas90j9i"; doCheck = false; From a90362c888c67af6366e69ba1d5bf6cf03615ee8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Oct 2020 13:40:12 +0100 Subject: [PATCH 121/294] google-chrome: Add myself as maintainer Mainly to get pinged on PRs/issues as well. --- .../networking/browsers/google-chrome/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index fb261c286072..727090a4c5c3 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -150,7 +150,10 @@ in stdenv.mkDerivation { description = "A freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; license = licenses.unfree; - maintainers = [ maintainers.msteen ]; + maintainers = with maintainers; [ primeos msteen ]; + # Note from primeos: By updating Chromium I also update Google Chrome and + # will try to merge PRs and respond to issues but I'm not actually using + # Google Chrome. msteen is the actual user/maintainer. platforms = [ "x86_64-linux" ]; }; } From 8b1d379ee3ee6e3a3915b334c1140e83106c56f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 12:41:41 +0000 Subject: [PATCH 122/294] ctop: 0.7.3 -> 0.7.4 --- pkgs/tools/system/ctop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 6cb8e4821608..68e7562975f3 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctop"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "bcicen"; repo = pname; rev = "v${version}"; - sha256 = "0y72l65xgfqrgghzbm1zcy776l5m31z0gn6vfr689zyi3k3f4kh8"; + sha256 = "0zslxd00pypn6ri7r420mqxjqy3i6qv944f7899saapsb2m08w7j"; }; - vendorSha256 = "1x4li44vg0l1x205v9a971cgphplxhsrn59q97gmj9cfy4m7jdfw"; + vendorSha256 = "0a5rwnf251jbp7jz2ln8z9hqp0112c6kx0y09nncvlcki35qq9sh"; doCheck = false; From 7c700c9ff670b5166582078d0782d0ee0dcaf10c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Oct 2020 13:48:38 +0100 Subject: [PATCH 123/294] chromium: Drop useVaapi (was deprecated) --- .../networking/browsers/chromium/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 43e4717f82f6..f83cb1d209d7 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -14,7 +14,6 @@ , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false -, useVaapi ? false # Deprecated, use enableVaapi instead! , enableVaapi ? false # Disabled by default due to unofficial support , useOzone ? false , cupsSupport ? true @@ -148,13 +147,6 @@ let '' else browser; - optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09: - then throw '' - Chromium's useVaapi was replaced by enableVaapi and you don't need to pass - "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore). - '' else lib.optionalString - (enableVaapi) - "--add-flags --enable-accelerated-video-decode"; in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -181,7 +173,7 @@ in stdenv.mkDerivation { eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ - ${optionalVaapiFlags} \ + ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ed -v -s "$out/bin/chromium" << EOF From 59a7a55e104c8ceb46471bf6a50f3091e32422a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 13:28:35 +0000 Subject: [PATCH 124/294] doctl: 1.48.1 -> 1.49.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index ba42f3914b4a..b30bd8d29909 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.48.1"; + version = "1.49.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "1bykvwv1zhiki7c86hycwck78s8gqw4dzd7smfp4iz609wyk1wqb"; + sha256 = "1z7424am1fb1l9bz8q1lfzmhz84c29v7k5p391m4hhbl8h46x6ca"; }; meta = with lib; { From 89507db3bc2c607a6de5792f1399cf546f1a78a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 13:48:13 +0000 Subject: [PATCH 125/294] dstask: 0.22 -> 0.23 --- pkgs/applications/misc/dstask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index c9b3e2dd8983..0eeb0d9cab6e 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dstask"; - version = "0.22"; + version = "0.23"; src = fetchFromGitHub { owner = "naggie"; repo = pname; rev = "v${version}"; - sha256 = "0vwkar827ncwmva091q37gq8fvs9jz1765zdxrcvhczlj5a0qdgi"; + sha256 = "15hr0ivwvm2lzpi8l5y5a3hya3i7r85pxna961m24gd4f8gs4cjl"; }; # Set vendorSha256 to null because dstask vendors its dependencies (meaning From e589cc0afcfaf24ee5a25203c4847cfaee3ab385 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 14:06:51 +0000 Subject: [PATCH 126/294] emplace: 0.3.7 -> 0.3.8 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index c794566e19f1..3356e7cf1021 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "0ihx6hrzs7wkdz9wzgarmm73dz1fb2bhssmxrgv5nzmkhygn4xfy"; + sha256 = "1g7xrsw0ji3nbrj1a2hywxwy7f33fgbvzp7k4l9ls2icg0xsw9a3"; }; - cargoSha256 = "0yqg2hagsjaxvrj96qg6k1llkmqdqp792c2844h7fhnhlx6v2wd2"; + cargoSha256 = "1phr0k05dxwdhj1i71v8lr91qanjvp2zgi9wjpppzixpnpcsrbrb"; meta = with lib; { description = "Mirror installed software on multiple machines"; From bf92b1ba10cd413026d184c3cf1a5e62c39c1388 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 14:19:08 +0000 Subject: [PATCH 127/294] ergo: 3.3.4 -> 3.3.5 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 685a562f21b1..706acebba553 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "0psq0nxb4c0fsxjzjxb4sy6lh4kj4w8aizd81r92fdv8izbm25sk"; + sha256 = "0bxzpwwb42bppqli3zggx3lah7g6kwmy6k6k6dinypj6x0bafqcg"; }; nativeBuildInputs = [ makeWrapper ]; From 1c8206d39ba115f05166a6272f329c3e982e98cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 15:01:54 +0000 Subject: [PATCH 128/294] flow: 0.136.0 -> 0.137.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 44ecfceb8dfe..27675652eb87 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.136.0"; + version = "0.137.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1gpf9jk4ny5jps93scfcndzg1r93kz3hq8pijpfk4ab8qray83g6"; + sha256 = "1bwrm0jab3pjq1md584szdb3vk4r2cka49qn6f9znnb1ji589x5q"; }; installPhase = '' From 0d9f7f2e5fa2c9ab6d4f6ebe98b20a4e688b7b25 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 15:14:37 +0000 Subject: [PATCH 129/294] flyctl: 0.0.144 -> 0.0.145 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 32be24f954af..dbc6bfb9a037 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.144"; + version = "0.0.145"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "1wg8dgz930hj3q448gg5kxri31q078w5nshvlfkga7vzn8pdg3bk"; + sha256 = "00by00jslj9nkq89iwvc5f0jcn4lv8i6xs9y9l2x044rq525q08q"; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "0ryb97cwknxwhascz74filvx3wfwd0dhm6x36n4d7z2kiw7fgmh9"; + vendorSha256 = "018vffgi85aqzb93hbld2f3lrc01jxb9aj5j5ss5c0a689g83gmq"; doCheck = false; From 2a184865c54db013f6937fcedc99b23eb832495f Mon Sep 17 00:00:00 2001 From: Matthew Piziak Date: Thu, 29 Oct 2020 11:17:57 -0400 Subject: [PATCH 130/294] tdlib: 1.6.0 -> 1.6.9 fix hash version 1.6.9 is not released, so use revision hash add a comment to the rev about why we are not using `v${version}` anymore use unstable-2020-10-25 update version, not revision --- pkgs/development/libraries/tdlib/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index f430b10c64c0..165506f96472 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -1,18 +1,18 @@ { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }: stdenv.mkDerivation rec { - version = "1.6.9"; + version = "unstable-2020-10-25"; pname = "tdlib"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; - # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision because 1.6.9 is not - # a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`. Please - # return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow - # `nixpkgs-update` to update the package automatically. - rev = "unstable-2020-10-25"; + # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 (here called `unstable-2020-10-25`) uses an + # explicit revision because 1.6.9 is not a tdlib GitHub release, and is therefore not hosted at + # `https://github.com/tdlib/td/releases/tag/v1.6.9`. Please return to the `rev = "v${version}"` style on the next + # version bump if you can, since that will allow `nixpkgs-update` to update the package automatically. + rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01"; sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n"; }; From 59c53bc62e1e25015bd8deedd7252ee5037314b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 29 Oct 2020 16:21:57 +0100 Subject: [PATCH 131/294] servant: generate docs using python3 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 26cbf7f78c39..1e694a8801b7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -694,7 +694,7 @@ self: super: { postPatch = '' substituteInPlace conf.py --replace "'.md': CommonMarkParser," "" ''; - nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; + nativeBuildInputs = with pkgs.buildPackages.python3Packages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = [ "html" ]; installPhase = '' mv _build/html $out From afcbed0f66a402eab5c09961c190912f3b0d434f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20=C5=BDlender?= Date: Thu, 29 Oct 2020 16:32:23 +0100 Subject: [PATCH 132/294] maintainers: change szlend email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 119e4594b160..4b77ffca8846 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8364,7 +8364,7 @@ name = "Szczyp"; }; szlend = { - email = "pub+nix@zlender.si"; + email = "pub.nix@zlender.si"; github = "szlend"; githubId = 7301807; name = "Simon Žlender"; From 8842a03edde38b0f026bc87daa88d952380914ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 15:36:42 +0000 Subject: [PATCH 133/294] fsmon: 1.8.1 -> 1.8.2 --- pkgs/tools/misc/fsmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index 668fa463adb3..a3e3eddcda9e 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fsmon"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; rev = version; - sha256 = "0i7irqs4100j0g19jh64p2plbwipl6p3ld6w4sscc7n8lwkxmj03"; + sha256 = "0y0gqb07girhz3r7gn9yrrysvhj5fapdafim0q8n7krk5y23hmh0"; }; installPhase = '' From e2dbf1ee5f2f6df7627c5a380b83eadf992134eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 07:41:57 +0000 Subject: [PATCH 134/294] python37Packages.py_stringmatching: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/py_stringmatching/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix index fda497b7962b..79d09daba9cc 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "py_stringmatching"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "c46db1e855cef596dfbbe1bd48fcabb30736479eff602c2bf88af10f998f1532"; + sha256 = "c87f62698fba1612a18f8f44bd57f0c4e70aac2d7ca6dfb6ed46dabd2194453c"; }; checkInputs = [ nose ]; From c1b0ffe325ec770211b8e5aa414596c280f7e86d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 07:14:41 +0000 Subject: [PATCH 135/294] python37Packages.bids-validator: 1.5.6 -> 1.5.7 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index f97fffe93f05..b139a88820e6 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.5.6"; + version = "1.5.7"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "ef9476ded8226c86fe1d6e6b9f380666ada7a0f4ae39bd5afd7eabbbc6979ab7"; + sha256 = "624fade609636c64e7829ff072bdf12f93512948a803059b059e5c90df894be2"; }; # needs packages which are not available in nixpkgs From 3e8c98e128012fc5b756ab311d7c40145e01391f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 16:01:39 +0000 Subject: [PATCH 136/294] geoipupdate: 4.3.0 -> 4.5.0 --- pkgs/applications/misc/geoipupdate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index ee6ed27ddda8..1f2c275b13d1 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.3.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "08h14bf4z2gx9sy34jpi2pvxv3i8g9ypl222hzdjsp2ixhl0jia9"; + sha256 = "0lhz7i4lprsik3s41y19vphsyc29vz6cbxikmvkmy6xjn40khjfr"; }; - vendorSha256 = "0q4byhvs1c1xm4qjvs2vyf98vdv121qn0z51arcf7k4ayrys5xcx"; + vendorSha256 = "1f858k8cl0dgiw124jv0p9jhi9aqxnc3nmc7hksw70fla2nzjrv0"; doCheck = false; From 452312ec15f8e5f640d2a929d0a089c97ddc5de3 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 29 Oct 2020 23:44:35 +0700 Subject: [PATCH 137/294] mozwire: 0.5.2 -> 0.7.0 --- pkgs/tools/networking/mozwire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index 3f50ed41f49c..58afc833ea0e 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "MozWire"; - version = "0.5.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "NilsIrl"; repo = pname; rev = "v${version}"; - sha256 = "0r3x8y1qxxkkac9lqgd0s339zbrm9zmir1f6qs0r5f0bw3ngzqc4"; + sha256 = "01bj3c34x9ywxygsz4rdyw5gc9cz8x6zzl5fd7db8qy8bx2lhlr9"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0hyps2wi4wmpllfams3p59jpccwa0ylgzxq7qdn6g6zvf0cajpc0"; + cargoSha256 = "0yxnpnxwis46wz4j5rjzyyzrvh94hn8vzxmmrcmrdz3gkakg77hg"; meta = with stdenv.lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; From 1b5ee955d3d96ba58a02ca9c8d3e4377bae0ced2 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 29 Oct 2020 17:07:26 +0000 Subject: [PATCH 138/294] terraform-providers.cloudfoundry: init at 0.12.6 (#99960) --- .../cloudfoundry/default.nix | 29 +++++++++++++++++++ .../cluster/terraform-providers/default.nix | 1 + 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix new file mode 100644 index 000000000000..7e807d2ed5ce --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraform-provider-cloudfoundry"; + version = "0.12.6"; + + src = fetchFromGitHub { + owner = "cloudfoundry-community"; + repo = pname; + rev = "v${version}"; + sha256 = "0n5ybpzk6zkrnd9vpmbjlkm8fdp7nbfr046wih0jk72pmiyrcygi"; + }; + + vendorSha256 = "01lfsd9aw9w3kr1a2a5b7ac6d8jaij83lhxl4y4qsnjlqk86fbxq"; + + # needs a running cloudfoundry + doCheck = false; + + postInstall = "mv $out/bin/terraform-provider-cloudfoundry{,_v${version}}"; + + passthru = { provider-source-address = "registry.terraform.io/cloudfoundry-community/cloudfoundry"; }; + + meta = with stdenv.lib; { + homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry"; + description = "Terraform provider for cloudfoundry"; + license = licenses.mpl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 24c6dd21cdef..a75500c8eb37 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -161,6 +161,7 @@ let # Packages that don't fit the default model ansible = callPackage ./ansible {}; + cloudfoundry = callPackage ./cloudfoundry {}; elasticsearch = callPackage ./elasticsearch {}; gandi = callPackage ./gandi {}; keycloak = callPackage ./keycloak {}; From 75ddf65fff7832f7231e00ec5898d8f032d71629 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 17:25:25 +0000 Subject: [PATCH 139/294] gosec: 2.4.0 -> 2.5.0 --- pkgs/development/tools/gosec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index ffbd98a45772..44862bb3311d 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gosec"; - version = "2.4.0"; + version = "2.5.0"; subPackages = [ "cmd/gosec" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "0mqijzr3vj4wycykqpjz9xw9fhpbnzz988z2q3nldb5ax0pyrxca"; + sha256 = "0hwa4sxw9sqzivg80nqsi9g1hz8apnnck73x5dvnn1zbwvycx3g9"; }; - vendorSha256 = "063dpq1k5lykp18gshlgg098yvppicv3cz8gjn1mvfhac2rl9yqr"; + vendorSha256 = "1lldi56kah689xf8n1hfpk9qy0gbci62xnjs5jrh54kbgka23gvw"; doCheck = false; From a28e5b0a4f5799e14ed3079e10d481e5b5b4faa9 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Sat, 17 Oct 2020 12:26:20 +0200 Subject: [PATCH 140/294] samtools: 1.10 -> 1.11 --- pkgs/applications/science/biology/samtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index e750eea89ac9..27ed79a1f6ca 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "samtools"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "119ms0dpydw8dkh3zc4yyw9zhdzgv12px4l2kayigv31bpqcb7kv"; + sha256 = "1dp5wknak4arnw5ghhif9mmljlfnw5bgm91wib7z0j8wdjywx0z2"; }; nativeBuildInputs = [ perl ]; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "http://www.htslib.org/"; platforms = platforms.unix; - maintainers = [ maintainers.mimame ]; + maintainers = with maintainers; [ mimame unode ]; }; } From c473bbbe33d7bc8f0ff8a30c0a2634a3747dd86b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 17:31:59 +0000 Subject: [PATCH 141/294] gotestsum: 0.5.4 -> 0.6.0 --- pkgs/development/tools/gotestsum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index bc0b331c54da..8ccc1b593fd7 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "1nmx91a5faixj1pzg9wbmxn8z1mphmdcvd6lajqy1ds21fzn2g1i"; + sha256 = "0w0s2qvwnb69s18gvkkbwsx9zh7yi8ksnnrfpl8az8sybk6m1iaz"; }; - vendorSha256 = "02av4z3lxfb6xrv3ij1alf5k8xhxz0dasnf2farbcszz021bzfrq"; + vendorSha256 = "09cifc69z1ashjw1mqgbi0gh90h2sypqyl0jswxxcqk89ibgy3am"; doCheck = false; From c6174c208a793c523bba42a3c974f9ad1d4424ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Oct 2020 00:38:16 +0100 Subject: [PATCH 142/294] pythonPackages.spotipy: 2.16.0 -> 2.16.1 --- pkgs/development/python-modules/spotipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 1e003be1f5e7..fee4f093d085 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.16.0"; + version = "2.16.1"; src = fetchPypi { inherit pname version; - sha256 = "315eadd1248053ed336b4d3adbf2e3c32895fdbb0cfcd170542c848c8fd45649"; + sha256 = "1f50xczv8kgly6wz6zrvqzwdj6nvhdlgx8wnrhmbipjrb6qacr25"; }; propagatedBuildInputs = [ requests six ]; From b034c434f60da4f8e98a12c7eb551b68eb0f39e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Oct 2020 00:49:30 +0100 Subject: [PATCH 143/294] pythonPackages.spotipy: disable tests and cleanup Tests require network access. --- .../python-modules/spotipy/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index fee4f093d085..63ec4abcac42 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -1,4 +1,8 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, six }: buildPythonPackage rec { pname = "spotipy"; @@ -10,19 +14,19 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ requests six ]; - checkInputs = [ mock ]; - preConfigure = '' - substituteInPlace setup.py \ - --replace "mock==2.0.0" "mock" - ''; + # tests want to access the spotify API + doCheck = false; + pythonImportsCheck = [ + "spotipy" + "spotipy.oauth2" + ]; - pythonImportsCheck = [ "spotipy" ]; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://spotipy.readthedocs.org/"; + changelog = "https://github.com/plamere/spotipy/blob/${version}/CHANGELOG.md"; description = "A light weight Python library for the Spotify Web API"; license = licenses.mit; - maintainers = [ maintainers.rvolosatovs ]; + maintainers = with maintainers; [ rvolosatovs ]; }; } From fed1b43c6ffc9b9eff17562751aa2d5b16227781 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Oct 2020 20:43:51 +0100 Subject: [PATCH 144/294] python3Packages.httpcore: 0.10.2 -> 0.12.0 Also clean up the package and enable tests. --- .../python-modules/httpcore/default.nix | 42 +++++++++++++------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 9ac9b76d2e36..aa15c2555e67 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -1,34 +1,52 @@ -{ stdenv +{ lib , buildPythonPackage +, pythonOlder , fetchFromGitHub -, isPy27 , h11 +, h2 +, pproxy +, pytestCheckHook +, pytestcov , sniffio +, uvicorn }: buildPythonPackage rec { pname = "httpcore"; - version = "0.10.2"; - disabled = isPy27; + version = "0.12.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "00gn8nfv814rg6fj7xv97mrra3fvx6fzjcgx9y051ihm6hxljdsi"; + sha256 = "0bwxn7m7r7h6k41swxj0jqj3nzi76wqxwbnry6y7d4qfh4m26g2j"; }; - propagatedBuildInputs = [ h11 sniffio ]; + propagatedBuildInputs = [ + h11 + h2 + sniffio + ]; + + checkInputs = [ + pproxy + pytestCheckHook + pytestcov + uvicorn + ]; + + pytestFlagsArray = [ + # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known + "--ignore=tests/sync_tests/test_interfaces.py" + ]; - # tests require pythonic access to mitmproxy, which isn't (yet?) packaged as - # a pythonPackage. - doCheck = false; pythonImportsCheck = [ "httpcore" ]; - meta = with stdenv.lib; { - description = "A minimal HTTP client"; + meta = with lib; { + description = "A minimal low-level HTTP client"; homepage = "https://github.com/encode/httpcore"; license = licenses.bsd3; - maintainers = [ maintainers.ris ]; + maintainers = with maintainers; [ ris ]; }; } From 7f096a9feb7ee37d6ce8c601e933973d8b87f558 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Oct 2020 20:54:55 +0100 Subject: [PATCH 145/294] python3Packages.httpx: 0.14.2 -> 0.16.1 Clean up package and convert tests to pytestCheckHook. --- .../python-modules/httpx/default.nix | 42 +++++++------------ 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 5361e047207a..1f527b47ec08 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -1,71 +1,61 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub -, fetchpatch +, brotli , certifi -, chardet -, h11 , h2 , httpcore -, idna , rfc3986 , sniffio -, isPy27 -, pytest +, pytestCheckHook , pytest-asyncio , pytest-trio , pytestcov , trustme , uvicorn -, brotli }: buildPythonPackage rec { pname = "httpx"; - version = "0.14.2"; - disabled = isPy27; + version = "0.16.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "08b6k5g8car3bic90aw4ysb2zvsa5nm8qk3hk4dgamllnnxzl5br"; + sha256 = "00gmq45fckcqkj910bvd7pyqz1mvgsdvz4s0k7dzbnc5czzq1f4a"; }; - patches = [ - (fetchpatch { - name = "fix-cookie-test-timestamp.patch"; - url = "https://github.com/encode/httpx/pull/1270.patch"; - sha256 = "1hgrynac6226sgnyzmsr1nr15rn49gbfmk4c2kx3dwkbh6vr7jpd"; - }) - ]; - propagatedBuildInputs = [ + brotli certifi - chardet - h11 h2 httpcore - idna rfc3986 sniffio ]; checkInputs = [ - pytest + pytestCheckHook pytest-asyncio pytest-trio pytestcov trustme uvicorn - brotli ]; - checkPhase = '' - PYTHONPATH=.:$PYTHONPATH pytest -k 'not (test_connect_timeout or test_elapsed_timer)' - ''; pythonImportsCheck = [ "httpx" ]; + disabledTests = [ + # httpcore.ConnectError: [Errno 101] Network is unreachable + "test_connect_timeout" + # httpcore.ConnectError: [Errno -2] Name or service not known + "test_async_proxy_close" + "test_sync_proxy_close" + ]; + meta = with lib; { description = "The next generation HTTP client"; homepage = "https://github.com/encode/httpx"; From c8d6c254e814d07096d473daaafd0c6e2d561c06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Oct 2020 20:12:49 +0100 Subject: [PATCH 146/294] homeassistant: 0.116.4 -> 0.117.0 --- .../home-assistant/component-packages.nix | 23 +++++++++++-------- pkgs/servers/home-assistant/default.nix | 16 ++++--------- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a55b695b4576..326cc480fddc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.116.4"; + version = "0.117.0"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -11,6 +11,7 @@ "actiontec" = ps: with ps; [ ]; "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; + "advantage_air" = ps: with ps; [ ]; # missing inputs: advantage_air "aftership" = ps: with ps; [ pyaftership ]; "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; @@ -91,7 +92,6 @@ "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected - "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop "bond" = ps: with ps; [ ]; # missing inputs: bond-api "braviatv" = ps: with ps; [ bravia-tv ]; "broadlink" = ps: with ps; [ broadlink ]; @@ -107,7 +107,7 @@ "calendar" = ps: with ps; [ aiohttp-cors ]; "camera" = ps: with ps; [ aiohttp-cors ]; "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen PyChromecast zeroconf ]; + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pysonos zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ ]; # missing inputs: pychannels "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook @@ -163,7 +163,7 @@ "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ]; "device_tracker" = ps: with ps; [ ]; - "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api + "devolo_home_control" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: devolo-home-control-api "dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT "dialogflow" = ps: with ps; [ aiohttp-cors ]; @@ -301,7 +301,7 @@ "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "glances" = ps: with ps; [ ]; # missing inputs: glances_api - "gntp" = ps: with ps; [ ]; # missing inputs: gntp + "gntp" = ps: with ps; [ gntp ]; "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalzero" = ps: with ps; [ ]; # missing inputs: goalzero "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api @@ -318,6 +318,7 @@ "gpsd" = ps: with ps; [ ]; # missing inputs: gps3 "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; + "gree" = ps: with ps; [ ]; # missing inputs: greeclimate "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality "griddy" = ps: with ps; [ ]; # missing inputs: griddypower @@ -470,7 +471,7 @@ "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py "matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api - "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-blinka adafruit-circuitpython-mcp230xx + "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-mcp230xx "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_player" = ps: with ps; [ aiohttp-cors ]; "media_source" = ps: with ps; [ aiohttp-cors ]; @@ -527,7 +528,7 @@ "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient - "nest" = ps: with ps; [ python-nest ]; + "nest" = ps: with ps; [ aiohttp-cors python-nest ]; # missing inputs: google-nest-sdm "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ ]; # missing inputs: netdata "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear @@ -568,7 +569,7 @@ "ombi" = ps: with ps; [ ]; # missing inputs: pyombi "omnilogic" = ps: with ps; [ ]; # missing inputs: omnilogic "onboarding" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend - "onewire" = ps: with ps; [ ]; # missing inputs: pyownet + "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; "onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; @@ -622,6 +623,7 @@ "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall + "profiler" = ps: with ps; [ pyprof2calltree ]; "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; @@ -688,6 +690,7 @@ "rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; + "ruckus_unleashed" = ps: with ps; [ ]; # missing inputs: pyruckus "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd @@ -809,6 +812,7 @@ "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility "tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff + "tasmota" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: hatasmota "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli "tcp" = ps: with ps; [ ]; "ted5000" = ps: with ps; [ xmltodict ]; @@ -932,6 +936,7 @@ "wunderground" = ps: with ps; [ ]; "x10" = ps: with ps; [ ]; "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper + "xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway @@ -950,7 +955,7 @@ "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; - "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix + "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e2a7df26efee..98f5fe943247 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.116.4"; + hassVersion = "0.117.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,28 +83,20 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1wcr2afvq1l6xlws3jgzfyh4kx61i0x9n985fiq3ls29w9lpshk4"; + sha256 = "1f5axspj5hffmaqhpmrrflyd0c62lww36yvd2wr999yix7jhsfnc"; }; - patches = [ - (fetchpatch { - # Fix group tests when run in parallel, remove >= 0.117.0 - url = "https://github.com/home-assistant/core/pull/41446/commits/c79dc478b7136b6df43707bf0ad6b53419c8a909.patch"; - sha256 = "1cl81swq960vd2f733dcqq60c0jjzrkm0l2sibcblhmyw597b4vj"; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \ - --replace "cryptography==2.9.2" "cryptography" \ + --replace "cryptography==3.2.0" "cryptography" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; propagatedBuildInputs = [ # From setup.py - aiohttp astral async-timeout attrs bcrypt certifi ciso8601 jinja2 + aiohttp astral async-timeout attrs bcrypt certifi ciso8601 httpx jinja2 pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml setuptools voluptuous voluptuous-serialize yarl # From default_config. frontend, http, image, mobile_app and recorder components as well as diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 8dd99d94ee0f..2ca94066dbcb 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20201001.2"; + version = "20201021.3"; src = fetchPypi { inherit pname version; - sha256 = "1wyac980d8j8bk4bzh9y3a5c4xqfn3062wj5m45kwsx1f5rfx26j"; + sha256 = "04z8rvmnpmy7xx90pvqcr58hsxjsc10mrrjcx7ppspglb91b9cpb"; }; # no Python tests implemented From c44af1ebd72958cf2c99d30fdea31860752dcb52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Oct 2020 18:13:47 +0100 Subject: [PATCH 147/294] python3Packages.asgi-csrf: disable tests The packages tests import a private module from httpx, that does not exist anymore in newer versions. --- .../python-modules/asgi-csrf/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index 12c94aee1573..257e7314af9e 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart -, pytest, starlette, httpx, pytest-asyncio }: +, pytestCheckHook, starlette, httpx, pytest-asyncio }: buildPythonPackage rec { version = "0.7"; @@ -14,12 +14,23 @@ buildPythonPackage rec { sha256 = "1vf4lh007790836cp3hd6wf8wsgj045dcg0w1cm335p08zz6j4k7"; }; - propagatedBuildInputs = [ itsdangerous python-multipart ]; + propagatedBuildInputs = [ + itsdangerous + python-multipart + ]; + + checkInputs = [ + httpx + pytest-asyncio + pytestCheckHook + starlette + ]; + + # tests fail while importing a private module from httpx + # E ModuleNotFoundError: No module named 'httpx._content_streams' + # https://github.com/simonw/asgi-csrf/issues/18 + doCheck = false; - checkInputs = [ pytest starlette httpx pytest-asyncio ]; - checkPhase = '' - pytest test_asgi_csrf.py - ''; pythonImportsCheck = [ "asgi_csrf" ]; meta = with stdenv.lib; { From 90a47bad3e9cda105e0f6ebbdcb9fad39d5187db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Oct 2020 18:16:10 +0100 Subject: [PATCH 148/294] python3Packages.asgi-csrf: 0.7 -> 0.7.1 --- pkgs/development/python-modules/asgi-csrf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index 257e7314af9e..e838ec787c31 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -2,7 +2,7 @@ , pytestCheckHook, starlette, httpx, pytest-asyncio }: buildPythonPackage rec { - version = "0.7"; + version = "0.7.1"; pname = "asgi-csrf"; disabled = isPy27; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "1vf4lh007790836cp3hd6wf8wsgj045dcg0w1cm335p08zz6j4k7"; + sha256 = "1hhqrb9r46y6i3d3w6hc9zm6yyikdyd2k5pcbyw0r9fl959yi4hf"; }; propagatedBuildInputs = [ From 9fb7ea1f17bd7dd02e84f4feca77c6989886cb19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 17:54:46 +0000 Subject: [PATCH 149/294] batsignal: 1.1.2 -> 1.1.3 --- pkgs/applications/misc/batsignal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 56c508eaca92..77eb32166fe4 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = "${version}"; - sha256 = "0ss5dw7wpqsf96dig6r7x4fhf6brmjdy54jyyf5nk1h9kzw4d69r"; + sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf"; }; buildInputs = [ libnotify glib ]; From ca6dc681539394a534b8ff21287a3a71efcab44e Mon Sep 17 00:00:00 2001 From: Jon Roberts Date: Thu, 29 Oct 2020 13:13:09 -0500 Subject: [PATCH 150/294] zoom-us: 5.3.469451.0927 -> 5.4.53350.1027 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 3109db89ff37..6c072118bc88 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.3.469451.0927"; + version = "5.4.53350.1027"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0qb9jx2zd5p6jk1g0xmh1f6xlf4gfl38ns6ixpc653qfimy8b0av"; + sha256 = "11va3px42y81bwy10mxm7mk0kf2sni9gwb422pq9djck2dgchw5x"; }; }; From b8d59e93c8c2cc941caa4eec17a72303f5ef84f4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 29 Oct 2020 19:47:42 +0100 Subject: [PATCH 151/294] nixos/networkd: allow RouteMetric= in [DHCPv6] section --- nixos/modules/system/boot/networkd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 47689b2a4700..3b01bc00bafa 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -648,11 +648,13 @@ let "RapidCommit" "ForceDHCPv6PDOtherInformation" "PrefixDelegationHint" + "RouteMetric" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) (assertValueOneOf "RapidCommit" boolValues) (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues) + (assertInt "RouteMetric") ]; sectionDHCPServer = checkUnitConfig "DHCPServer" [ From 0f03d8f0d94c9cf5b0540336fcb7e141b89efcc8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 19:19:05 +0000 Subject: [PATCH 152/294] _1password-gui: 0.9.0 -> 0.9.1 --- pkgs/tools/security/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index c3d406ce3aad..b9e668aaa403 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "109jsls4515y78zhhsxqlgms30i5rzhi60p3b9wx6y8v0iq331wp"; + sha256 = "04hv7hw4s3f65kf3ggh9l0nrx25k5yj2kqv83nl7pvam5lvnv8sz"; }; nativeBuildInputs = [ makeWrapper ]; From 8d936595b892cebc6ad66c542359ff356b21e57c Mon Sep 17 00:00:00 2001 From: Shawn Dooley Date: Thu, 29 Oct 2020 15:51:43 -0400 Subject: [PATCH 153/294] fldigi: 4.1.14 -> 4.1.15 --- pkgs/applications/radio/fldigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index af93b7ee65d6..97a8369468da 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.14"; + version = "4.1.15"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0hr6xbv01xf7z4r2jxxhn8xjdmca2198q4m9glh4877dllvfq6xj"; + sha256 = "260a61be714d9a7274adb78a822f210a589f4c344d5444c5f2cbbcd7c466ebbb"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio From 56d5df28469dd57841aca3bab7d6a176b13c8a0e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 19:56:19 +0000 Subject: [PATCH 154/294] armadillo: 10.1.0 -> 10.1.1 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 169777f2b42c..a306a02be069 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.1.0"; + version = "10.1.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "15c3amyrk496v0s6r2pn8dw4v82f4ld347nbv5qdzd6injsg3qvj"; + sha256 = "13hwynp1dnk3flw8ly00wjj12x2wsvj2da39bzay8c08m3dj3q4m"; }; nativeBuildInputs = [ cmake ]; From b40ad04c9d8d1e05542e5551190bcc690aa8e3e1 Mon Sep 17 00:00:00 2001 From: Jonathan Wilkins Date: Thu, 29 Oct 2020 19:25:49 +0000 Subject: [PATCH 155/294] vimPlugins.telescope-nvim: init at 2020-10-28 --- 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 eab8804fd6ee..91cbb9d83cb6 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3383,6 +3383,18 @@ let meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-nvim = buildVimPluginFrom2Nix { + pname = "telescope-nvim"; + version = "2020-10-28"; + src = fetchFromGitHub { + owner = "nvim-lua"; + repo = "telescope.nvim"; + rev = "78cf7ebd7f2dcfcf6fec1d0195ccf46cb479d72c"; + sha256 = "1wl30nqdbl90a9zky524k1cszwii4vg5rhlrrvg4n6hdw9kkyi4m"; + }; + meta.homepage = "https://github.com/nvim-lua/telescope.nvim/"; + }; + tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; version = "2020-06-29"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a95ee209f94d..de4cd959dee4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -371,6 +371,7 @@ nvie/vim-flake8 nvim-lua/completion-nvim nvim-lua/diagnostic-nvim nvim-lua/lsp_extensions.nvim +nvim-lua/telescope.nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter ocaml/vim-ocaml From ec2bd3c95cae85593a29863f5b941e86b4e95f6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 19:29:35 +0000 Subject: [PATCH 156/294] beancount: 2.3.2 -> 2.3.3 --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index b3232f8eca54..f1dc7a5349d9 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -4,14 +4,14 @@ , ply, python_magic, pytest, requests }: buildPythonPackage rec { - version = "2.3.2"; + version = "2.3.3"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1wfpf2b0sha84rz0qgkanc82wharjqr2nr7xxg1rngrci2h0aqhd"; + sha256 = "0767ap2n9vk9dz40njndfhaprajr75fvzx7igbd1szc6x8wri8nr"; }; # Tests require files not included in the PyPI archive. From bd31e0dd0bf6b2befc70f8eb9dd6cbaec939ac98 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 29 Oct 2020 13:38:50 -0700 Subject: [PATCH 157/294] prometheus-pushgateway: 1.2.0 -> 1.3.0 --- pkgs/servers/monitoring/prometheus/pushgateway.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 1425fccdca4b..d2d59c5e5ded 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "pushgateway"; - version = "1.2.0"; + version = "1.3.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "0q57pvdfapi1xx8mw7ykvxs64alypyqbxwvrqjcrgv2jidbcd1mm"; + sha256 = "0ll6s8yqcx3fgn6gzmfb1bsfykl0ra6383nyw1kjbj260w200gls"; }; buildUser = "nix@nixpkgs"; From 4e3da4adc82fec01e75fdbd0f9a94b547b7a5692 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 29 Oct 2020 12:59:03 -0700 Subject: [PATCH 158/294] blackbox-exporter: 0.17.0 -> 0.18.0 --- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 45d70d47d6e8..e1fd31c3202f 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "blackbox_exporter"; - version = "0.17.0"; + version = "0.18.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "00ganz6wfwyb9avkp2fr4bwpzvfiffsmpgndl8zp80bk7m1b3mnz"; + sha256 = "1h4s0ww1drh14slrj9m7mx224qx9c6hyjav8sj959r75902i9491"; }; # dns-lookup is performed for the tests From 218809ef122f5e5f6ddfea8c330cf78ba416117b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Oct 2020 16:41:39 -0400 Subject: [PATCH 159/294] linux: 4.14.202 -> 4.14.203 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index cdbedb34f8d8..a28531ee4012 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.202"; + version = "4.14.203"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0a739g3s0lc579zp4478xr645qzvhmrm1w19x0rj7p8bbfmigiwm"; + sha256 = "0c9r1s83mrn9lzgrr4wzvk4d72q70sbgf7lql6z9ivkf12v3p5mc"; }; } // (args.argsOverride or {})) From 65b969b076f48d940cb0a836193505f478c3b30b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Oct 2020 16:42:50 -0400 Subject: [PATCH 160/294] linux: 4.19.152 -> 4.19.153 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 4c0d7b06ef4d..23438f7e29c7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.152"; + version = "4.19.153"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0p857b1gmmc2bv8limrdbfb3zsnchvg275sx5fkyy4185jfam9m5"; + sha256 = "18sxs6vnxkjgyr6sk07bbhfccfm5wfj5pzvf1ciwc3kmsv92h4mj"; }; } // (args.argsOverride or {})) From 822c60b2fb6c67804d57273b52f55cd0e70cfe26 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Oct 2020 16:43:37 -0400 Subject: [PATCH 161/294] linux: 4.4.240 -> 4.4.241 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 539a783e0af2..64d011461805 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.240"; + version = "4.4.241"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "131pamgxxmx4ba4gn2qxczv8w3lxrmwlqg0a7pdjzg0sy9lirygk"; + sha256 = "054jd6jgymxbkjfmk8wbckihl355gjimjg2xi5yr4v2343qi9zij"; }; } // (args.argsOverride or {})) From bc6185c207212bd70aedddd7b9b30bf814c052ab Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Oct 2020 16:44:20 -0400 Subject: [PATCH 162/294] linux: 4.9.240 -> 4.9.241 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 58ae2945427b..2d81826d6c36 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.240"; + version = "4.9.241"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0vvpvw5wsvjnwch5ci63x08qc7qyzpyxbiaxx4521nl8d7371r06"; + sha256 = "0b5k9cwz7vpaybw4nd03pn2z4d8qbhmhd9mx4j2yd0fqj57x1in4"; }; } // (args.argsOverride or {})) From 6a4d9c16babe298c3d66fa9d7d58c3c66e81ee03 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Oct 2020 16:45:17 -0400 Subject: [PATCH 163/294] linux: 5.4.72 -> 5.4.73 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 9203321f1f78..ad3334d7c938 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.72"; + version = "5.4.73"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0whi5kr1ziy9y20p42adnmqks41cavsraa36g9dbbrbgsmdn890f"; + sha256 = "1cknwnzpimjfacjbb39ay9j4lv3767j2858xz9yvwsvj7d04nhjs"; }; } // (args.argsOverride or {})) From 844f488498df87cfad379e64d44082e16cd6370f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Oct 2020 16:46:06 -0400 Subject: [PATCH 164/294] linux: 5.8.16 -> 5.8.17 --- pkgs/os-specific/linux/kernel/linux-5.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index 35bc489c3c55..ee58f02db876 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.16"; + version = "5.8.17"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1icxa0pgqhji924ryz37mpjjf4zlkrm8bidanjyn2mzbar7migzx"; + sha256 = "00rwvsrmklvkzch8bl6z29vch4dyvzxrs97pr1qd13afw7y6912n"; }; } // (args.argsOverride or {})) From 1ab68981ef9959c2db9c5e3331762c4bd53e2cf9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Oct 2020 16:46:53 -0400 Subject: [PATCH 165/294] linux: 5.9.1 -> 5.9.2 --- pkgs/os-specific/linux/kernel/linux-5.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix index d96dd841d8a9..05c594f7efba 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9.1"; + version = "5.9.2"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0dn0xz81pphca5dkg6zh8c78p05f63rrr5ihqqsmhc4n73li2jms"; + sha256 = "0dh2ciyrm2ac7r4pybxa1cq3pfw3z3ilj50gdaa0clm9j7nyrx2i"; }; } // (args.argsOverride or {})) From e57cbfc0484759d741d8f11708ca0c78867adcf9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 29 Oct 2020 11:47:29 -0700 Subject: [PATCH 166/294] libguestfs: inherit hydraPlatforms from appliance (cherry picked from commit 265f2f576f94d7cbc3149304f2d6d7406b6ee8db) --- pkgs/development/libraries/libguestfs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index d8a037aa5f15..b875b3579037 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -91,5 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://libguestfs.org/"; maintainers = with maintainers; [offline]; platforms = platforms.linux; + # this is to avoid "output size exceeded" + hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux; }; } From 6a9f56b82d72437b4d028beedbfd19ba0eb3ac4e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 21:42:11 +0000 Subject: [PATCH 167/294] abcl: 1.7.1 -> 1.8.0 --- pkgs/development/compilers/abcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index edcf722f2553..f27abda03d18 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { pname = "abcl"; - version = "1.7.1"; + version = "1.8.0"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "09wjcjvriagml740krg9nva5v6bsc3sav86dmb55pjvfpsr1846m"; + sha256 = "0wpfj7q9vq2k2mkp2wx2yvrcq0v8229ddyk8viiaizs7msn588ac"; }; configurePhase = '' mkdir nix-tools From 05659a44ceb009f9c0c7060c3c1456276a2b3472 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 29 Oct 2020 21:10:12 +0800 Subject: [PATCH 168/294] nmapsi4: 0.4.80-20180430 -> 0.5-alpha2 --- pkgs/tools/security/nmap/qt.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix index 2dcd7fed0c4b..216186daa5be 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/tools/security/nmap/qt.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook -, dnsutils, nmap -, qtbase, qtscript, qtwebengine }: +{ stdenv +, fetchFromGitHub +, cmake +, pkgconfig +, wrapQtAppsHook +, dnsutils +, nmap +, qtbase +, qtscript +, qtwebengine +}: stdenv.mkDerivation rec { pname = "nmapsi4"; - version = "0.4.80-20180430"; + version = "0.5-alpha2"; src = fetchFromGitHub { owner = "nmapsi4"; repo = "nmapsi4"; - rev = "d7f18e4c1e38dcf9c29cb4496fe14f9ff172861a"; - sha256 = "10wqyrjzmad1g7lqa65rymbkna028xbp4xcpj442skw8gyrs3994"; + rev = "v${version}"; + sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY="; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; @@ -47,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt frontend for nmap"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; inherit (src.meta) homepage; }; From 126fe379216b083db17a3a72f84e018e64c31ba6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 22:44:05 +0000 Subject: [PATCH 169/294] consul: 1.8.4 -> 1.8.5 --- 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 c153cc390732..8912ce847883 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.8.4"; + version = "1.8.5"; 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 = "0rm6qf8jnn6khrx9dy8r4ji1yd89hai52d9zggb5r99k7m9wd291"; + sha256 = "1cf3zvb3xh97hz5hav9f1q3b22lwryw6a7gcmm7cphk6bdrdiva5"; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "1g3a9m6aqarq0rqf7qrp9yxcsc3sjnx0vbypakzmrq1ndgdivk16"; + vendorSha256 = "1zz3hhngvx7989m73cp5a9j6spg42hgqd9vs8v332fvcr277lyxj"; doCheck = false; From ff4a1cf4d8a8c3566b059786ca3326b1ce282b47 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Thu, 29 Oct 2020 18:10:39 -0400 Subject: [PATCH 170/294] git-review: build with python3 Also updated source to the new repo and added myself as a maintainer --- .../version-management/git-review/default.nix | 21 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index c7702cfa1951..d0bbca15ea17 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages} : +{ lib, fetchurl, buildPythonApplication, pbr, requests, setuptools }: -pythonPackages.buildPythonApplication rec { +buildPythonApplication rec { pname = "git-review"; version = "1.28.0"; @@ -8,21 +8,20 @@ pythonPackages.buildPythonApplication rec { # upstream repository (and we are installing from tarball instead) PBR_VERSION = version; - src = fetchFromGitHub { - owner = "openstack-infra"; - repo = pname; - rev = version; - sha256 = "1hgw1dkl94m3idv4izc7wf2j7al2c7nnsqywy7g53nzkv9pfv47s"; + src = fetchurl { + url = "https://opendev.org/opendev/${pname}/archive/${version}.tar.gz"; + sha256 = "1y1jzb0hlprynwwr4q5y4x06641qrhj0k69mclabnmhfam9g8ygm"; }; - propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ]; + propagatedBuildInputs = [ pbr requests setuptools ]; # Don't do tests because they require gerrit which is not packaged doCheck = false; - meta = { - homepage = "https://github.com/openstack-infra/git-review"; + meta = with lib; { + homepage = "https://opendev.org/opendev/git-review"; description = "Tool to submit code to Gerrit"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ metadark ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a37fab7ec3db..64c08133c688 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21055,7 +21055,7 @@ in git-quick-stats = callPackage ../development/tools/git-quick-stats {}; - git-review = callPackage ../applications/version-management/git-review { }; + git-review = python3Packages.callPackage ../applications/version-management/git-review { }; github-cli = gitAndTools.gh; From 8bdb5204be1e2d7168cdb44d28d57c4a09286bf7 Mon Sep 17 00:00:00 2001 From: Sebastien Braun Date: Wed, 28 Oct 2020 22:57:33 +0100 Subject: [PATCH 171/294] aria2: refactor to avoid python2 dependency Use python3 Sphinx package instead of python2 Sphinx package, to avoid build-time dependency on python 2, as per https://github.com/NixOS/nixpkgs/issues/101964 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64c08133c688..ff3444cd47b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1326,7 +1326,7 @@ in aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; - inherit (pythonPackages) sphinx; + inherit (python3Packages) sphinx; }; aria = aria2; From 8975bd93b75c865c525ede2bce3c39af9146fffb Mon Sep 17 00:00:00 2001 From: Shawn Dooley Date: Thu, 29 Oct 2020 20:15:50 -0400 Subject: [PATCH 172/294] fldigi: 4.1.14 -> 4.1.15 Corrected hash format --- pkgs/applications/radio/fldigi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 97a8369468da..3811c8fd6f26 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "260a61be714d9a7274adb78a822f210a589f4c344d5444c5f2cbbcd7c466ebbb"; + sha256 = "1fzbcv2dgg6byb2l8m2d6i69yn0a44pq52mpmms756jdf6z622i6"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio From 6e19ed0a526598087c08bd4ea389394115a6360f Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Thu, 29 Oct 2020 13:27:45 +0100 Subject: [PATCH 173/294] lumpy: 0.3.0 -> 0.3.1 --- pkgs/applications/science/biology/lumpy/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/lumpy/default.nix b/pkgs/applications/science/biology/lumpy/default.nix index 04512e8e372e..f6267a2e017f 100644 --- a/pkgs/applications/science/biology/lumpy/default.nix +++ b/pkgs/applications/science/biology/lumpy/default.nix @@ -7,13 +7,14 @@ let in stdenv.mkDerivation rec { pname = "lumpy"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "arq5x"; repo = "lumpy-sv"; - rev = version; - sha256 = "0azhzvmh9az9jcq0xprlzdz6w16azgszv4kshb903bwbnqirmk18"; + rev = "v${version}"; + sha256 = "0r71sg7qch8r6p6dw995znrqdj6q49hjdylhzbib2qmv8nvglhs9"; + fetchSubmodules = true; }; nativeBuildInputs = [ which ]; @@ -26,6 +27,8 @@ in stdenv.mkDerivation rec { # Use Nix htslib over bundled version sed -i 's/lumpy_filter: htslib/lumpy_filter:/' Makefile sed -i 's|../../lib/htslib/libhts.a|-lhts|' src/filter/Makefile + # Also make sure we use the includes from Nix's htslib + sed -i 's|../../lib/htslib/|${htslib}|' src/filter/Makefile ''; # Upstream's makefile doesn't have an install target From 459c5ec3b19767b96ef11225d60b0964c467f3b1 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Thu, 29 Oct 2020 16:20:23 +0100 Subject: [PATCH 174/294] pythonPackages.pysam: Disable failing tests unrelated to packaging These will be fixed upstream and are due to format changes introduced in samtools and htslib 1.11 --- pkgs/development/python-modules/pysam/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 2802b6d0e0ff..2f40a2973332 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -80,13 +80,19 @@ buildPythonPackage rec { --deselect tests/AlignmentFileHeader_test.py::TestHeaderBAM::test_header_content_is_as_expected \ --deselect tests/AlignmentFileHeader_test.py::TestHeaderCRAM::test_dictionary_access_works \ --deselect tests/AlignmentFileHeader_test.py::TestHeaderCRAM::test_header_content_is_as_expected \ - --deselect tests/AlignmentFile_test.py::TestIO::testBAM2SAM \ - --deselect tests/AlignmentFile_test.py::TestIO::testSAM2BAM \ - --deselect tests/AlignmentFile_test.py::TestIO::testWriteUncompressedBAMFile \ --deselect tests/AlignmentFile_test.py::TestDeNovoConstruction::testBAMWholeFile \ --deselect tests/AlignmentFile_test.py::TestEmptyHeader::testEmptyHeader \ --deselect tests/AlignmentFile_test.py::TestHeaderWithProgramOptions::testHeader \ + --deselect tests/AlignmentFile_test.py::TestIO::testBAM2BAM \ + --deselect tests/AlignmentFile_test.py::TestIO::testBAM2CRAM \ + --deselect tests/AlignmentFile_test.py::TestIO::testBAM2SAM \ + --deselect tests/AlignmentFile_test.py::TestIO::testFetchFromClosedFileObject \ + --deselect tests/AlignmentFile_test.py::TestIO::testOpenFromFilename \ + --deselect tests/AlignmentFile_test.py::TestIO::testSAM2BAM \ + --deselect tests/AlignmentFile_test.py::TestIO::testWriteUncompressedBAMFile \ + --deselect tests/AlignmentFile_test.py::TestIteratorRowAllBAM::testIterate \ --deselect tests/StreamFiledescriptors_test.py::StreamTest::test_text_processing \ + --deselect tests/compile_test.py::BAMTest::testCount \ tests/ ''; From ffde641ac935580f504e1d163a32b769deee7927 Mon Sep 17 00:00:00 2001 From: Matthew Kenigsberg Date: Thu, 29 Oct 2020 17:58:40 -0500 Subject: [PATCH 175/294] alibuild: use python3 Helps #101964 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff3444cd47b0..4f5c62ac0bd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28271,7 +28271,7 @@ in undervolt = callPackage ../os-specific/linux/undervolt { }; alibuild = callPackage ../development/tools/build-managers/alibuild { - python = python27; + python = python3; }; tsung = callPackage ../applications/networking/tsung {}; From a86b58192b6361f7098cdf71bd828928c9fde0aa Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 30 Oct 2020 09:59:23 +0900 Subject: [PATCH 176/294] spago: 0.16.0 -> 0.17.0 --- .../tools/purescript/spago/spago.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index b36bc26433d3..4a5ad361e9fd 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -2,20 +2,20 @@ , base, bower-json, bytestring, Cabal, containers, dhall, directory , either, exceptions, extra, fetchgit, file-embed, filepath, foldl , fsnotify, github, Glob, hpack, hspec, hspec-discover -, hspec-megaparsec, http-client, http-conduit, lens-family-core -, megaparsec, mtl, network-uri, open-browser, optparse-applicative -, prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe -, semver-range, stdenv, stm, tar, template-haskell, temporary, text -, time, transformers, turtle, unliftio, unordered-containers -, vector, versions, with-utf8, zlib +, hspec-megaparsec, http-client, http-conduit, http-types +, lens-family-core, megaparsec, mtl, network-uri, open-browser +, optparse-applicative, prettyprinter, process, QuickCheck, retry +, rio, rio-orphans, safe, semver-range, stdenv, stm, tar +, template-haskell, temporary, text, time, transformers, turtle +, unliftio, unordered-containers, vector, versions, with-utf8, zlib }: mkDerivation { pname = "spago"; - version = "0.16.0"; + version = "0.17.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "0z4s0z14n1v9wajs7mj2b295rrrw24gdca79drzlv6x1y6dj7sxh"; - rev = "71b093cdf5e48ded645303281ab4a3ea5b730f5d"; + sha256 = "1w9y1gvk307f92gixs5g02zbg0xwhrshwmc5j97pxhbzzg9qjidy"; + rev = "3309afdef25e3e77f991a079eed78ff2f750e463"; fetchSubmodules = true; }; isLibrary = true; @@ -24,7 +24,7 @@ mkDerivation { aeson aeson-pretty ansi-terminal async-pool base bower-json bytestring Cabal containers dhall directory either exceptions file-embed filepath foldl fsnotify github Glob http-client - http-conduit lens-family-core megaparsec mtl network-uri + http-conduit http-types lens-family-core megaparsec mtl network-uri open-browser optparse-applicative prettyprinter process retry rio rio-orphans safe semver-range stm tar template-haskell temporary text time transformers turtle unliftio unordered-containers vector From b62111d73a55efffa648f1c30ff1984e6b0839c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Oct 2020 01:03:01 +0000 Subject: [PATCH 177/294] cargo-audit: 0.12.1 -> 0.13.1 --- pkgs/tools/package-management/cargo-audit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 8fd5c38ed55a..df492863a142 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "1rhwr2wp4rl2acx4is8aajxd12haph2mdarr8qiwaimsawndaxrw"; + sha256 = "1q8i2c3f8ir1pxkvla4dshz7n0cl97mjydc64xis5pph39f69yc1"; }; - cargoSha256 = "0m8za771b14vj5w3i906qwhcz43233fjsywlikfl0iv9n5m9k1ab"; + cargoSha256 = "1b62mcj4gjz2arjf3r30k9qcg81i5x0149a4bfj39xdrz55gg0wh"; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; From 0f1a83cf55ebc4109e569095d486ac67aa96c1fb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 30 Oct 2020 02:22:09 +0100 Subject: [PATCH 178/294] attica: drop as far as I can tell, this file is completely unused. Everything that uses attica uses it from pkgs/development/libraries/kde-frameworks/attica.nix --- pkgs/development/libraries/attica/default.nix | 20 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/development/libraries/attica/default.nix diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix deleted file mode 100644 index d883100fd3ce..000000000000 --- a/pkgs/development/libraries/attica/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4 }: - -stdenv.mkDerivation rec { - name = "attica-0.4.2"; - - src = fetchurl { - url = "mirror://kde/stable/attica/${name}.tar.bz2"; - sha256 = "1y74gsyzi70dfr9d1f1b08k130rm3jaibsppg8dv5h3211vm771v"; - }; - - buildInputs = [ qt4 ]; - nativeBuildInputs = [ cmake ]; - - meta = with stdenv.lib; { - description = "Library to access Open Collaboration Service providers"; - license = "LGPL"; - maintainers = [ maintainers.sander maintainers.phreedom ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a37fab7ec3db..d051824148c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12072,8 +12072,6 @@ in aspell = aspell.override { searchNixProfiles = false; }; }; - attica = callPackage ../development/libraries/attica { }; - attr = callPackage ../development/libraries/attr { }; at-spi2-core = callPackage ../development/libraries/at-spi2-core { }; From 69f235c3aa229ad4e1fa3f7500974caad2a1e982 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Oct 2020 01:22:13 +0000 Subject: [PATCH 179/294] bpytop: 1.0.44 -> 1.0.47 --- pkgs/tools/system/bpytop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index 8788080e998a..e395b3c5d611 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.44"; + version = "1.0.47"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "1fb7n0p364sj8pzsg35lrgl5wga3v4d0b4nynkfs5g8rfnmb0rr0"; + sha256 = "1zsxqnisb9zyji6xwl4b7r722mr0g4hs3a74xsfghd5kafvgzj24"; }; buildInputs = [ makeWrapper ]; From 43662810755ce7814c5398ee6551ea337cb40403 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 29 Oct 2020 20:22:29 -0400 Subject: [PATCH 180/294] writers.writeNginxConfig: fix cross-compilation Native versions of awk, sed and gixy need to be used. --- pkgs/build-support/writers/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 495a56b41974..9c709921d210 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ pkgs, lib, gawk, gnused, gixy }: with lib; rec { @@ -219,10 +219,11 @@ rec { writeNginxConfig = name: text: pkgs.runCommandLocal name { inherit text; passAsFile = [ "text" ]; + nativeBuildInputs = [ gawk gnused gixy ]; } /* sh */ '' # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16 - ${pkgs.gawk}/bin/awk -f ${awkFormatNginx} "$textPath" | ${pkgs.gnused}/bin/sed '/^\s*$/d' > $out - ${pkgs.gixy}/bin/gixy $out + awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out + gixy $out ''; # writePerl takes a name an attributeset with libraries and some perl sourcecode and From c0bcfebaef6a3ad8517bf09d6e65a3ec81c90a18 Mon Sep 17 00:00:00 2001 From: Sebastien Braun Date: Thu, 29 Oct 2020 11:44:56 +0100 Subject: [PATCH 181/294] rmlint: Use Python3 sphinx for docs Eliminates a python2 dependency. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f5c62ac0bd5..261b78f38325 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6824,7 +6824,7 @@ in rkrlv2 = callPackage ../applications/audio/rkrlv2 {}; rmlint = callPackage ../tools/misc/rmlint { - inherit (pythonPackages) sphinx; + inherit (python3Packages) sphinx; }; rng-tools = callPackage ../tools/security/rng-tools { }; From aa98d660e7c5d6f73b9b5af7d75cd17456b4b59b Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Thu, 29 Oct 2020 20:45:58 +0100 Subject: [PATCH 182/294] openbgpd: 6.7p0 -> 6.8p0 --- pkgs/servers/openbgpd/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/servers/openbgpd/default.nix index 7ca71c127754..02c1c607eab8 100644 --- a/pkgs/servers/openbgpd/default.nix +++ b/pkgs/servers/openbgpd/default.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchFromGitHub, autoconf, automake -, libtool, m4, yacc }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, m4, yacc }: let - openbsd_version = "OPENBSD_6_7"; # This has to be equal to ${src}/OPENBSD_BRANCH + openbsd_version = + "OPENBSD_6_8"; # This has to be equal to ${src}/OPENBSD_BRANCH openbsd = fetchFromGitHub { + name = "portable"; owner = "openbgpd-portable"; repo = "openbgpd-openbsd"; rev = openbsd_version; - sha256 = "sha256-YJTHUsn6s4xLcLQuxCLmEkIE8ozxzooj71cJ5Wl+0lI="; + sha256 = "sha256-vCVK5k4g6aW2z2fg7Kv0uvkX7f34aRc8K2myb3jjl6w="; }; in stdenv.mkDerivation rec { pname = "opengpd"; - version = "6.7p0"; + version = "6.8p0"; src = fetchFromGitHub { owner = "openbgpd-portable"; repo = "openbgpd-portable"; rev = version; - sha256 = "sha256-10DfK45BsSHeyANB0OJLKog1mEj0mydXSDAT9G6u1gM"; + sha256 = "sha256-TKs6tt/SCWes6kYAGIrSShZgOLf7xKh26xG3Zk7wCCw="; }; - nativeBuildInputs = - [ autoconf automake libtool m4 yacc ]; + nativeBuildInputs = [ autoconf automake libtool m4 yacc ]; preConfigure = '' mkdir ./openbsd @@ -36,7 +36,8 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol"; + description = + "A free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol"; license = licenses.isc; homepage = "http://www.openbgpd.org/"; maintainers = with maintainers; [ kloenk ]; From 89b4c4597643bc8b44085c4014a3996a20af38f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Oct 2020 02:09:54 +0000 Subject: [PATCH 183/294] broot: 1.0.3 -> 1.0.4 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 3027537dd873..077d5dc777c1 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.0.3"; + version = "1.0.4"; src = fetchCrate { inherit pname version; - sha256 = "046yg270hnwzhap2rraihywpqjq5s3qxmyfcvfgfayz25216jmvc"; + sha256 = "06gq7xn9g5wk6d5p732998q7lxbw2g6qb8vsv95jcnybarf88n1v"; }; - cargoSha256 = "02l6cdfx2sglygsdgnm474vmpbmpm2a1s6srd9cy66k6hjm1m0bn"; + cargoSha256 = "1cbvi3jgj78gly3xkqbn8ai0ra5hpdphpdy7cphlrym0aj77ck4a"; nativeBuildInputs = [ makeWrapper From 4506d174c68a0f3d6d4ad009b21d202b5fe52f32 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 29 Oct 2020 07:04:23 -0400 Subject: [PATCH 184/294] zenith: 0.10.1 -> 0.11.0 --- pkgs/tools/system/zenith/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 084dd044feba..35498c4cb563 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; rev = version; - sha256 = "0jz0pjibjiyg0rjmpihxxjhg9cbccvqfr5si5rji585l0zrpdwsg"; + sha256 = "1cxmgpq07q6vfasnkx3grpx1y0f0dg6irb9kdn17nwrypy44l92d"; }; - cargoSha256 = "1zkx6sr5xlj7pb91bxvqjib5awscy1rmv4g89xb76dahac8fan6z"; + cargoSha256 = "1kgjj11fwvlk700yp9046b3kiq9ay47fiwqpqfhmlbxw3lsh8qvq"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; From 57ea265674f8e23ede036bd72cf437da7e110c4d Mon Sep 17 00:00:00 2001 From: "S. Nordin Abouzahra" Date: Wed, 21 Oct 2020 21:47:30 -0400 Subject: [PATCH 185/294] firefox: place alsaLib in lib search patch libcubeb has dlopened libraries for awhile now. In nixpkgs there was support for the PulseAudio backend doing this, however the ALSA backend support was missed and caused issue #79310 (no sound with ALSA). This gives ALSA users the ability to hear sound once again. --- pkgs/applications/networking/browsers/firefox/common.nix | 1 + pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c787fb5754d5..03cf35e1a6be 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -333,6 +333,7 @@ buildStdenv.mkDerivation ({ version = ffversion; isFirefox3Like = true; gtk = gtk2; + inherit alsaSupport; inherit nspr; inherit ffmpegSupport; inherit gssSupport; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 424c45d305e8..9c8625495b20 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd +, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native @@ -39,6 +39,7 @@ let enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; + alsaSupport = browser.alsaSupport or false; plugins = let @@ -76,6 +77,7 @@ let (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio + ++ lib.optional alsaSupport alsaLib ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk2 ]; From 5a2d63f5e2742b9013f2fb18293ef7a074a186ae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 30 Oct 2020 04:20:00 +0000 Subject: [PATCH 186/294] tmux: update completions --- pkgs/tools/misc/tmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 12ea456b9f7e..29c659ff8190 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -13,8 +13,8 @@ let bashCompletion = fetchFromGitHub { owner = "imomaliev"; repo = "tmux-bash-completion"; - rev = "fcda450d452f07d36d2f9f27e7e863ba5241200d"; - sha256 = "092jpkhggjqspmknw7h3icm0154rg21mkhbc71j5bxfmfjdxmya8"; + rev = "f5d53239f7658f8e8fbaf02535cc369009c436d6"; + sha256 = "0sq2g3w0h3mkfa6qwqdw93chb5f1hgkz5vdl8yw8mxwdqwhsdprr"; }; in From fcc6849bcd58073b365848031335abf58c7331cd Mon Sep 17 00:00:00 2001 From: Alex Whitt Date: Mon, 31 Aug 2020 16:52:41 -0400 Subject: [PATCH 187/294] bacnet-stack: init at 1.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update pkgs/tools/networking/bacnet-stack/default.nix Co-authored-by: Daniel Løvbrøtte Olsen bacnet-stack: Add maintainer and use the original GitHub repo bacnet-stack: Alphabetize Update pkgs/top-level/all-packages.nix Co-authored-by: Jon --- .../tools/networking/bacnet-stack/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/bacnet-stack/default.nix diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix new file mode 100644 index 000000000000..596b30d03e89 --- /dev/null +++ b/pkgs/tools/networking/bacnet-stack/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "bacnet-stack"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "bacnet-stack"; + repo = "bacnet-stack"; + rev = "bacnet-stack-${version}"; + sha256 = "078p7qsy9v6fl7pzwgcr72pgjqxfxmfxyqajih2zqlb5g5sf88vh"; + }; + + hardeningDisable = [ "all" ]; + + buildPhase = '' + make BUILD=debug BACNET_PORT=linux BACDL_DEFINE=-DBACDL_BIP=1 BACNET_DEFINES=" -DPRINT_ENABLED=1 -DBACFILE -DBACAPP_ALL -DBACNET_PROPERTY_LISTS" + ''; + + installPhase = '' + mkdir $out + cp -r bin $out/bin + ''; + + meta = with stdenv.lib; { + description = "BACnet open source protocol stack for embedded systems, Linux, and Windows"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ WhittlesJr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e85382c7891b..2d0fc9f2aa6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -144,6 +144,8 @@ in avro-tools = callPackage ../development/tools/avro-tools { }; + bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; From 3e4878370e8b24015d08ee2101993b49301ca151 Mon Sep 17 00:00:00 2001 From: Alex Eyre Date: Fri, 30 Oct 2020 07:45:03 +0000 Subject: [PATCH 188/294] python-modules/coordinates: remove mildlyincompetent from the maintainers list also removed from maintainers-list.nix, motivation for change is that he was a friend, and he unfortunately passed away earlier this year. --- maintainers/maintainer-list.nix | 6 ------ pkgs/development/python-modules/coordinates/default.nix | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4b77ffca8846..d81993d59669 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5689,12 +5689,6 @@ githubId = 1387206; name = "Mike Sperber"; }; - mildlyincompetent = { - email = "nix@kch.dev"; - github = "mildlyincompetent"; - githubId = 19479662; - name = "Kajetan Champlewski"; - }; millerjason = { email = "mailings-github@millerjason.com"; github = "millerjason"; diff --git a/pkgs/development/python-modules/coordinates/default.nix b/pkgs/development/python-modules/coordinates/default.nix index 44a41b92c4e5..c7a24a0c3e90 100644 --- a/pkgs/development/python-modules/coordinates/default.nix +++ b/pkgs/development/python-modules/coordinates/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Convenience class for doing maths with explicit coordinates"; homepage = "https://github.com/clbarnes/coordinates"; license = licenses.mit; - maintainers = [ maintainers.mildlyincompetent ]; + maintainers = [ ]; }; } From 7f8f1fc1823ad7c01d5925426030104a7058864f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 23 Oct 2020 21:22:34 +0200 Subject: [PATCH 189/294] ocamlPackages.re: use released source rather than a git snapshot This fixes the version information in the META file --- pkgs/development/ocaml-modules/re/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 8881821490ab..ca3cf1e82675 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchzip, buildDunePackage, ocaml, ounit, seq }: +{ lib, fetchurl, buildDunePackage, ocaml, ounit, seq }: buildDunePackage rec { pname = "re"; @@ -6,9 +6,9 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; - src = fetchzip { - url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; - sha256 = "07ycb103mr4mrkxfd63cwlsn023xvcjp0ra0k7n2gwrg0mwxmfss"; + src = fetchurl { + url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz"; + sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj"; }; buildInputs = lib.optional doCheck ounit; From 557094a10c5f570631e1f91f92078f1d7e0f107a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 23 Oct 2020 21:23:38 +0200 Subject: [PATCH 190/294] =?UTF-8?q?ocamlPackages.ocp-build:=201.99.19-beta?= =?UTF-8?q?=20=E2=86=92=201.99.21-beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/ocaml/ocp-build/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 4ebea6766211..57db51612245 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchpatch, fetchFromGitHub, ocaml, findlib, ncurses }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }: let - version = "1.99.19-beta"; + version = "1.99.21"; in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ocp-build-${version}"; + name = "ocaml${ocaml.version}-ocp-build-${version}-beta"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-build"; - rev = version; - sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; + rev = "v${version}"; + sha256 = "1641xzik98c7xnjwxpacijd6d9jzx340fmdn6i372z8h554jjlg9"; }; - patches = stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.08") (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-pp/ocp-pp.1.99.19-beta/files/0001-Fix-ocp-pp-for-changes-in-compiler-libs.patch"; - sha256 = "0s0s2hh4d7cmwd6i7ixjgb79vij0r1v54m0vwwi26b3fips09qyn"; - }); - - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib cmdliner re ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; preConfigure = '' From 525e15efaec83aa7cbb8a9c27b01e029b87cb2dd Mon Sep 17 00:00:00 2001 From: Ash Date: Fri, 30 Oct 2020 05:04:28 -0700 Subject: [PATCH 191/294] gajim: strictDeps = false (#102141) * gajim: strictDeps = false Without this it doesn't find GSettings schemas, which causes it to crash when (for example) you try to change your avatar. --- .../networking/instant-messengers/gajim/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 2ee017dfdbaf..eef24f75f155 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -60,6 +60,9 @@ python3.pkgs.buildPythonApplication rec { ${python3.interpreter} setup.py test ''; + # necessary for wrapGAppsHook + strictDeps = false; + meta = { homepage = "http://gajim.org/"; description = "Jabber client written in PyGTK"; From 879dc6a6bcc71394ea5725f82b6c978539739324 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 30 Oct 2020 07:16:00 -0500 Subject: [PATCH 192/294] tmux: 3.1b -> 3.1c --- pkgs/tools/misc/tmux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 29c659ff8190..7fa33ed82f21 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.1b"; + version = "3.1c"; outputs = [ "out" "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0jvyq4r691bn0wsr8i6c0q0lzss25vm9nx8sv3fhw9cs63ncq04y"; + sha256 = "1fqgpzfas85dn0sxlvvg6rj488jwgnxs8d3gqcm8lgs211m9qhcf"; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://tmux.github.io/"; + homepage = "https://tmux.github.io/"; description = "Terminal multiplexer"; longDescription = From bee3fb885fa3476fc6cd5274b1600f80bc278e51 Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Tue, 6 Oct 2020 23:54:12 -0300 Subject: [PATCH 193/294] flutter: Add dart cache to flutter --- .../development/compilers/flutter/default.nix | 28 +++++++++------ .../development/compilers/flutter/flutter.nix | 11 ++++-- .../{beta => dev}/disable-auto-update.patch | 8 ++--- .../patches/{beta => dev}/move-cache.patch | 34 +++++++++---------- .../patches/stable/disable-auto-update.patch | 28 +++++++-------- .../flutter/patches/stable/move-cache.patch | 16 ++++----- .../development/interpreters/dart/default.nix | 8 +++++ pkgs/top-level/all-packages.nix | 2 ++ 8 files changed, 78 insertions(+), 57 deletions(-) rename pkgs/development/compilers/flutter/patches/{beta => dev}/disable-auto-update.patch (88%) rename pkgs/development/compilers/flutter/patches/{beta => dev}/move-cache.patch (63%) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 9b9d1f7481d1..baab0583fb0c 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,6 +1,9 @@ -{ callPackage }: +{ callPackage, dart }: let + dart_stable = dart.override { version = "2.10.0"; }; + dart_beta = dart.override { version = "2.10.0"; }; + dart_dev = dart.override { version = "2.11.0-161.0.dev"; }; mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); @@ -10,25 +13,28 @@ in { stable = mkFlutter rec { pname = "flutter"; channel = "stable"; - version = "1.17.5"; + version = "1.22.0"; filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "0kapja3nh7dfhjbn2np02wghijrjnpzsv4hz10fj54hs8hdx19di"; + sha256Hash = "0ryrx458ss8ryhmspcfrhjvad2pl46bxh1qk5vzwzhxiqdc79vm8"; patches = getPatches ./patches/stable; + dart = dart_stable; }; beta = mkFlutter rec { - pname = "flutter-beta"; + pname = "flutter"; channel = "beta"; - version = "1.20.0-7.2.pre"; + version = "1.22.0-12.3.pre"; filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "0w89ig5vi4spa95mf08r4vvwni7bzzdlyhvr9sy1a35qmf7j9s6f"; - patches = getPatches ./patches/beta; + sha256Hash = "1axzz137z4lgpa09h7bjf52i6dij6a9wmjbha1182db23r09plzh"; + patches = getPatches ./patches/stable; + dart = dart_beta; }; dev = mkFlutter rec { - pname = "flutter-dev"; + pname = "flutter"; channel = "dev"; - version = "1.21.0-1.0.pre"; + version = "1.23.0-7.0.pre"; filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "14rx89jp6ivk3ai7iwbznkr5q445ndh8fppzbxg520kq10s2208r"; - patches = getPatches ./patches/beta; + sha256Hash = "166qb4qbv051bc71yj7c0vrkamhvzz3fp3mz318qzm947mydwjj5"; + patches = getPatches ./patches/dev; + dart = dart_dev; }; } diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index fad2a646a165..20146541ed33 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -1,5 +1,5 @@ -{ channel, pname, version, sha256Hash, patches -, filename ? "flutter_linux_v${version}-${channel}.tar.xz" }: +{ channel, pname, version, sha256Hash, patches, dart +, filename ? "flutter_linux_${version}-${channel}.tar.xz"}: { bash, buildFHSUserEnv, cacert, coreutils, git, makeWrapper, runCommand, stdenv , fetchurl, alsaLib, dbus, expat, libpulseaudio, libuuid, libX11, libxcb @@ -72,6 +72,7 @@ let with pkgs; [ bash curl + dart git unzip which @@ -119,11 +120,15 @@ in runCommand drvName { homepage = "https://flutter.dev"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ babariviere ]; + maintainers = with maintainers; [ babariviere ericdallo ]; }; } '' mkdir -p $out/bin echo -n "$startScript" > $out/bin/${pname} chmod +x $out/bin/${pname} + + mkdir -p $out/bin/cache/dart-sdk/ + cp -r ${dart}/* $out/bin/cache/dart-sdk/ + ln $out/bin/cache/dart-sdk/bin/dart $out/bin/dart '' diff --git a/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch similarity index 88% rename from pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch rename to pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch index cd01577cc10f..f9ac00d1d323 100644 --- a/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch @@ -1,8 +1,8 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 702bd9ed5..4d4dc94c6 100755 +index 22efe87443..c6954575c5 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh -@@ -204,8 +204,6 @@ function shared::execute() { +@@ -212,8 +212,6 @@ function shared::execute() { # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" @@ -12,10 +12,10 @@ index 702bd9ed5..4d4dc94c6 100755 case "$BIN_NAME" in flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 21be933e1..2ea73c4c0 100644 +index fb1616ba96..b973b3fd58 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -294,13 +294,6 @@ class FlutterCommandRunner extends CommandRunner { +@@ -291,13 +291,6 @@ class FlutterCommandRunner extends CommandRunner { globals.flutterUsage.suppressAnalytics = true; } diff --git a/pkgs/development/compilers/flutter/patches/beta/move-cache.patch b/pkgs/development/compilers/flutter/patches/dev/move-cache.patch similarity index 63% rename from pkgs/development/compilers/flutter/patches/beta/move-cache.patch rename to pkgs/development/compilers/flutter/patches/dev/move-cache.patch index 64950d4476ef..eb6ff5cf582e 100644 --- a/pkgs/development/compilers/flutter/patches/beta/move-cache.patch +++ b/pkgs/development/compilers/flutter/patches/dev/move-cache.patch @@ -1,21 +1,21 @@ diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index 8e511eefd..fef3cca8b 100644 +index a059a8e992..b664a7070c 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart -@@ -126,7 +126,7 @@ Future cleanupSystem() async { - print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); - final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; - final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); -- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); -+ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); - copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); - if (!Platform.isWindows) { - await exec( +@@ -137,7 +137,7 @@ Future cleanupSystem() async { + print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); + final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; + final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); +- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); ++ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); + copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); + if (!Platform.isWindows) { + await exec( diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index c680de599..480abfb77 100644 +index 36714c5fb4..c0cc049ee1 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart -@@ -8,6 +8,7 @@ import 'package:meta/meta.dart'; +@@ -6,6 +6,7 @@ import 'package:meta/meta.dart'; import 'package:package_config/package_config.dart'; import 'package:yaml/yaml.dart'; @@ -23,20 +23,20 @@ index c680de599..480abfb77 100644 import 'base/context.dart'; import 'base/file_system.dart'; import 'base/utils.dart'; -@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { +@@ -397,7 +398,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { for (final Map font in (family['fonts'] as List).cast>()) { final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); result.add(_Asset( - baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), ++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), relativeUri: Uri(path: entryUri.pathSegments.last), entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index c0946782c..bdbc35cb8 100644 +index aaca036d78..43ff428f8d 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -202,8 +202,15 @@ class Cache { +@@ -226,8 +226,15 @@ class Cache { return; } assert(_lock == null); @@ -53,7 +53,7 @@ index c0946782c..bdbc35cb8 100644 try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -306,7 +313,7 @@ class Cache { +@@ -330,7 +337,7 @@ class Cache { if (_rootOverride != null) { return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); } else { diff --git a/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch index c77357ea13c5..35ce5b367350 100644 --- a/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch @@ -1,24 +1,24 @@ -diff --git a/bin/flutter b/bin/flutter -index cdf974233..1f7de1c1b 100755 ---- a/bin/flutter -+++ b/bin/flutter -@@ -185,8 +185,6 @@ fi - # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" - # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" +diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh +index 8d613de739..a673466726 100644 +--- a/bin/internal/shared.sh ++++ b/bin/internal/shared.sh +@@ -204,8 +204,6 @@ function shared::execute() { + # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" + # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" --(upgrade_flutter) 3< "$PROG_NAME" +- upgrade_flutter 7< "$PROG_NAME" - - # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as - # separate space-separated args. - "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" + BIN_NAME="$(basename "$PROG_NAME")" + case "$BIN_NAME" in + flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index b3e69714f..a9eb76234 100644 +index 8a1a1e29da..778f253358 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner { +@@ -293,13 +293,6 @@ class FlutterCommandRunner extends CommandRunner { + globals.flutterUsage.suppressAnalytics = true; } - _checkFlutterCopy(); - try { - await globals.flutterVersion.ensureVersionFile(); - } on FileSystemException catch (e) { diff --git a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch index 64950d4476ef..dc77496edb31 100644 --- a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch +++ b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch @@ -1,8 +1,8 @@ diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index 8e511eefd..fef3cca8b 100644 +index d045c83f04..d51973020b 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart -@@ -126,7 +126,7 @@ Future cleanupSystem() async { +@@ -136,7 +136,7 @@ Future cleanupSystem() async { print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); @@ -12,7 +12,7 @@ index 8e511eefd..fef3cca8b 100644 if (!Platform.isWindows) { await exec( diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index c680de599..480abfb77 100644 +index 8da01315ae..bb8d61d7f2 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -8,6 +8,7 @@ import 'package:meta/meta.dart'; @@ -23,20 +23,20 @@ index c680de599..480abfb77 100644 import 'base/context.dart'; import 'base/file_system.dart'; import 'base/utils.dart'; -@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { +@@ -399,7 +400,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { for (final Map font in (family['fonts'] as List).cast>()) { final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); result.add(_Asset( - baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), ++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), relativeUri: Uri(path: entryUri.pathSegments.last), entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index c0946782c..bdbc35cb8 100644 +index a35d8f87d0..a40027dc74 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -202,8 +202,15 @@ class Cache { +@@ -215,8 +215,15 @@ class Cache { return; } assert(_lock == null); @@ -53,7 +53,7 @@ index c0946782c..bdbc35cb8 100644 try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -306,7 +313,7 @@ class Cache { +@@ -319,7 +326,7 @@ class Cache { if (_rootOverride != null) { return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); } else { diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 050e7f14979c..7d185edb1d19 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -36,6 +36,10 @@ let url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p"; }; + "2.10.0-x86_64-linux" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; + sha256 = "0dncmsfbwcn3ygflhp83i6z4bvc02fbpaq1vzdzw8xdk3sbynchb"; + }; "2.9.0-4.0.dev-x86_64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r"; @@ -48,6 +52,10 @@ let url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc"; }; + "2.11.0-161.0.dev-x86_64-linux" = fetchurl { + url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; + sha256 = "05difz4w2fyh2yq5p5pkrqk59jqljlxhc1i6lmy5kihh6z69r12i"; + }; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 551df77d2c5d..3ea1826a7331 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8636,6 +8636,8 @@ in flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter = flutterPackages.stable; + flutter-beta = flutterPackages.beta; + flutter-dev = flutterPackages.dev; fpc = callPackage ../development/compilers/fpc { }; From 33a9c38483db48ba051a55a81b01b318f7afb181 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Fri, 30 Oct 2020 21:17:18 +0800 Subject: [PATCH 194/294] ledger-live-desktop: 2.14.0 -> 2.15.0 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 3bd379ce27c8..da0449f41d1f 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.14.0"; + version = "2.15.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "057g77nd8qxi8dw9sp7x068wsxmrpnsdfrca876f0bpw7lpb0bqq"; + sha256 = "06sm4ah05j0f3bxb1sbdi8mazmxk166y2gaycll6p2xhd105ins3"; }; appimageContents = appimageTools.extractType2 { From 7882c1ae5abb997ee9dee1eb0a5b557e1a117a3b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 30 Oct 2020 09:33:25 -0400 Subject: [PATCH 195/294] linux: 4.19.153 -> 4.19.154 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 23438f7e29c7..7a63297578ba 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.153"; + version = "4.19.154"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18sxs6vnxkjgyr6sk07bbhfccfm5wfj5pzvf1ciwc3kmsv92h4mj"; + sha256 = "0ik6anz6ly0dl0lp8m5mighlvzkifnk2kljwajxa56vbhj691339"; }; } // (args.argsOverride or {})) From 8ed2e118b17cfbffb064f9d5338bcee87a5f53ac Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 30 Oct 2020 09:33:44 -0400 Subject: [PATCH 196/294] linux_latest-libre: 17724 -> 17744 --- 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 4e308d657ac4..7a831e61ae49 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 = "17724"; - sha256 = "0aqg8il35a1mda4icqprvriham81vvnsa04rjc86b6x7khxdhiq2"; + rev = "17744"; + sha256 = "120jf6d1xrpwf8yfqzfqp8a1189lca0si8fxci16sf4bdg5q1had"; } , ... }: From 95b36ade445f38e6f2442773450a702972226000 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 30 Oct 2020 09:34:22 -0400 Subject: [PATCH 197/294] oh-my-zsh: 2020-10-27 -> 2020-10-29 --- 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 0f34b08785d0..e7433e2de0b8 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-10-27"; + version = "2020-10-29"; pname = "oh-my-zsh"; - rev = "d05544562532fdf4d5f4a4d4eba01f4263e17cc7"; + rev = "852a44094a3bb4df39f8f778bc7ada2ddda09727"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1mzbic14ilka454dyv6ksxpchmswqn7w4d7sa9067ikh1kjb7s86"; + sha256 = "0021rayw5wiwgjfwy7d6g577xidws58vk7y9xxhidnmk9sr4vri7"; }; installPhase = '' From bb38f0570dd0def478a475c91948800b24230e4b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 29 Oct 2020 18:35:18 +0100 Subject: [PATCH 198/294] =?UTF-8?q?ocamlPackages.curly:=20unstable-2019-11?= =?UTF-8?q?-14=20=E2=86=92=200.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/curly/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index a17ea72140ff..236b9c19c928 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -1,25 +1,26 @@ -{ lib, buildDunePackage, fetchFromGitHub, ocaml +{ stdenv, buildDunePackage, fetchurl, ocaml , result, alcotest, cohttp-lwt-unix, odoc, curl }: buildDunePackage rec { pname = "curly"; - version = "unstable-2019-11-14"; + version = "0.2.0"; minimumOCamlVersion = "4.02"; useDune2 = true; - src = fetchFromGitHub { - owner = "rgrinberg"; - repo = pname; - rev = "33a538c89ef8279d4591454a7f699a4183dde5d0"; - sha256 = "10pxbvf5xrsajaxrccxh2lqhgp3yaf61z9w03rvb2mq44nc2dggz"; + src = fetchurl { + url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz"; + sha256 = "07vqdrklar0d5i83ip7sjw2c1v18a9m3anw07vmi5ay29pxzal6k"; }; propagatedBuildInputs = [ result ]; checkInputs = [ alcotest cohttp-lwt-unix ]; - # test dependencies are only available for >= 4.05 - doCheck = lib.versionAtLeast ocaml.version "4.05"; + # test dependencies are only available for >= 4.08 + doCheck = stdenv.lib.versionAtLeast ocaml.version "4.08" + # Some test fails in macOS sandbox + # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "") + && !stdenv.isDarwin; postPatch = '' substituteInPlace src/curly.ml \ From 207804705d4c51fe68684c97625abe94f7849484 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 30 Oct 2020 14:53:59 +0100 Subject: [PATCH 199/294] grafana: 7.3.0 -> 7.3.1 https://github.com/grafana/grafana/releases/tag/v7.3.1 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index fe915e7adc0a..7679cd88649d 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.3.0"; + version = "7.3.1"; excludedPackages = [ "release_publisher" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0sxl06xaz474ir94ng0iak57qpcbh19hs3yjh1g44vf52k5cs70i"; + sha256 = "02by07d0h07zvws2yj71qa84sgp3x49p5ib0bahh0iyr50xqb3yj"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1338x2sj11mzqqpb43dw2lxjpnv9q7zrwksyvj8ghjp4fad4pi9g"; + sha256 = "0rqipwiz8bsqkhiv30k9jmk5szhabk9rgl37n7y8l0yk2avbq895"; }; vendorSha256 = "0shaxm2y5i29rb0k5bfpcsxbw3ap913l1rb5qbr9hrx7l142dbx8"; From ee36b1cd5b8274ccc9f083ae742dbcbee0af0e45 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 30 Oct 2020 04:13:22 +0100 Subject: [PATCH 200/294] plover.dev: fix Qt version pinning Issue report: https://github.com/NixOS/nixpkgs/issues/65399#issuecomment-719066888 Similar issues in #98067. Plover seems to work fine with Qt > 5.14 so this is an easy way to fix the problem (as opposed to keeping the pinning and making it work with PyQt). --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d0fc9f2aa6e..6c397e9e459a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22934,7 +22934,7 @@ in plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; - plover = recurseIntoAttrs (libsForQt514.callPackage ../applications/misc/plover { }); + plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; From 489c73671ab957fdbb547c9c175d2530fb0d307e Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Tue, 27 Oct 2020 04:56:21 +0800 Subject: [PATCH 201/294] perlPackages.NetAsyncHTTP: init at 0.47 --- pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 76e391213c3e..c14e1424c8ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14570,6 +14570,27 @@ let }; }; + NetAsyncHTTP = buildPerlModule { + pname = "Net-Async-HTTP"; + version = "0.47"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.47.tar.gz"; + sha256 = "1lwy1ijrhibi087p3q5zvadhkq0slfrzfhb76cmkx4mpyv5v4l8f"; + }; + buildInputs = [ HTTPCookies TestIdentity TestMetricsAny TestRefcount ]; + propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ]; + preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + # network tests fail on Darwin/sandbox, so disable these + rm -f t/20local-connect.t t/22local-connect-pipeline.t t/23local-connect-redir.t + rm -f t/90rt75615.t t/90rt75616.t t/90rt93232.t + ''; + meta = { + description = "Use HTTP with IO::Async"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + NetAsyncPing = buildPerlPackage { pname = "Net-Async-Ping"; version = "0.004001"; From 7ac898fec2f37d27ac7517b1e6129e5fb31343ef Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 28 Oct 2020 16:12:53 +0800 Subject: [PATCH 202/294] kdeApplications: 20.08.1 -> 20.08.2 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1728 ++++++++++++++++---------------- 2 files changed, 865 insertions(+), 865 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 90e1cf43f6b1..dc023c57a7e6 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.1/src) +WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.2/src) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 5bcb48acc181..6966c07ec0af 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1731 +4,1731 @@ { akonadi = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/akonadi-20.08.1.tar.xz"; - sha256 = "f930de5fae376f138e87c6d67357ab799a3397d865b55c50f771b4427d85f495"; - name = "akonadi-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/akonadi-20.08.2.tar.xz"; + sha256 = "d3a4b3b3f543734ad5428ca0e573b8dbf9e05f42d51e1aab39b5b5266c16be7d"; + name = "akonadi-20.08.2.tar.xz"; }; }; akonadi-calendar = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/akonadi-calendar-20.08.1.tar.xz"; - sha256 = "896ec2523203022bf70e23897d59b64c8bfffad4ead5b6756555ab34a4047ef5"; - name = "akonadi-calendar-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/akonadi-calendar-20.08.2.tar.xz"; + sha256 = "20173d00dc764f6a1e8e0b433d96b982ceadcb17e9bd067caf2967fd5440eb51"; + name = "akonadi-calendar-20.08.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/akonadi-calendar-tools-20.08.1.tar.xz"; - sha256 = "21ccc2e1090eeda1eba0c29ab51c3bae1e8f57aedead569c4ed7995f5ad6cffc"; - name = "akonadi-calendar-tools-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/akonadi-calendar-tools-20.08.2.tar.xz"; + sha256 = "2069cc3a12f0da3f10181c13d19b1048d8f2e0c0f4a4e14309a7e6f08aa74ab9"; + name = "akonadi-calendar-tools-20.08.2.tar.xz"; }; }; akonadiconsole = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/akonadiconsole-20.08.1.tar.xz"; - sha256 = "077ee646babbc4ca4075505d3dd830f4f5b8b1253617228e96f565fe23bcaad9"; - name = "akonadiconsole-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/akonadiconsole-20.08.2.tar.xz"; + sha256 = "dc03a1986b6e7af0d26af927009d567da1e1835cc2bb5cc1b5732ffca3ecde9d"; + name = "akonadiconsole-20.08.2.tar.xz"; }; }; akonadi-contacts = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/akonadi-contacts-20.08.1.tar.xz"; - sha256 = "eee775960345ec0ca13b0550bb56fb6875867921fa7b9412a2c4b0dfb8ab4366"; - name = "akonadi-contacts-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/akonadi-contacts-20.08.2.tar.xz"; + sha256 = "e4a2696e0e0cf69926d34f160a4581131a1da8244355787564b75dec06db1b30"; + name = "akonadi-contacts-20.08.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/akonadi-import-wizard-20.08.1.tar.xz"; - sha256 = "d895c866a05f0a55ca8f2d852ed0ae3fdc13aa160cbcbaf9f1017443458d9526"; - name = "akonadi-import-wizard-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/akonadi-import-wizard-20.08.2.tar.xz"; + sha256 = "639d72ae3d32f681ddb046a87d625871b485785602cf35b817e89004def4dc5e"; + name = "akonadi-import-wizard-20.08.2.tar.xz"; }; }; akonadi-mime = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/akonadi-mime-20.08.1.tar.xz"; - sha256 = "3c7a57f798a7db1e1aebc3162c20f58a0fb9ed9e703078344ef1de215c73ff0b"; - name = "akonadi-mime-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/akonadi-mime-20.08.2.tar.xz"; + sha256 = "5699a1d44a9812c9530bc61af5822ff34a573b168d72230cd8261c05065c06e3"; + name = "akonadi-mime-20.08.2.tar.xz"; }; }; akonadi-notes = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/akonadi-notes-20.08.1.tar.xz"; - sha256 = "afc0cdba349f0b2edece44221a7c3c532d07251ec51f05994e83a1d79c4f50fc"; - name = "akonadi-notes-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/akonadi-notes-20.08.2.tar.xz"; + sha256 = "4897ca92d6b68f75254e1c419438275a94fa678c9f062dcd91c0267129886ca7"; + name = "akonadi-notes-20.08.2.tar.xz"; }; }; akonadi-search = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/akonadi-search-20.08.1.tar.xz"; - sha256 = "db305bfc55535d8812d84a119e4dcf04e7b87c345e7ac3a884469cbf55abca83"; - name = "akonadi-search-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/akonadi-search-20.08.2.tar.xz"; + sha256 = "618400950fa44f0c578ab51c3b311a47e0b2df47203f754e50bcc363201a9fc7"; + name = "akonadi-search-20.08.2.tar.xz"; }; }; akregator = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/akregator-20.08.1.tar.xz"; - sha256 = "21751a5a14b188649caeeb19cbcef877dd00548a29c073f8694e227d951c7a00"; - name = "akregator-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/akregator-20.08.2.tar.xz"; + sha256 = "4de4bd31dede5c09e0eb9e14d1da1d1979409eb1e28df5f95963086d4a49edc9"; + name = "akregator-20.08.2.tar.xz"; }; }; analitza = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/analitza-20.08.1.tar.xz"; - sha256 = "91c691df8be52255db9387549c6392ad2c5358c12e805f3a96520e2aa0c147de"; - name = "analitza-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/analitza-20.08.2.tar.xz"; + sha256 = "2fad01bf48199e3671559ec9a619f0d590af331922899c793f96fc90860ec487"; + name = "analitza-20.08.2.tar.xz"; }; }; ark = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ark-20.08.1.tar.xz"; - sha256 = "32e8546b186b88efc9d4688e02def0b6225d921f9b92cfcd328417f09ec0f725"; - name = "ark-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ark-20.08.2.tar.xz"; + sha256 = "ec061ac07687b5a3541af293e3bc2aa7bedcfe0ef38ba6e57e2704068a726ffc"; + name = "ark-20.08.2.tar.xz"; }; }; artikulate = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/artikulate-20.08.1.tar.xz"; - sha256 = "b626a6a38f6eb50d64607032d5b100351c4242e40a4a13cdce4769e188ee361a"; - name = "artikulate-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/artikulate-20.08.2.tar.xz"; + sha256 = "66545d85e25aa67816deea4b2b89b485181458a5bc117dad9588671d8b48b41c"; + name = "artikulate-20.08.2.tar.xz"; }; }; audiocd-kio = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/audiocd-kio-20.08.1.tar.xz"; - sha256 = "7662849929c96d1745ce4ac7ddc931be2eff5e3cc755f2cd959b4d3f4b20b9b0"; - name = "audiocd-kio-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/audiocd-kio-20.08.2.tar.xz"; + sha256 = "5f38c549fe8c3a4659ac8291c223327b765834e7668bc15a96047e20cdb11f01"; + name = "audiocd-kio-20.08.2.tar.xz"; }; }; baloo-widgets = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/baloo-widgets-20.08.1.tar.xz"; - sha256 = "9f48cb2f1b45e46828b1656abaeb60e836650015c07277ec52bea053d0058958"; - name = "baloo-widgets-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/baloo-widgets-20.08.2.tar.xz"; + sha256 = "e1d14b8dba911ebc1cee76dbcd44fa200418ba959d86ce567093b5fc3b700a07"; + name = "baloo-widgets-20.08.2.tar.xz"; }; }; blinken = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/blinken-20.08.1.tar.xz"; - sha256 = "53b30435ea0d83f713ecb53219173aa55c0d11194830972734a4acc9a5a28c5a"; - name = "blinken-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/blinken-20.08.2.tar.xz"; + sha256 = "c6e74033ab8ece83618c5cda0ab3cf327514b8e2e6b0e9daf484ce88f671a65e"; + name = "blinken-20.08.2.tar.xz"; }; }; bomber = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/bomber-20.08.1.tar.xz"; - sha256 = "a4b2f5dcce7e125da30bef6bcc9746b67f8451d2040696714686dd618d80a96c"; - name = "bomber-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/bomber-20.08.2.tar.xz"; + sha256 = "27c226b31bcdbbda0c9e304e428ca7451614c397a038e830f8052c381dae7215"; + name = "bomber-20.08.2.tar.xz"; }; }; bovo = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/bovo-20.08.1.tar.xz"; - sha256 = "5d5ee817a73de0deef6b7c35a798bda02c6d15e9dd0e7379a13c23c0832fe0d1"; - name = "bovo-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/bovo-20.08.2.tar.xz"; + sha256 = "936cab24a13900765f0c5a5afb6f155cb5a05bdb067f86b77e33af5f0e4c37d2"; + name = "bovo-20.08.2.tar.xz"; }; }; calendarsupport = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/calendarsupport-20.08.1.tar.xz"; - sha256 = "38d6e695725c8484e1492d431144a0ecd1b66535bc07ac77e1f0eb1499d8fc32"; - name = "calendarsupport-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/calendarsupport-20.08.2.tar.xz"; + sha256 = "83bcdd36689f762363a95b688b9377a3335b4fd58ad1d5efad36ad2b0cf7cc10"; + name = "calendarsupport-20.08.2.tar.xz"; }; }; cantor = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/cantor-20.08.1.tar.xz"; - sha256 = "c44b96ac861302589923d144bf7b5d529b6eb2f91cea2d014944a0516de31a05"; - name = "cantor-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/cantor-20.08.2.tar.xz"; + sha256 = "aca92b6e40a9e05282eae2b55f7cc6bf88612ffa9b3dde1a239648be8e5bdc59"; + name = "cantor-20.08.2.tar.xz"; }; }; cervisia = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/cervisia-20.08.1.tar.xz"; - sha256 = "eedd3b3f00b97d513437fdbd2eeaa28cd6db29512983b82196bdededd8b701f2"; - name = "cervisia-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/cervisia-20.08.2.tar.xz"; + sha256 = "b3444ecd1078b92fad9b00297496dd3d92366a9c0bb56cfa138f28cc15db1389"; + name = "cervisia-20.08.2.tar.xz"; }; }; dolphin = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/dolphin-20.08.1.tar.xz"; - sha256 = "7d6ef04b866366a0ff3b199aac082ade41b3748b225ef7675ea42ccf48cbdc24"; - name = "dolphin-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/dolphin-20.08.2.tar.xz"; + sha256 = "bd13574610fc2108b9b04249cff70ca99958fe57a42fbf260ed16e5e377071bc"; + name = "dolphin-20.08.2.tar.xz"; }; }; dolphin-plugins = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/dolphin-plugins-20.08.1.tar.xz"; - sha256 = "a00cab6b30c9b5a4c0164704c9eab2cbb661928e775f83acb3691af77bf17427"; - name = "dolphin-plugins-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/dolphin-plugins-20.08.2.tar.xz"; + sha256 = "7eabeb295ae2932958992bf7273afcb8164fbe90a2574064983fb2ecbc57eeaf"; + name = "dolphin-plugins-20.08.2.tar.xz"; }; }; dragon = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/dragon-20.08.1.tar.xz"; - sha256 = "691bc338ca25e70e9a43cbcdf50f2e0aa92643bdad0329bdc3e09373ac287040"; - name = "dragon-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/dragon-20.08.2.tar.xz"; + sha256 = "cf7cce288fdeb12a0c86739741c6b901859e9b36d8fc9e7478c46f53cc74dd6c"; + name = "dragon-20.08.2.tar.xz"; }; }; elisa = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/elisa-20.08.1.tar.xz"; - sha256 = "1a0234a074a70bfcd4b2ccc14664b2cc7f88d2ccfd33c1716d35c27a31e258c0"; - name = "elisa-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/elisa-20.08.2.tar.xz"; + sha256 = "6c04377dfd5e82b2b67b3a43cc3ffd3b206f24ab75c3fe18298ec80876dcc268"; + name = "elisa-20.08.2.tar.xz"; }; }; eventviews = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/eventviews-20.08.1.tar.xz"; - sha256 = "b46e6ad32a503ce1dc1e5ade71e79f44011362fe569836ca1f2cd11c560a5a73"; - name = "eventviews-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/eventviews-20.08.2.tar.xz"; + sha256 = "ecac9ac6e6a6ed835b28048d8bfc09bac9a1e7a57c5dd0eba6f4360301b32af9"; + name = "eventviews-20.08.2.tar.xz"; }; }; ffmpegthumbs = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ffmpegthumbs-20.08.1.tar.xz"; - sha256 = "8b7cd6bd27b29977d0406b08c2cf33988c651a2f59392be47f076e49eea5673b"; - name = "ffmpegthumbs-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ffmpegthumbs-20.08.2.tar.xz"; + sha256 = "af5b3de86487d3ddccda34c5165a34427ef97fe1090108781eb38babc101740f"; + name = "ffmpegthumbs-20.08.2.tar.xz"; }; }; filelight = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/filelight-20.08.1.tar.xz"; - sha256 = "9677038781a1d66238da0e54f967c9c97cb44d593dbe164b8e26f38d0ac75330"; - name = "filelight-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/filelight-20.08.2.tar.xz"; + sha256 = "65f5f90d56d3449722647286324f8aae54754ec2a46c9aaa2e3bad92bae3433e"; + name = "filelight-20.08.2.tar.xz"; }; }; granatier = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/granatier-20.08.1.tar.xz"; - sha256 = "7b0d53fd50fdb56270f8fd53d45478c0f1be10bb67b901db08b0f413c4baeb3e"; - name = "granatier-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/granatier-20.08.2.tar.xz"; + sha256 = "bb79b84b485bb194bf4edaa833e7705ec9fc0275301c70df78498b872de9ee57"; + name = "granatier-20.08.2.tar.xz"; }; }; grantlee-editor = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/grantlee-editor-20.08.1.tar.xz"; - sha256 = "edeb994eab7001bcf8462834a61ae1a045e9122ae104d31bdeed2ac7497b6306"; - name = "grantlee-editor-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/grantlee-editor-20.08.2.tar.xz"; + sha256 = "353b2c58d169e8b3c91367a7ce8939ede39c289036e3617da019ae1045a81c7b"; + name = "grantlee-editor-20.08.2.tar.xz"; }; }; grantleetheme = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/grantleetheme-20.08.1.tar.xz"; - sha256 = "9a8f91ce63a3b143d47d8e3fbd1378732639cd3daf5b5789989164d8225fe54f"; - name = "grantleetheme-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/grantleetheme-20.08.2.tar.xz"; + sha256 = "8cb4d2f698cf7f44bf70322669809f07900021f215175c8db120abc0f2debf62"; + name = "grantleetheme-20.08.2.tar.xz"; }; }; gwenview = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/gwenview-20.08.1.tar.xz"; - sha256 = "df1c45317aff9aece8b023cd87aab62c9cd222520795922564e89fdc9df48995"; - name = "gwenview-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/gwenview-20.08.2.tar.xz"; + sha256 = "580df49eb6852db4b1229f0326372dc7da7a08140d552da59a62ece08b03cc9d"; + name = "gwenview-20.08.2.tar.xz"; }; }; incidenceeditor = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/incidenceeditor-20.08.1.tar.xz"; - sha256 = "eecc51eb405c473eb20449842dcdb3dac96712bbcf7aeedaa06614e1da3e0bbe"; - name = "incidenceeditor-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/incidenceeditor-20.08.2.tar.xz"; + sha256 = "e9c24390b5951ef9f504a4dc432fea52ed7487288c424f073446e6c07e70c69a"; + name = "incidenceeditor-20.08.2.tar.xz"; }; }; juk = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/juk-20.08.1.tar.xz"; - sha256 = "aa9a93a0befacf401cf41d8358b4987d8b370b4c153f3b66e05e922472e004a8"; - name = "juk-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/juk-20.08.2.tar.xz"; + sha256 = "b19f59ad8c80c4c335469fbddde6db92112e286b1699964eab39a3d826c7ec60"; + name = "juk-20.08.2.tar.xz"; }; }; k3b = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/k3b-20.08.1.tar.xz"; - sha256 = "66fad59f4e35c24dc8868c46ff45ffa66048501e0a6ac0c23a8b9e957033e50f"; - name = "k3b-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/k3b-20.08.2.tar.xz"; + sha256 = "6370be558e93fed4605b7870b1d7ea324713c5a52370eab9c05d85fc3b76acd5"; + name = "k3b-20.08.2.tar.xz"; }; }; kaccounts-integration = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kaccounts-integration-20.08.1.tar.xz"; - sha256 = "b65ec11be0c2b612222de382d24345f19be0cd264243f0d954da8a81b80034bc"; - name = "kaccounts-integration-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kaccounts-integration-20.08.2.tar.xz"; + sha256 = "6678ee7d394b69a37e6a220a6cba3804f999997da5803da4bab1d8f329ff30fe"; + name = "kaccounts-integration-20.08.2.tar.xz"; }; }; kaccounts-providers = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kaccounts-providers-20.08.1.tar.xz"; - sha256 = "481a2e2708773197b63937233ade6380c0b64e13a1610f27aa2751b6ee3624a4"; - name = "kaccounts-providers-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kaccounts-providers-20.08.2.tar.xz"; + sha256 = "c719d7840ab118ff591e75e12869afc3118e5cdeb5c0415eba5b1f6993664c90"; + name = "kaccounts-providers-20.08.2.tar.xz"; }; }; kaddressbook = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kaddressbook-20.08.1.tar.xz"; - sha256 = "f7fb72cbff43ae6dfb222e5b1c49947602086412b97634484eb3cc86ab773aa2"; - name = "kaddressbook-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kaddressbook-20.08.2.tar.xz"; + sha256 = "8d2e5849dd8878806e8566ce43c139633c37f027f677603600c8acc0d0d41198"; + name = "kaddressbook-20.08.2.tar.xz"; }; }; kajongg = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kajongg-20.08.1.tar.xz"; - sha256 = "801c0cc63767809ea4909ceb66dbbbb3e8ad400db7a24c80dc6ae8f3f5c9a6b9"; - name = "kajongg-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kajongg-20.08.2.tar.xz"; + sha256 = "1eb534ac6d1d3ca14b73bd6e5b626b988acafc30b168f54d48a493adc715ecde"; + name = "kajongg-20.08.2.tar.xz"; }; }; kalarm = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kalarm-20.08.1.tar.xz"; - sha256 = "22fea5be32c8db6b0903f216307f20dafc2ac69c620d9b4512e1034c0294c207"; - name = "kalarm-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kalarm-20.08.2.tar.xz"; + sha256 = "e783c041ac4b162cf5254e37e53854835eda6c61ef3ae2358466000a8650a4da"; + name = "kalarm-20.08.2.tar.xz"; }; }; kalarmcal = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kalarmcal-20.08.1.tar.xz"; - sha256 = "745515662c23154480e73f4a8d6e9ec760d01770383c1dd7f31d3f1463be7602"; - name = "kalarmcal-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kalarmcal-20.08.2.tar.xz"; + sha256 = "0398a37f412eb03b5cbf2488ce7e0c38a069f1806bda4ea9bfce4fc67311a9a6"; + name = "kalarmcal-20.08.2.tar.xz"; }; }; kalgebra = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kalgebra-20.08.1.tar.xz"; - sha256 = "a5ab916eba3bfd7535408768e6530e993bc1097ef1a2a0af5aa804aa1f713caf"; - name = "kalgebra-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kalgebra-20.08.2.tar.xz"; + sha256 = "c934dc8d92917e31c17efa5b64dbec4795439a5f26762e2f214b49028bfe264d"; + name = "kalgebra-20.08.2.tar.xz"; }; }; kalzium = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kalzium-20.08.1.tar.xz"; - sha256 = "c2c4a823525ab5927c39f29e2150f34fc03947fb852aea1bdb73390c5a709188"; - name = "kalzium-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kalzium-20.08.2.tar.xz"; + sha256 = "474f74cbb478d3f5f69b5785711ed969ac15d5e92aee5308c6118a9d12611016"; + name = "kalzium-20.08.2.tar.xz"; }; }; kamera = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kamera-20.08.1.tar.xz"; - sha256 = "f5b04ca46313de1bb0a57253650d1d1578f45796035888b759ad224b5866ee96"; - name = "kamera-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kamera-20.08.2.tar.xz"; + sha256 = "ba28cab34267ce203b4b70f4a2c2b6a75849aec83dd2d73f6903894c5c125fdf"; + name = "kamera-20.08.2.tar.xz"; }; }; kamoso = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kamoso-20.08.1.tar.xz"; - sha256 = "ed8fa6a6127a8bea5294534aa2552526af101f981de58512fbb9f7dfd78e8984"; - name = "kamoso-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kamoso-20.08.2.tar.xz"; + sha256 = "e7d0af2781ff077261886a1683aff1d518a17f9b6d83f84fa95a7633a00f1516"; + name = "kamoso-20.08.2.tar.xz"; }; }; kanagram = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kanagram-20.08.1.tar.xz"; - sha256 = "c810db58884e80d95baef149b8ced8fff7c5e48d6057478e81a5c8895ae67b42"; - name = "kanagram-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kanagram-20.08.2.tar.xz"; + sha256 = "3f3f961aa847f26ac875104e82b8e7e73bbc049f20460117f849df91ba9b42e2"; + name = "kanagram-20.08.2.tar.xz"; }; }; kapman = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kapman-20.08.1.tar.xz"; - sha256 = "934da85c5d9c99a0ed658fe4d99df258246716e04e13ceb3e18b11cc035c4f4c"; - name = "kapman-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kapman-20.08.2.tar.xz"; + sha256 = "932bd697f2ca0e44af6be983dae3e13df9435642b91f0e1ebba7fd50291c2cbd"; + name = "kapman-20.08.2.tar.xz"; }; }; kapptemplate = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kapptemplate-20.08.1.tar.xz"; - sha256 = "7b350467e14bc310a695ffa3481afa7857de2f6ec714915ee2d8a25a6511909b"; - name = "kapptemplate-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kapptemplate-20.08.2.tar.xz"; + sha256 = "3bda6d9f6127e19357f071ca6f9f05890c35a6aaf86e54bce39381f0045b6b0c"; + name = "kapptemplate-20.08.2.tar.xz"; }; }; kate = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kate-20.08.1.tar.xz"; - sha256 = "44607f6a1d5ca8bb7173bedbeabef65bb98dde0fd009987bd8139fbb53959146"; - name = "kate-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kate-20.08.2.tar.xz"; + sha256 = "718e8230edfa16f93f54380c4e214a0f25f8a398fe74ad23f12b7dcffae419d0"; + name = "kate-20.08.2.tar.xz"; }; }; katomic = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/katomic-20.08.1.tar.xz"; - sha256 = "1aa655857bb1708880b6fbf4e54acdfe1cb7f47a9494249978251d870b86f13a"; - name = "katomic-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/katomic-20.08.2.tar.xz"; + sha256 = "bb94e81cb1122b57d2601f701bc51ff8fa27ac07a5de34e5c49928d50d46ed85"; + name = "katomic-20.08.2.tar.xz"; }; }; kbackup = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kbackup-20.08.1.tar.xz"; - sha256 = "08b0c43fca2dba65e1173841343daf8e6e37e11101be7315011e8345ba9b1e72"; - name = "kbackup-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kbackup-20.08.2.tar.xz"; + sha256 = "bb97dd10a64c42ae80c9c87442d3a06d3c18f4f5997bd3b6d1460dec655b3e0a"; + name = "kbackup-20.08.2.tar.xz"; }; }; kblackbox = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kblackbox-20.08.1.tar.xz"; - sha256 = "3f09d483fa3a3013e685df9efd9cee8d9d1b9f0e017cc97d92636bae89fc469c"; - name = "kblackbox-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kblackbox-20.08.2.tar.xz"; + sha256 = "714a8749a49d1a7938b74372138ae3e5bafef50de61207e63a6d2c60b6bfded2"; + name = "kblackbox-20.08.2.tar.xz"; }; }; kblocks = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kblocks-20.08.1.tar.xz"; - sha256 = "e2b6e5b0727ca45d6b0f0e8b9f0aa029a0acb9bdebeac5bfd849455e560977ed"; - name = "kblocks-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kblocks-20.08.2.tar.xz"; + sha256 = "c82f8b6e722308a236d0057028d644ebf8105c9c902d799bc2fb3e1c1ff7c188"; + name = "kblocks-20.08.2.tar.xz"; }; }; kbounce = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kbounce-20.08.1.tar.xz"; - sha256 = "99af3bd297fcbecb9eaa4222bbb5122144beff9cb999420bf45339d61375f2a4"; - name = "kbounce-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kbounce-20.08.2.tar.xz"; + sha256 = "371fbaf7c1faeacf1c74441ec1a58f1ced862f741e67123d2eb105f1d4f9b8e2"; + name = "kbounce-20.08.2.tar.xz"; }; }; kbreakout = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kbreakout-20.08.1.tar.xz"; - sha256 = "0d57c105f2778b68c0b5ff8cb3e02d5c7ea2956b90d48d126ff1118b94d5f2fa"; - name = "kbreakout-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kbreakout-20.08.2.tar.xz"; + sha256 = "b58b9dd26eff3960bc664076ddf4d0c81c7dfd5380be1d058b86de2d3f55d2ef"; + name = "kbreakout-20.08.2.tar.xz"; }; }; kbruch = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kbruch-20.08.1.tar.xz"; - sha256 = "f04bf902a31b68d18c69afff511a591817a35f5ad866de4f84aa1b664b35a41e"; - name = "kbruch-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kbruch-20.08.2.tar.xz"; + sha256 = "54c5997a8d6405439448dd929bf16017c9e5db052b30c9bf144c656c6d8b9e0b"; + name = "kbruch-20.08.2.tar.xz"; }; }; kcachegrind = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kcachegrind-20.08.1.tar.xz"; - sha256 = "59c43296aaa7d8a5dbf782ba9248ee8bb6308e7bd7bdfc0b99e1c912529337f2"; - name = "kcachegrind-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kcachegrind-20.08.2.tar.xz"; + sha256 = "e6b84a323a21ae7975ccc07154bcdc6eef1bc92818b800cfc5d546ada7f0387c"; + name = "kcachegrind-20.08.2.tar.xz"; }; }; kcalc = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kcalc-20.08.1.tar.xz"; - sha256 = "46702fe8eca8b604e15f3f2eb4d1f17b8601b6ad0b03bb9cd0a0dd7ed7a13c49"; - name = "kcalc-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kcalc-20.08.2.tar.xz"; + sha256 = "76b6c8e44c789090c0155f79878df8f27c96d2df4273443b0f05a42ec81902cf"; + name = "kcalc-20.08.2.tar.xz"; }; }; kcalutils = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kcalutils-20.08.1.tar.xz"; - sha256 = "ae6a8ca02722f8f593a8d248ab3d043cc68be23d18f820e150af000a902601c2"; - name = "kcalutils-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kcalutils-20.08.2.tar.xz"; + sha256 = "fccae5166b627f654412344d0090000ecd270af54b0cedb8648e35af26369cae"; + name = "kcalutils-20.08.2.tar.xz"; }; }; kcharselect = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kcharselect-20.08.1.tar.xz"; - sha256 = "36575e9fd0a93fb3ddaf6a75a213786351bdd3ab8c167dc1a3e2824a23a6655b"; - name = "kcharselect-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kcharselect-20.08.2.tar.xz"; + sha256 = "9438e723469b6bf0d87b23965c6d925800ff35b2cc2214a7eeb5fb41009489e0"; + name = "kcharselect-20.08.2.tar.xz"; }; }; kcolorchooser = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kcolorchooser-20.08.1.tar.xz"; - sha256 = "20cae01bd5e8c824f8e7900badd0d66464c363a749a1ce9fe6fe3a1e31c99ade"; - name = "kcolorchooser-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kcolorchooser-20.08.2.tar.xz"; + sha256 = "f314c31932704e7136b5fff89efe95e84e4215f3902089f9d838411f0fbc0c72"; + name = "kcolorchooser-20.08.2.tar.xz"; }; }; kcron = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kcron-20.08.1.tar.xz"; - sha256 = "24ee9aee48bef951d6ac1fff32271417c4eb2239f0ec1de8388f2bae55ce83f5"; - name = "kcron-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kcron-20.08.2.tar.xz"; + sha256 = "ce72bb7c48606b0611cfe46a545224cca131d34a4b678c86d9ac473071833f83"; + name = "kcron-20.08.2.tar.xz"; }; }; kdebugsettings = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdebugsettings-20.08.1.tar.xz"; - sha256 = "cac50d34c8a31805924aa75755475a754109fc643e95fe50188477522d113a55"; - name = "kdebugsettings-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdebugsettings-20.08.2.tar.xz"; + sha256 = "78502b1a52f9f81ff848e5b210b37a3a74da7c0032de2513f23c1d25cf801283"; + name = "kdebugsettings-20.08.2.tar.xz"; }; }; kdeconnect-kde = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdeconnect-kde-20.08.1.tar.xz"; - sha256 = "8ebfe36b4d08b36881082a3748f63a7c645b51e8f3b094607512817e9f6ce668"; - name = "kdeconnect-kde-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdeconnect-kde-20.08.2.tar.xz"; + sha256 = "6d43e38620987de1ddcfdfa7d4e6e31ff383b806139ba02e69a99c3ddfb4ee67"; + name = "kdeconnect-kde-20.08.2.tar.xz"; }; }; kde-dev-scripts = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kde-dev-scripts-20.08.1.tar.xz"; - sha256 = "f7f99a199fea69019738e6d2147e5f6e4419835aa2c39e6d60f4d2e5d629ba96"; - name = "kde-dev-scripts-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kde-dev-scripts-20.08.2.tar.xz"; + sha256 = "ff1a819991903b09bef3637b579d215e087310e39b98a1a6928e15f193aec056"; + name = "kde-dev-scripts-20.08.2.tar.xz"; }; }; kde-dev-utils = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kde-dev-utils-20.08.1.tar.xz"; - sha256 = "8105a5b911643dca1f0c476c9247282f80e4ea17bae06dcca63ba9638bf5d21d"; - name = "kde-dev-utils-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kde-dev-utils-20.08.2.tar.xz"; + sha256 = "21a4a11e102cbbd9fed955720966d7be2f7a615f57c9bf1dfc94ce973d25ffc3"; + name = "kde-dev-utils-20.08.2.tar.xz"; }; }; kdeedu-data = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdeedu-data-20.08.1.tar.xz"; - sha256 = "d9c10c849f94b8cff7f79747a0594b8050f19d5477799b03f803c4241a9d12b6"; - name = "kdeedu-data-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdeedu-data-20.08.2.tar.xz"; + sha256 = "9030c39b92a7500254e8303ce246d2535cd66a203bb96b2670defd5288294ad1"; + name = "kdeedu-data-20.08.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdegraphics-mobipocket-20.08.1.tar.xz"; - sha256 = "9974c36d90fc23d9a3a7172cf1526dc3671bf90f01f608effe92f64fce53c372"; - name = "kdegraphics-mobipocket-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdegraphics-mobipocket-20.08.2.tar.xz"; + sha256 = "8972079756633abe8cbfaa39cdff9d56f89958861e6e418738311bcdc52771a5"; + name = "kdegraphics-mobipocket-20.08.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdegraphics-thumbnailers-20.08.1.tar.xz"; - sha256 = "8303231f2fc44c071b3f6a477ae5335f2657dbfaba52362529aaba20973a5995"; - name = "kdegraphics-thumbnailers-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdegraphics-thumbnailers-20.08.2.tar.xz"; + sha256 = "977cf6c40ba00a8a391a951aab80c55d9615927a1ef4a7bb5eea2f6a83373532"; + name = "kdegraphics-thumbnailers-20.08.2.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdenetwork-filesharing-20.08.1.tar.xz"; - sha256 = "e88f4a2f6d7b8a61ebd491eb112f51d50f9949d729022fab01223d6ea36b8a01"; - name = "kdenetwork-filesharing-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdenetwork-filesharing-20.08.2.tar.xz"; + sha256 = "f909ee8433baf906b6c23af4747d83ae3e151e213585abe01282213012228b3a"; + name = "kdenetwork-filesharing-20.08.2.tar.xz"; }; }; kdenlive = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdenlive-20.08.1.tar.xz"; - sha256 = "f99e3f22c3d5e41a3ca251299d010ac2bc44933091c25d360104d562a1090873"; - name = "kdenlive-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdenlive-20.08.2.tar.xz"; + sha256 = "535df45a148f0f94271e045ef0c93575fded83da7a2b727aeaf90e61e1d7c418"; + name = "kdenlive-20.08.2.tar.xz"; }; }; kdepim-addons = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdepim-addons-20.08.1.tar.xz"; - sha256 = "a0bddcbe8f8f6d8c878a6b5634578522a8d485e424cf37d35bc17df9a1ffc7c2"; - name = "kdepim-addons-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdepim-addons-20.08.2.tar.xz"; + sha256 = "f7ab0d9ee2b9351959199f8903c447c6cb82fd58d642b7039cd2b8e324038b01"; + name = "kdepim-addons-20.08.2.tar.xz"; }; }; kdepim-apps-libs = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdepim-apps-libs-20.08.1.tar.xz"; - sha256 = "a0664933b3b5ff20747bf2adec9fbbecf22935129349208430d53e8c9bf5b5bb"; - name = "kdepim-apps-libs-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdepim-apps-libs-20.08.2.tar.xz"; + sha256 = "8c3ebdf7072d3a5a6ea2921697b28aa27e51ba43db152ea83a07b4b13c282434"; + name = "kdepim-apps-libs-20.08.2.tar.xz"; }; }; kdepim-runtime = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdepim-runtime-20.08.1.tar.xz"; - sha256 = "27a4c04dcf2eac4108a43acbdd57e3a8aa1da92443a3e7977329d0218da05c24"; - name = "kdepim-runtime-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdepim-runtime-20.08.2.tar.xz"; + sha256 = "3b475dfd394d5c09991eb4e1f0ddb3e2aa1f586ed75aa7961b159ef712d80132"; + name = "kdepim-runtime-20.08.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdesdk-kioslaves-20.08.1.tar.xz"; - sha256 = "528cce0ea4c7c9fd53a604591eae4a70d39421ebbe62ed59bcbc80072f95c19f"; - name = "kdesdk-kioslaves-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdesdk-kioslaves-20.08.2.tar.xz"; + sha256 = "5e79532675d717d906f6b43eea1cac20fe1513bcf497696251c00fe74e2f0f58"; + name = "kdesdk-kioslaves-20.08.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdesdk-thumbnailers-20.08.1.tar.xz"; - sha256 = "5b189182f2a734f82e67e23d3293e694c51f97c0a9acd1ec5498442a3d2a3804"; - name = "kdesdk-thumbnailers-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdesdk-thumbnailers-20.08.2.tar.xz"; + sha256 = "0b6809e2469d7057b6d674d5950fd4f6243a1d3d185452212522880c714c1c63"; + name = "kdesdk-thumbnailers-20.08.2.tar.xz"; }; }; kdf = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdf-20.08.1.tar.xz"; - sha256 = "c100c87e9dbfcf7c12ce78d743f4ce3a2ec2bf3c1b0d969af1285255071195a5"; - name = "kdf-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdf-20.08.2.tar.xz"; + sha256 = "b33c043c18ae7b80b40e73c0a34759540724fa81815a6afa1e91e3ad44aec27e"; + name = "kdf-20.08.2.tar.xz"; }; }; kdialog = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdialog-20.08.1.tar.xz"; - sha256 = "089e8a8e85a9021b830e9b8a19ecb1999781915a716c9c2b3c99894a5d1c8dcf"; - name = "kdialog-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdialog-20.08.2.tar.xz"; + sha256 = "1bb808c2d01680e2396f282b798d9e22d2c1722f992c672eaf7451bf83a5d459"; + name = "kdialog-20.08.2.tar.xz"; }; }; kdiamond = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kdiamond-20.08.1.tar.xz"; - sha256 = "1629dc6f70873b42081bd75dbf858da56d380c32925ddd49bd2110d458cb4b23"; - name = "kdiamond-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kdiamond-20.08.2.tar.xz"; + sha256 = "7bfc2b24d86c663bff719156ba20cd36017f1df647ee6769b5101aa6ab3e3e21"; + name = "kdiamond-20.08.2.tar.xz"; }; }; keditbookmarks = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/keditbookmarks-20.08.1.tar.xz"; - sha256 = "8bfedffae0332dbfb611d25f3178ab7babe374155cce7c44e1aaa841934c3123"; - name = "keditbookmarks-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/keditbookmarks-20.08.2.tar.xz"; + sha256 = "87d72e78c907e7829a642364f3a49dd0f0dea0c76e7a5c524a67f957dca94b9b"; + name = "keditbookmarks-20.08.2.tar.xz"; }; }; kfind = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kfind-20.08.1.tar.xz"; - sha256 = "e49412d0eae6f77369b96ee7fa5902252294d03da1e8782460d4bba5be6bb149"; - name = "kfind-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kfind-20.08.2.tar.xz"; + sha256 = "2381bbe7793a666fa9463aead1246dc4244409f68375f6d75e1423be15b42d74"; + name = "kfind-20.08.2.tar.xz"; }; }; kfloppy = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kfloppy-20.08.1.tar.xz"; - sha256 = "cfbe396c252acc23a929d05fe1a71099bc19ee3ab55f4f40e47780cf871852c5"; - name = "kfloppy-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kfloppy-20.08.2.tar.xz"; + sha256 = "7f624d03dc3dc5099ac1479148800043195fa6c0e3bb6d7efcb452a76e99e191"; + name = "kfloppy-20.08.2.tar.xz"; }; }; kfourinline = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kfourinline-20.08.1.tar.xz"; - sha256 = "2c65dcc685d7e46da73e53ac3ab250ef4d1738bb85aa6f1b09160ff2ece364a2"; - name = "kfourinline-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kfourinline-20.08.2.tar.xz"; + sha256 = "aed2ecdb40b2e3d5452b183a1817216373d32a0aab4eff02f6c823a6f8d801eb"; + name = "kfourinline-20.08.2.tar.xz"; }; }; kgeography = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kgeography-20.08.1.tar.xz"; - sha256 = "f7ce4c6a00f18558aa04f4af0b71e45efc10c67f0b3454c5f0b2527a43133d30"; - name = "kgeography-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kgeography-20.08.2.tar.xz"; + sha256 = "82c4798f3184c77d0be63aeb5e86c84240c9cb0aa0e66ff57f92c0b5c3748f19"; + name = "kgeography-20.08.2.tar.xz"; }; }; kget = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kget-20.08.1.tar.xz"; - sha256 = "efbfc08a5a4ed3974bbdab20c5eae07cdb70f7f42e9de1c75651a57511d7e576"; - name = "kget-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kget-20.08.2.tar.xz"; + sha256 = "42993095d6325e921b6ed36f4b0a2153ffd5d68cfa3e6d3ced2db09e2a6aabb8"; + name = "kget-20.08.2.tar.xz"; }; }; kgoldrunner = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kgoldrunner-20.08.1.tar.xz"; - sha256 = "40380c0d3b65e06cdb9d9ca3791c10e0d2d300856cc49a7b3da0145b7651274b"; - name = "kgoldrunner-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kgoldrunner-20.08.2.tar.xz"; + sha256 = "4bbcfcf5cf810e0b1f78e1a88d222631c07401187fb327deaa5ab6658483d351"; + name = "kgoldrunner-20.08.2.tar.xz"; }; }; kgpg = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kgpg-20.08.1.tar.xz"; - sha256 = "6b926c2adf896c3f68402ec10faf8db1e5f7c7b9fa8c1c26f9021d1fb0c975b0"; - name = "kgpg-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kgpg-20.08.2.tar.xz"; + sha256 = "fc4ec5c38c3bdb02a399f0eb1e75da356a523ada369d5410c2f4e7f5f14a508f"; + name = "kgpg-20.08.2.tar.xz"; }; }; khangman = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/khangman-20.08.1.tar.xz"; - sha256 = "fe94116ea833295a46c59a7420676925bb1038e7da86f6369d452087add40868"; - name = "khangman-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/khangman-20.08.2.tar.xz"; + sha256 = "7ff30ecbab7c9e8f44b7e8c3887ec78a918c919ce902005aeb7fb969ac995b28"; + name = "khangman-20.08.2.tar.xz"; }; }; khelpcenter = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/khelpcenter-20.08.1.tar.xz"; - sha256 = "217b433c1a5da966ad5dab1e89e2e719632f1e035ab92cce094c5f0848bb6e39"; - name = "khelpcenter-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/khelpcenter-20.08.2.tar.xz"; + sha256 = "36051a4352a05dd9b74b4e325c0e16e30d6bd8b48d6c3d13980b39a77aab4e2d"; + name = "khelpcenter-20.08.2.tar.xz"; }; }; kidentitymanagement = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kidentitymanagement-20.08.1.tar.xz"; - sha256 = "3b34e029e99647d6742825633682ab8a5eecbe102e34ea2472cb53afb853840d"; - name = "kidentitymanagement-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kidentitymanagement-20.08.2.tar.xz"; + sha256 = "17a1fd47d91289519cafb12c0d917b4775496ada447cb6f4ba56dc42446152ec"; + name = "kidentitymanagement-20.08.2.tar.xz"; }; }; kig = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kig-20.08.1.tar.xz"; - sha256 = "f318d346cd152e62ae892ade31a784f0b7b823c56fdfd64e05a330072ad95745"; - name = "kig-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kig-20.08.2.tar.xz"; + sha256 = "401832d384e47ea6daf310f7e823ae6b8a55bc117b7570bd4bf36261d01587f5"; + name = "kig-20.08.2.tar.xz"; }; }; kigo = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kigo-20.08.1.tar.xz"; - sha256 = "58fa166a487c855d300c8a33758928131fc4db80cbda19a08e3de918335d2bdb"; - name = "kigo-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kigo-20.08.2.tar.xz"; + sha256 = "b9e6edd2e35e57edb3d89bb76f1d7e4a9e7f8fb64644b58012543a367834aa60"; + name = "kigo-20.08.2.tar.xz"; }; }; killbots = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/killbots-20.08.1.tar.xz"; - sha256 = "252636f4df2af0e087f4d604f76c5d8702c38392d821281a0f6283be4e429af9"; - name = "killbots-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/killbots-20.08.2.tar.xz"; + sha256 = "332ebd24be6ea62c8621aeaa5b200d6ebf03ae0198a06693b36b2c80cac89d95"; + name = "killbots-20.08.2.tar.xz"; }; }; kimagemapeditor = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kimagemapeditor-20.08.1.tar.xz"; - sha256 = "bf391d0812e0f2dce6a11481972cf9d04f14d0bf92cad7210fa35a1fa0edf230"; - name = "kimagemapeditor-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kimagemapeditor-20.08.2.tar.xz"; + sha256 = "fd8272978a7c3a1d95b20a5ec57ccf00d740a8d6eb483f0a204d03669215309c"; + name = "kimagemapeditor-20.08.2.tar.xz"; }; }; kimap = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kimap-20.08.1.tar.xz"; - sha256 = "eae645ae2535c2612556e8938011cc478054c032126bb55683b95127d1b94741"; - name = "kimap-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kimap-20.08.2.tar.xz"; + sha256 = "bda4f4b4e94481b70cec270655c0fd2888da51106d80c0388ae5c0dc5d36e092"; + name = "kimap-20.08.2.tar.xz"; }; }; kio-extras = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kio-extras-20.08.1.tar.xz"; - sha256 = "1122635926052f34fd35d8aeef9c3c1d892690d8372f2b7d902e6449cdab988a"; - name = "kio-extras-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kio-extras-20.08.2.tar.xz"; + sha256 = "9d4b9cb5a4002ad2127c5c5c4d25ff95d53de32ea08348e8dc40fe83d950076e"; + name = "kio-extras-20.08.2.tar.xz"; }; }; kio-gdrive = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kio-gdrive-20.08.1.tar.xz"; - sha256 = "5104136948ee60cd527109bb9e8830e6a12f6062a29f34bc995b2625b0280825"; - name = "kio-gdrive-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kio-gdrive-20.08.2.tar.xz"; + sha256 = "71047e9f8e5ad9317cc3dbf1de2d121f322b5d968d3685351ef0d2aabe2f46ca"; + name = "kio-gdrive-20.08.2.tar.xz"; }; }; kipi-plugins = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kipi-plugins-20.08.1.tar.xz"; - sha256 = "b7d8f1aa087006a48d9bd7ec036ab4779e898e3b02692c91342439747cad6c5c"; - name = "kipi-plugins-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kipi-plugins-20.08.2.tar.xz"; + sha256 = "89de8f75dd01e2130c1e651bd04717ce4d35768202ae3e825c93c75c8312e583"; + name = "kipi-plugins-20.08.2.tar.xz"; }; }; kirigami-gallery = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kirigami-gallery-20.08.1.tar.xz"; - sha256 = "497886cc5a8483f068a642ce19df19f69fd105a4fb583f1a9898c885659c9df5"; - name = "kirigami-gallery-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kirigami-gallery-20.08.2.tar.xz"; + sha256 = "0b4a5cec32bdfaef42b790f1d249d227c9daf56e0f3c1e302d33ccaa485c28e5"; + name = "kirigami-gallery-20.08.2.tar.xz"; }; }; kiriki = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kiriki-20.08.1.tar.xz"; - sha256 = "51e77cbbf6a0c60487d72b03b28c08409d0b6134c983d9e420fbc4d7f73223e8"; - name = "kiriki-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kiriki-20.08.2.tar.xz"; + sha256 = "42081e39c045bd830c6a79938a83690ea5641aa9e5437645234441da2d29b053"; + name = "kiriki-20.08.2.tar.xz"; }; }; kiten = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kiten-20.08.1.tar.xz"; - sha256 = "f3764d090db8027746e83c326e833680fd669dca66dd6af095ba120e66de2901"; - name = "kiten-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kiten-20.08.2.tar.xz"; + sha256 = "a7285d5880611da2202d0e3f8f2bf860f275932d3da54ff7aecc793225f7ad7d"; + name = "kiten-20.08.2.tar.xz"; }; }; kitinerary = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kitinerary-20.08.1.tar.xz"; - sha256 = "d3e0b6130b5c603bc1494404fa91ed1995e9142d66e4c3ddd5d2c79fdea856e4"; - name = "kitinerary-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kitinerary-20.08.2.tar.xz"; + sha256 = "69d8b5f64774860e5098c1dbfb06d274da4379c04383c4f0f0e412481c48fa27"; + name = "kitinerary-20.08.2.tar.xz"; }; }; kjumpingcube = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kjumpingcube-20.08.1.tar.xz"; - sha256 = "226424cd21f75c499eedd15460a466988b179312467ed16437df87be494d9fbc"; - name = "kjumpingcube-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kjumpingcube-20.08.2.tar.xz"; + sha256 = "0edba227e24b8aeda4e75bc6c25ad25b50ac624b5319a64ce20d6c3f7691a48a"; + name = "kjumpingcube-20.08.2.tar.xz"; }; }; kldap = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kldap-20.08.1.tar.xz"; - sha256 = "098fb07b280ef25dcf04b18f627223014257f6c0874b2959f2a8e68cacdb74a7"; - name = "kldap-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kldap-20.08.2.tar.xz"; + sha256 = "dfc8bd59d837766e741b33cf8486256b7bd5ffc33ff2aab240d47b4766ec8489"; + name = "kldap-20.08.2.tar.xz"; }; }; kleopatra = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kleopatra-20.08.1.tar.xz"; - sha256 = "e7bc3ce03ad5431e4289360ba6b701e38d53b60de58fd1ed358480cec48657a6"; - name = "kleopatra-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kleopatra-20.08.2.tar.xz"; + sha256 = "70ffa2d1549b6b4674a9cd92052174002d81fb236cfbf872187c6e3616191ba2"; + name = "kleopatra-20.08.2.tar.xz"; }; }; klettres = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/klettres-20.08.1.tar.xz"; - sha256 = "f29d6df1de3562731f246a892caaa493b9bccc9d1317a948e03ad12cb8c80c06"; - name = "klettres-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/klettres-20.08.2.tar.xz"; + sha256 = "9cef7dea479d27644e4812157d4cf3993dc3ee84b847377a17cec305a03a3156"; + name = "klettres-20.08.2.tar.xz"; }; }; klickety = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/klickety-20.08.1.tar.xz"; - sha256 = "a9b63b3e944faba25498e981c06981dc354f9acd34b77f46fe2bebef388bf2cb"; - name = "klickety-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/klickety-20.08.2.tar.xz"; + sha256 = "90665c5aeda52f55af8dcf3936e557ba431d9e48c6be361eaeb82117b6213a33"; + name = "klickety-20.08.2.tar.xz"; }; }; klines = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/klines-20.08.1.tar.xz"; - sha256 = "d16650d7d44f48f47700dcb8fe97519dd28fe7213052636363d281c24f46a2b9"; - name = "klines-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/klines-20.08.2.tar.xz"; + sha256 = "8e8b897cdc3c31fada1dd2635da211def507f47c8062c6458f559283ae470edb"; + name = "klines-20.08.2.tar.xz"; }; }; kmag = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmag-20.08.1.tar.xz"; - sha256 = "0aaaf19af2c943ae460dbcc1984bae167b79be287802e8a6faa6aaaed11718f3"; - name = "kmag-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmag-20.08.2.tar.xz"; + sha256 = "8e933e8ebbf0ab956e2a251312e3d4e027848dc2f2b4e8a7c7250b8fdf10ca05"; + name = "kmag-20.08.2.tar.xz"; }; }; kmahjongg = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmahjongg-20.08.1.tar.xz"; - sha256 = "842b3d2e9c60b6a8e6bb6d09f26db49d988889ec3962ac40aea0e79434c2eb43"; - name = "kmahjongg-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmahjongg-20.08.2.tar.xz"; + sha256 = "98e34794560a062bd22950acc583b77a6f8d1d28aceb863604f5a6c98c6cc80d"; + name = "kmahjongg-20.08.2.tar.xz"; }; }; kmail = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmail-20.08.1.tar.xz"; - sha256 = "7ba5854e36e2ed752baa3a1ac15d1a6227699da6f5bdca3c250f22226b4d902b"; - name = "kmail-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmail-20.08.2.tar.xz"; + sha256 = "ff179b89836236174cd587ce4ea2a4320e58345d45582cb157186cfbb01e58f2"; + name = "kmail-20.08.2.tar.xz"; }; }; kmail-account-wizard = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmail-account-wizard-20.08.1.tar.xz"; - sha256 = "7a1dc9ad542c0e54b80e955a162888c7d4b6bababcf02681d54af4480c03bd8d"; - name = "kmail-account-wizard-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmail-account-wizard-20.08.2.tar.xz"; + sha256 = "7cdb9b60b1a646f0c5c0d0e7dfbe357a9f66bb305afbccbb4b421ee6f6941df8"; + name = "kmail-account-wizard-20.08.2.tar.xz"; }; }; kmailtransport = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmailtransport-20.08.1.tar.xz"; - sha256 = "4cabad74e141891546b0f47f44030eeb59fb63257a5c0d1c12124815ebf710c1"; - name = "kmailtransport-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmailtransport-20.08.2.tar.xz"; + sha256 = "8b12836b1ca0243819680cba73c809c491c5e7a8d1ea9d9dc23e7338aed69a0c"; + name = "kmailtransport-20.08.2.tar.xz"; }; }; kmbox = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmbox-20.08.1.tar.xz"; - sha256 = "df77b2bf448d1ce21ff4a816f1164297519b48cd60200cea0edae6e72a81a19b"; - name = "kmbox-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmbox-20.08.2.tar.xz"; + sha256 = "4fa1ad98368130dcdc8ad71dba3084c489130b1e8fc4a2b119ffc6f56595ba73"; + name = "kmbox-20.08.2.tar.xz"; }; }; kmime = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmime-20.08.1.tar.xz"; - sha256 = "cd0beaa46040d571b505d07853be76f099289e22d99ce4884695d4d645dfbe8c"; - name = "kmime-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmime-20.08.2.tar.xz"; + sha256 = "9f23e2814e62ae6c4a67fd3223315ef875776f9d098b4d11c7d06a726a725435"; + name = "kmime-20.08.2.tar.xz"; }; }; kmines = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmines-20.08.1.tar.xz"; - sha256 = "eeb58941c94330f3ffdca60c0ca84d8ebcc9c6c355737217b521c54e50c650cd"; - name = "kmines-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmines-20.08.2.tar.xz"; + sha256 = "6b07a812497a665505b6b1e3a84ac0818f1a5e5757146cdbceec55e94bb41753"; + name = "kmines-20.08.2.tar.xz"; }; }; kmix = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmix-20.08.1.tar.xz"; - sha256 = "012d14adbb200a7e66ddbc9ebc8e18c4e5082ae24dea6ab22284b6c730a1b472"; - name = "kmix-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmix-20.08.2.tar.xz"; + sha256 = "73453f02a72384382fd7449215189e22b5e1600e9ef0c9cc910f3fddd09beb85"; + name = "kmix-20.08.2.tar.xz"; }; }; kmousetool = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmousetool-20.08.1.tar.xz"; - sha256 = "c1d769efdd318eb1e29905122c579c72a41da74b45a076b79cf177b1800e1464"; - name = "kmousetool-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmousetool-20.08.2.tar.xz"; + sha256 = "c1f70c172dc2ad7d937db5e6355522082f924ba45e7aac1bbb1c04e230f1d406"; + name = "kmousetool-20.08.2.tar.xz"; }; }; kmouth = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmouth-20.08.1.tar.xz"; - sha256 = "d87fb47fa00c54f13cdaef33d15cc74f31d7009d4a8d988902b62c698d1e2c2c"; - name = "kmouth-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmouth-20.08.2.tar.xz"; + sha256 = "d206afecdbe5f063dfbf805956f475e95c7b0fd548fd5f1b4fd7376ea6747e96"; + name = "kmouth-20.08.2.tar.xz"; }; }; kmplot = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kmplot-20.08.1.tar.xz"; - sha256 = "6d294a89f9e0fc42262ada6d71ba5abaeb756beb194e71f1852e18ae2b85456e"; - name = "kmplot-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kmplot-20.08.2.tar.xz"; + sha256 = "c3bc34a2d1bf4620745009b49b6541a16ac64eb3d1e6cf1ba936b14aa5d02e2b"; + name = "kmplot-20.08.2.tar.xz"; }; }; knavalbattle = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/knavalbattle-20.08.1.tar.xz"; - sha256 = "e0cbffc5643aac302c53cfd957eefa7f89486fdd0d9c55b74f39d733a0ac3b65"; - name = "knavalbattle-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/knavalbattle-20.08.2.tar.xz"; + sha256 = "2cd91ee61193810eee62e47f38f590e81b03287083f31564e0ebfd893d339ac9"; + name = "knavalbattle-20.08.2.tar.xz"; }; }; knetwalk = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/knetwalk-20.08.1.tar.xz"; - sha256 = "30cbf7bdf5f875ce172a382ef7da8e74803015017c6cd525cb6c288defac020d"; - name = "knetwalk-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/knetwalk-20.08.2.tar.xz"; + sha256 = "4a97f4b1af463e5e50698e8ac089cf6933fb66f25dd9b0fae3f1b1a51cbca3c0"; + name = "knetwalk-20.08.2.tar.xz"; }; }; knights = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/knights-20.08.1.tar.xz"; - sha256 = "58518d8ecce5744fdf68c18e0803f48cb912fa29c5ea93ed6ccd2d4d320f722d"; - name = "knights-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/knights-20.08.2.tar.xz"; + sha256 = "b62dda6e8b5bb85cc814f7244e39806e38c266be1bf3090eb6de59c8141fc1d4"; + name = "knights-20.08.2.tar.xz"; }; }; knotes = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/knotes-20.08.1.tar.xz"; - sha256 = "7d066a34d46684f258481466875d18f99a9000d66dec36f7dcab92790f6c57bb"; - name = "knotes-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/knotes-20.08.2.tar.xz"; + sha256 = "1e61f2c8b5fe9075f07be16543e3a7310bf533b6c2446f162f7196b41e3e6ecb"; + name = "knotes-20.08.2.tar.xz"; }; }; kolf = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kolf-20.08.1.tar.xz"; - sha256 = "04d117895a6504d6138d1e3cd3157dd3318ba93eefd749182556344650f6a2f8"; - name = "kolf-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kolf-20.08.2.tar.xz"; + sha256 = "834c1c6cdc62e650c7b0d36db26387cc4ebe2bb4b2e8fa06c0bf461e3a1e8c64"; + name = "kolf-20.08.2.tar.xz"; }; }; kollision = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kollision-20.08.1.tar.xz"; - sha256 = "858d69131951734181b449ce48498b3b843634eb8c069c932042b3c0f862f98c"; - name = "kollision-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kollision-20.08.2.tar.xz"; + sha256 = "9b6829f49d9baa89596ef8649996724db72c3c8eb793b9b6afc80dc0d07c0421"; + name = "kollision-20.08.2.tar.xz"; }; }; kolourpaint = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kolourpaint-20.08.1.tar.xz"; - sha256 = "7de98e081f13fb9f8a73932d5e8ce6f1cfd73e345fa28d03f515cad69f1b8bae"; - name = "kolourpaint-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kolourpaint-20.08.2.tar.xz"; + sha256 = "fbcd875a4a407d9b1e5a637d4947bacfb50f39e10af3327f30fdbb953528aae0"; + name = "kolourpaint-20.08.2.tar.xz"; }; }; kompare = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kompare-20.08.1.tar.xz"; - sha256 = "6e9109f1b24b3d79dec3d70c75357a67d16ab35081bcf7e4b842981b84796aa2"; - name = "kompare-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kompare-20.08.2.tar.xz"; + sha256 = "4e52cb2c9e35e90fe77bfb23bd10c1931c56b11e3fec06c215730d60c47e8550"; + name = "kompare-20.08.2.tar.xz"; }; }; konqueror = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/konqueror-20.08.1.tar.xz"; - sha256 = "e3aac062d9e431e63a861ecf5a1d577b11a154faaed5bd95ef6b69b4fc8a34e9"; - name = "konqueror-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/konqueror-20.08.2.tar.xz"; + sha256 = "f0622aa67ad0028e28bd6129688aab8946fb49492f0b335f6624ab7d4ef239d7"; + name = "konqueror-20.08.2.tar.xz"; }; }; konquest = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/konquest-20.08.1.tar.xz"; - sha256 = "cad87dd698bd1ebc0279216614f7fa7c3d3f36d545683a69f1ceafe9e279bbfe"; - name = "konquest-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/konquest-20.08.2.tar.xz"; + sha256 = "cf97a6961b15b39f5bcdf541e52c137f1d67d0fa5ee259922b4e762edc4491eb"; + name = "konquest-20.08.2.tar.xz"; }; }; konsole = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/konsole-20.08.1.tar.xz"; - sha256 = "bdd82f9104b2f76c53bdbdef613391719b70719a132d24f12e5f620e1c9313d1"; - name = "konsole-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/konsole-20.08.2.tar.xz"; + sha256 = "af08ac7666f1ba7c407205f32aaaf015329621247502e80d8df4abe103148951"; + name = "konsole-20.08.2.tar.xz"; }; }; kontact = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kontact-20.08.1.tar.xz"; - sha256 = "36c33eb5685c22f94257e86ff760d1aa225ae6e2d69402a2b653c54627c7cbde"; - name = "kontact-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kontact-20.08.2.tar.xz"; + sha256 = "232d9880df74ce0c7697f08b53ef9512ac9c11c3b04142ba7ba4b95091cb5396"; + name = "kontact-20.08.2.tar.xz"; }; }; kontactinterface = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kontactinterface-20.08.1.tar.xz"; - sha256 = "8272d0c17423a15e56e9e6d3979ee3017fd02ed996b8b6902c47312276ffeb51"; - name = "kontactinterface-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kontactinterface-20.08.2.tar.xz"; + sha256 = "72d53dbea9db0b1f5654e13c18b4da3d256c6b9d08dfe4581cdf73e3552d2a07"; + name = "kontactinterface-20.08.2.tar.xz"; }; }; kopete = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kopete-20.08.1.tar.xz"; - sha256 = "9846baae28d723963927d231716e2a8bc19795bac920958b688b48394ef5bc05"; - name = "kopete-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kopete-20.08.2.tar.xz"; + sha256 = "05f5d6236d4c96b9ce7ba5f24f4e06d7263a78cac27368a7e6b3e5075d42fbb1"; + name = "kopete-20.08.2.tar.xz"; }; }; korganizer = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/korganizer-20.08.1.tar.xz"; - sha256 = "e693d895b36575f2a73c36ceaafadf81465bbf9b03c74da27f5273a2e7e3670e"; - name = "korganizer-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/korganizer-20.08.2.tar.xz"; + sha256 = "4f719ec12c52fc313997a187439dc6888fd030a4a1b2357db000abc0a19527b2"; + name = "korganizer-20.08.2.tar.xz"; }; }; kpat = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kpat-20.08.1.tar.xz"; - sha256 = "2c23ee028c03c5c210b110a2ad253aa7d91c5a0abcb101eb2b3f4c640092463c"; - name = "kpat-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kpat-20.08.2.tar.xz"; + sha256 = "e4aaed4e876212a926a05d252dab9d01f240d829e383c6072e168a4f78e6d446"; + name = "kpat-20.08.2.tar.xz"; }; }; kpimtextedit = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kpimtextedit-20.08.1.tar.xz"; - sha256 = "2664e6cbe520fa345e18db071dd5b8a5b4cf9b0fc7317eb04849005228666189"; - name = "kpimtextedit-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kpimtextedit-20.08.2.tar.xz"; + sha256 = "2dfbcdd53669c812234346b4d31b61af9c510bb4cb0b9912decea8d3c4d406a6"; + name = "kpimtextedit-20.08.2.tar.xz"; }; }; kpkpass = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kpkpass-20.08.1.tar.xz"; - sha256 = "76012e5bdd4cc434313a0f311acec8f7c798542008cd8efa71fcdf04fb77e55b"; - name = "kpkpass-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kpkpass-20.08.2.tar.xz"; + sha256 = "ed699c75128ef299f06d699c80c69ac9529fa044db6f18a39d54a5e70d85108c"; + name = "kpkpass-20.08.2.tar.xz"; }; }; kqtquickcharts = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kqtquickcharts-20.08.1.tar.xz"; - sha256 = "ea931bfefcc04bee03bff2498b92ca1a390967bbc5366c739d1a7cde6bb75820"; - name = "kqtquickcharts-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kqtquickcharts-20.08.2.tar.xz"; + sha256 = "2ba593a65c143cb56a3030f7ee0cced2df7c7e9431cebf1ae93be51c68b4c3b4"; + name = "kqtquickcharts-20.08.2.tar.xz"; }; }; krdc = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/krdc-20.08.1.tar.xz"; - sha256 = "7b1fa57be31a3534099e7f203ef9afde23c86c4bbed1072a9d1164a3cf5e1e20"; - name = "krdc-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/krdc-20.08.2.tar.xz"; + sha256 = "52ddd68bdb1b356be341cf3bc5405cb965f4e4f3da8bf4b28bfb62c7db21ac5f"; + name = "krdc-20.08.2.tar.xz"; }; }; kreversi = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kreversi-20.08.1.tar.xz"; - sha256 = "5da68ddd37f5dbd4e1c94d1641c69f0e9b4e99eff3cdafcdcbac1139ca517315"; - name = "kreversi-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kreversi-20.08.2.tar.xz"; + sha256 = "22824dca9c8f07145a6fd9b7386867d8a8efff0fda6752f377230381a1cc71c2"; + name = "kreversi-20.08.2.tar.xz"; }; }; krfb = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/krfb-20.08.1.tar.xz"; - sha256 = "a80b9bab47f2a7299e33b0e2a10b117605ec1cc572ca72e914c7f01dde383eda"; - name = "krfb-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/krfb-20.08.2.tar.xz"; + sha256 = "5e90fb4f3bcf2c48b15ec33634d61464323ab5ce1c156a499f089d862dd041d4"; + name = "krfb-20.08.2.tar.xz"; }; }; kross-interpreters = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kross-interpreters-20.08.1.tar.xz"; - sha256 = "1fb7d75d83e63d1a7147468dd25eeb6aeb06b4679f126c658a8b40ef257f9a4e"; - name = "kross-interpreters-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kross-interpreters-20.08.2.tar.xz"; + sha256 = "82da0302d2d292e86fa924c8bd1d4effb21f763c42c57affaddeff4777c43951"; + name = "kross-interpreters-20.08.2.tar.xz"; }; }; kruler = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kruler-20.08.1.tar.xz"; - sha256 = "a9a1f3bd7b02416a393826f7bb810211ef2e14a3628706de735cb88e791d72d1"; - name = "kruler-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kruler-20.08.2.tar.xz"; + sha256 = "ede45d9cdf1b514fb20ed3a97877689ec75904438b94735706eb638ba01ca778"; + name = "kruler-20.08.2.tar.xz"; }; }; kshisen = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kshisen-20.08.1.tar.xz"; - sha256 = "d53af415ed2f4d202f5a6f965408e39062e39f43acf83b9550b6cf2ecc1f7641"; - name = "kshisen-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kshisen-20.08.2.tar.xz"; + sha256 = "d11030b101a409324661adf664d4298f34cc320abff80dba72d112cc3ae2d25d"; + name = "kshisen-20.08.2.tar.xz"; }; }; ksirk = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ksirk-20.08.1.tar.xz"; - sha256 = "763d3a8f518365391d2a04943f6efa9c73c388b7701deff300e9e42e4efe848f"; - name = "ksirk-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ksirk-20.08.2.tar.xz"; + sha256 = "b7766f0976b3cc112d4c599d91c07d321829c9b1e8ef34d3d21ec4964026854a"; + name = "ksirk-20.08.2.tar.xz"; }; }; ksmtp = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ksmtp-20.08.1.tar.xz"; - sha256 = "608d395cd1a046810ebd00f990d6f7c63d66677e7293ef06948ab9d336d2f08f"; - name = "ksmtp-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ksmtp-20.08.2.tar.xz"; + sha256 = "5f51e0c025b192719709ae763feeac94df893007b62b5a69b7b95ae9f2fdd8ee"; + name = "ksmtp-20.08.2.tar.xz"; }; }; ksnakeduel = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ksnakeduel-20.08.1.tar.xz"; - sha256 = "25bb5cfe2ed480b8ee31d9fe2e62272d77e7b8667748eb4f2c855901f718784f"; - name = "ksnakeduel-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ksnakeduel-20.08.2.tar.xz"; + sha256 = "b6f0f51f8fad795cd134f9426b1f1ba8ccceb72e304e8ba55e60af471ad282cc"; + name = "ksnakeduel-20.08.2.tar.xz"; }; }; kspaceduel = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kspaceduel-20.08.1.tar.xz"; - sha256 = "382def18d1ce6a4333fb47bcd87aed6837382a2b0da2cb8b835d0b34eaed9e38"; - name = "kspaceduel-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kspaceduel-20.08.2.tar.xz"; + sha256 = "62b9526c031662c049aa90b06ed3e5e2ce8ae774f271e1f29430f23c1f6cd787"; + name = "kspaceduel-20.08.2.tar.xz"; }; }; ksquares = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ksquares-20.08.1.tar.xz"; - sha256 = "163c5c070643e31594ada4e812433eb5f615ef425dddafd515e6c445d821f319"; - name = "ksquares-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ksquares-20.08.2.tar.xz"; + sha256 = "e1f9fdfa9a4a8348a65e66d48b7389784a1db6c8799cea453d6da3a2a57aca59"; + name = "ksquares-20.08.2.tar.xz"; }; }; ksudoku = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ksudoku-20.08.1.tar.xz"; - sha256 = "e53b694b340f812cd3bdf5126a32a1e71efe0785897c5d15f9e28c68fd794840"; - name = "ksudoku-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ksudoku-20.08.2.tar.xz"; + sha256 = "6fed393f734eb27d6c36ad7516bf29ff648d319f08d9f8bdc17a8030842d8e33"; + name = "ksudoku-20.08.2.tar.xz"; }; }; ksystemlog = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ksystemlog-20.08.1.tar.xz"; - sha256 = "e0e8bc1cf8ee229206c8a65e30979ba8b72426c8dc2f737f6fecb0dfb36ed21a"; - name = "ksystemlog-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ksystemlog-20.08.2.tar.xz"; + sha256 = "63c6a520b63f148de2e3996250a2fef22e1a3ce18e744a699ae21de96a2c4e53"; + name = "ksystemlog-20.08.2.tar.xz"; }; }; kteatime = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kteatime-20.08.1.tar.xz"; - sha256 = "23cc14f587e4ae4e3b56f1fb7a2093301df740328e35b25d7fca55d35f012ce5"; - name = "kteatime-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kteatime-20.08.2.tar.xz"; + sha256 = "d8e69fdb124e8689c72e4b9fe39226cc49b1ca990478fbb68e02b37f0cd861ac"; + name = "kteatime-20.08.2.tar.xz"; }; }; ktimer = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktimer-20.08.1.tar.xz"; - sha256 = "9c7062f9ee64ff49a7c7773fe41cee0899e30f1f47368af73da067e51db6714b"; - name = "ktimer-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktimer-20.08.2.tar.xz"; + sha256 = "69293b7296643c6543d0646d14f9c75479f29f129924258957a407b77539a4c2"; + name = "ktimer-20.08.2.tar.xz"; }; }; ktnef = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktnef-20.08.1.tar.xz"; - sha256 = "433b232a0c835e7f27c06e6d19856e4f8690c3e3b5c5d63f85172897b2448c81"; - name = "ktnef-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktnef-20.08.2.tar.xz"; + sha256 = "ab73736e386c2b52a14fb56f1184479ed1c83c0571e9e8518d2b94b1dcd2e47d"; + name = "ktnef-20.08.2.tar.xz"; }; }; ktouch = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktouch-20.08.1.tar.xz"; - sha256 = "e098ebbccca743f678103a9adf54fc388fa4379cc6f667e48259d0b50f56b5fb"; - name = "ktouch-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktouch-20.08.2.tar.xz"; + sha256 = "1b073a92343c9a2c772cfaac4e9fa7b6e85750586e3a57da413e33cdba34b5f4"; + name = "ktouch-20.08.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-accounts-kcm-20.08.1.tar.xz"; - sha256 = "b71f2f654c3cf48e4b4b037a0ae8f6fef5bac9c3483458c0eadf7b3253577504"; - name = "ktp-accounts-kcm-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-accounts-kcm-20.08.2.tar.xz"; + sha256 = "df709ee612ff4c71a43197762b8a9d296b5a43f6e0afe4d9c8d0bd88eef81465"; + name = "ktp-accounts-kcm-20.08.2.tar.xz"; }; }; ktp-approver = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-approver-20.08.1.tar.xz"; - sha256 = "51296f4d84585ba63d4c72cdbdee6e2b436a1aff8ce6b475a8c9a81766856b39"; - name = "ktp-approver-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-approver-20.08.2.tar.xz"; + sha256 = "054db02db679d0a4600632700cdd57cae539159a0a8f01f479ea337d33d8a6bd"; + name = "ktp-approver-20.08.2.tar.xz"; }; }; ktp-auth-handler = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-auth-handler-20.08.1.tar.xz"; - sha256 = "6c1c006a3381caeebdfc37886b91b598153f3778567303d8a031e84599c9d582"; - name = "ktp-auth-handler-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-auth-handler-20.08.2.tar.xz"; + sha256 = "a61557efa800d42fd8ed14efdb09d43310212976d737a4fd5272f502bacbc371"; + name = "ktp-auth-handler-20.08.2.tar.xz"; }; }; ktp-call-ui = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-call-ui-20.08.1.tar.xz"; - sha256 = "feb783be10b0792cb0c59456a00607b2d595e8bef90f0b4ec79dd070596d413c"; - name = "ktp-call-ui-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-call-ui-20.08.2.tar.xz"; + sha256 = "ecd38d8b9f24cf620b8c9c1935328af3142199c6aa87e69c734e43096e492ac5"; + name = "ktp-call-ui-20.08.2.tar.xz"; }; }; ktp-common-internals = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-common-internals-20.08.1.tar.xz"; - sha256 = "5750bde4950fbe26f06a306aa642c9c501d4f0e1b41b57234d9e36b189a91d1b"; - name = "ktp-common-internals-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-common-internals-20.08.2.tar.xz"; + sha256 = "807fcd6f9c415a0799057435f997e143e9584a94577f9afaa7fcc6a4197e7cb0"; + name = "ktp-common-internals-20.08.2.tar.xz"; }; }; ktp-contact-list = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-contact-list-20.08.1.tar.xz"; - sha256 = "809db5ff05c1ec632109be408cef987532193b1b0bea69d6a9286c12ccfe19a1"; - name = "ktp-contact-list-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-contact-list-20.08.2.tar.xz"; + sha256 = "214d73532dc855a8a4b68730adf5cbd046aae89f2ee2ad5d9a4c25b4eff6acb0"; + name = "ktp-contact-list-20.08.2.tar.xz"; }; }; ktp-contact-runner = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-contact-runner-20.08.1.tar.xz"; - sha256 = "a9e761fd35545cfffade088e33f4358e2743416f61e9ba490f21f3b04193158f"; - name = "ktp-contact-runner-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-contact-runner-20.08.2.tar.xz"; + sha256 = "8e40e4ab7ce2c1c382b109a15f88f5e1c7d147c76ed36ca05ef6d9f3f58d3d45"; + name = "ktp-contact-runner-20.08.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-desktop-applets-20.08.1.tar.xz"; - sha256 = "d6ffd4b29c4fb977937cb47d55d023012be1a9b3602dd1f1628eba7d8c9167cd"; - name = "ktp-desktop-applets-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-desktop-applets-20.08.2.tar.xz"; + sha256 = "b0884360be80f89dee3852b023055220e3cdab2f422cc3812eda31169fba6298"; + name = "ktp-desktop-applets-20.08.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-filetransfer-handler-20.08.1.tar.xz"; - sha256 = "35495c1d18a7b65496fcf17cade4a81e4795b1603c380c036dda0a7626f66312"; - name = "ktp-filetransfer-handler-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-filetransfer-handler-20.08.2.tar.xz"; + sha256 = "c2ec5fd2a5746dd8ce1371c503c51feee206d8dfe7ca8cdaa71b8e925636a97c"; + name = "ktp-filetransfer-handler-20.08.2.tar.xz"; }; }; ktp-kded-module = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-kded-module-20.08.1.tar.xz"; - sha256 = "247e4047e3955e21066ec461a5374d1b3d925bb92b42adc46d3711e542ad7e04"; - name = "ktp-kded-module-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-kded-module-20.08.2.tar.xz"; + sha256 = "307285b2d4e04c244691a6f2a285aec8ada26e0b01eb1fdbf2bc1da57b05828a"; + name = "ktp-kded-module-20.08.2.tar.xz"; }; }; ktp-send-file = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-send-file-20.08.1.tar.xz"; - sha256 = "b3786c6e6f09ea086c2d94d2a6dd653e45bab8f984c6287c39f5e0134d6ffee1"; - name = "ktp-send-file-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-send-file-20.08.2.tar.xz"; + sha256 = "6c3fb09112d439ce2f0db3acdbc766e8a914d4dc7cbb6ab709922f8e95f2f0e1"; + name = "ktp-send-file-20.08.2.tar.xz"; }; }; ktp-text-ui = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktp-text-ui-20.08.1.tar.xz"; - sha256 = "5cdb88f55b6ca1a1053b8d5b2604eff681c5f3558f0c8037034c264793de8c02"; - name = "ktp-text-ui-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktp-text-ui-20.08.2.tar.xz"; + sha256 = "0f10612e08bc1ee04fb0a538337d760d7b79b5dac37bb58275998d16dbb5415c"; + name = "ktp-text-ui-20.08.2.tar.xz"; }; }; ktuberling = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/ktuberling-20.08.1.tar.xz"; - sha256 = "62d3d8db7b1db7f9d58df44acf61342ce42fb081038fc48f8f6e45d9167ceaa6"; - name = "ktuberling-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/ktuberling-20.08.2.tar.xz"; + sha256 = "f9e4a0de3b92d015f8e7b862badf4bbf11b3ce2727aa607384a009247e7b7fad"; + name = "ktuberling-20.08.2.tar.xz"; }; }; kturtle = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kturtle-20.08.1.tar.xz"; - sha256 = "c261fdf44b36aaa278b4b9752a0d989facec3768853606e5c0b8a86d9d01edb3"; - name = "kturtle-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kturtle-20.08.2.tar.xz"; + sha256 = "ca9bf47b2ec34744492f218c922b10d613b19fbbd2c75b6ddba157eef21337c7"; + name = "kturtle-20.08.2.tar.xz"; }; }; kubrick = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kubrick-20.08.1.tar.xz"; - sha256 = "c0c017f6913f94224e18df7d96ba9ad92f51522a331b77f5722f2d2c953c342c"; - name = "kubrick-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kubrick-20.08.2.tar.xz"; + sha256 = "02fed26a7246feffd668fbda939893295557c0571da64fdf195db93474653224"; + name = "kubrick-20.08.2.tar.xz"; }; }; kwalletmanager = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kwalletmanager-20.08.1.tar.xz"; - sha256 = "b5a134db6b6bceb802c6c45915636bcd95fea5b6846cfd022917405f48cc92c5"; - name = "kwalletmanager-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kwalletmanager-20.08.2.tar.xz"; + sha256 = "7950e250c5351a9b8e3b36165fa2003baa044bb2d3553a32360000a322bddad8"; + name = "kwalletmanager-20.08.2.tar.xz"; }; }; kwave = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kwave-20.08.1.tar.xz"; - sha256 = "3791f9401271c23d3ababd14e4c1e6acfe58df2100331e31ba61453feaf9fa32"; - name = "kwave-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kwave-20.08.2.tar.xz"; + sha256 = "6e15a67022ef96f07b9825139cc7aaacbc6f60729570c31ce6cb25184602b434"; + name = "kwave-20.08.2.tar.xz"; }; }; kwordquiz = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/kwordquiz-20.08.1.tar.xz"; - sha256 = "77d2d30abcb37ee6a8e0b121ed1969f2fa61eb32814f49a0186043a4e8f1a71c"; - name = "kwordquiz-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/kwordquiz-20.08.2.tar.xz"; + sha256 = "57aa012f3aad128579f067668db1344306e2e23d6a89b47d413d6eee0da0e238"; + name = "kwordquiz-20.08.2.tar.xz"; }; }; libgravatar = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libgravatar-20.08.1.tar.xz"; - sha256 = "dfe95055869944b79b1f4120f013b547225b02b69c7e410fd09d52469a892263"; - name = "libgravatar-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libgravatar-20.08.2.tar.xz"; + sha256 = "4c0a2eb073ef42a26813b93bd76aaa9e26a040a966329e6e3cf371d7de1e55f7"; + name = "libgravatar-20.08.2.tar.xz"; }; }; libkcddb = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkcddb-20.08.1.tar.xz"; - sha256 = "1519c9248b46d95d8761a8ed22b0805964a5fef5aa665710b08851c753f70590"; - name = "libkcddb-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkcddb-20.08.2.tar.xz"; + sha256 = "545cf54ac454845c524ba7cd7ec289ac952fa1ce2bbae01411ba71c66a5ed08a"; + name = "libkcddb-20.08.2.tar.xz"; }; }; libkcompactdisc = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkcompactdisc-20.08.1.tar.xz"; - sha256 = "f43b8129a0083686dbc939387931867d9d65e14936f2a86be0a7286e01cf1974"; - name = "libkcompactdisc-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkcompactdisc-20.08.2.tar.xz"; + sha256 = "37534f67af69775d6f786917920d2810a5d20f28df57e1a17aee9a7b30bbe302"; + name = "libkcompactdisc-20.08.2.tar.xz"; }; }; libkdcraw = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkdcraw-20.08.1.tar.xz"; - sha256 = "3431810972d886635ba6249ac86a9442a9c3a3333eb0b27533fc459e757e9eb1"; - name = "libkdcraw-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkdcraw-20.08.2.tar.xz"; + sha256 = "6fbf1a5ca5a439fabb01648cde4b57e1f3de2372b7f3b56ccae03f653490f1b2"; + name = "libkdcraw-20.08.2.tar.xz"; }; }; libkdegames = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkdegames-20.08.1.tar.xz"; - sha256 = "6ab0b143dcba2d935dd0182c9154657ebbfb205c28bc86e2e13875b58e23737d"; - name = "libkdegames-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkdegames-20.08.2.tar.xz"; + sha256 = "d9f0ab87dc4671a55ad8d2b7d3a54cbc444201c11ebae436e0107fe7067fb983"; + name = "libkdegames-20.08.2.tar.xz"; }; }; libkdepim = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkdepim-20.08.1.tar.xz"; - sha256 = "a2fb769239283e7f536d4779089ad8664d1498cf7520f057589bf0285630fb4b"; - name = "libkdepim-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkdepim-20.08.2.tar.xz"; + sha256 = "3558c9af95c22bb4ce0ceeec483fada9e8e9f27de4ac34ffe44a4eb3b6d21101"; + name = "libkdepim-20.08.2.tar.xz"; }; }; libkeduvocdocument = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkeduvocdocument-20.08.1.tar.xz"; - sha256 = "ecd158beb7fcc1a5d540d956669c6fdce6172f4b282755170d2791076d75ad84"; - name = "libkeduvocdocument-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkeduvocdocument-20.08.2.tar.xz"; + sha256 = "ef8e0b359e3cf1b3303da3795add1ced405d230f51895abe10d5a7989be03923"; + name = "libkeduvocdocument-20.08.2.tar.xz"; }; }; libkexiv2 = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkexiv2-20.08.1.tar.xz"; - sha256 = "67310ae90d89f26d2ae98ede8fa973e27ea1ce3d15c389954d391cd058543979"; - name = "libkexiv2-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkexiv2-20.08.2.tar.xz"; + sha256 = "793c4d11bb1b60beca7b25a2427650b3f358364c55be022dfd4a7ccfd889578d"; + name = "libkexiv2-20.08.2.tar.xz"; }; }; libkgapi = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkgapi-20.08.1.tar.xz"; - sha256 = "dfa9003556a01ef19eda186973f87356d32ea8f82f8d653803b2cc935f077127"; - name = "libkgapi-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkgapi-20.08.2.tar.xz"; + sha256 = "f3fb015e8b8ac92c138e8a59e8e8b9333500e0ea314180cc1ad14e31248312df"; + name = "libkgapi-20.08.2.tar.xz"; }; }; libkgeomap = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkgeomap-20.08.1.tar.xz"; - sha256 = "a210945b6807efca3390173233269aa31f27a23b5f36670b88f66b3b28df846f"; - name = "libkgeomap-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkgeomap-20.08.2.tar.xz"; + sha256 = "7149095aa0df4e3a184bb2a6fb8322e27e3a34eb3bc40cf370a09b21fb2a6ea0"; + name = "libkgeomap-20.08.2.tar.xz"; }; }; libkipi = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkipi-20.08.1.tar.xz"; - sha256 = "4722ab563c1350042920d1937b84fdd38b5779449a2d9b689328cd82241cb5d2"; - name = "libkipi-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkipi-20.08.2.tar.xz"; + sha256 = "87ffa30b23779313a94953afe57d1b19515c3a2f311a2dea6449c9d96b09e5b1"; + name = "libkipi-20.08.2.tar.xz"; }; }; libkleo = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkleo-20.08.1.tar.xz"; - sha256 = "78c1dc2e4d7177aaf37cb1c706d9c21b08fac7d130ac1da3d3f2a6f083117ffb"; - name = "libkleo-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkleo-20.08.2.tar.xz"; + sha256 = "34537b35e22cef85650ae6f9bf197518bb5a59e9614d6d86ba86f085fddd97c4"; + name = "libkleo-20.08.2.tar.xz"; }; }; libkmahjongg = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkmahjongg-20.08.1.tar.xz"; - sha256 = "5a8674921e39b38655d1f95340831b1bc746047cbad8501706436f5dacf47fc2"; - name = "libkmahjongg-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkmahjongg-20.08.2.tar.xz"; + sha256 = "032ac6d9e96cd9156f5153c01f881d0e442fda9de90398df320846095ba2c40a"; + name = "libkmahjongg-20.08.2.tar.xz"; }; }; libkomparediff2 = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libkomparediff2-20.08.1.tar.xz"; - sha256 = "9d109dfea1433602cdabc89ffa5f522147befc9b1d6d9760549aba7db5dbd399"; - name = "libkomparediff2-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libkomparediff2-20.08.2.tar.xz"; + sha256 = "91b0b72d5c4e2ddd863636cca299660bfbb5b7a55773cbc51000fe9c1ca91a98"; + name = "libkomparediff2-20.08.2.tar.xz"; }; }; libksane = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libksane-20.08.1.tar.xz"; - sha256 = "0d8717ad004a2480aea232d9a2317b4d1cc4678d53f0176bdaeb411eedd19dbe"; - name = "libksane-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libksane-20.08.2.tar.xz"; + sha256 = "21bb577d78e020281dfc6c993ab7fe286d648e72c851e45463a32969fbb35aa6"; + name = "libksane-20.08.2.tar.xz"; }; }; libksieve = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/libksieve-20.08.1.tar.xz"; - sha256 = "a1defe888c6c5a3c16ef6fad39d9eb94bc784031079763f004048951820acec0"; - name = "libksieve-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/libksieve-20.08.2.tar.xz"; + sha256 = "589e4dc27d1d91d8c16879fa99aab45f3847a74e3e9357e3e037503e5515ee2e"; + name = "libksieve-20.08.2.tar.xz"; }; }; lokalize = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/lokalize-20.08.1.tar.xz"; - sha256 = "a4a3e5703d39ae8fe12d2ff832e99b3339ba1c8ec8d2439abeb348e687f1eae9"; - name = "lokalize-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/lokalize-20.08.2.tar.xz"; + sha256 = "c11616bc02763fb1f3b1abf0b2ba70d0c6c550435c94ff25c5096f9a90375e23"; + name = "lokalize-20.08.2.tar.xz"; }; }; lskat = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/lskat-20.08.1.tar.xz"; - sha256 = "319d611468b969b3bb62731a0aa04c5672bb689c41adf5545dfa8b9742668775"; - name = "lskat-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/lskat-20.08.2.tar.xz"; + sha256 = "78f152f7af46345f65c3800f9c591fb204e917595c1f803c9c15148ef39c42b8"; + name = "lskat-20.08.2.tar.xz"; }; }; mailcommon = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/mailcommon-20.08.1.tar.xz"; - sha256 = "d4ee996f74a749ad626ca5029821546da82dbfc1c81864ff39b5f51d6dcf1d88"; - name = "mailcommon-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/mailcommon-20.08.2.tar.xz"; + sha256 = "a4170ab9ff7680fb26c61474f42d5424716f4e91c1a5e9275cc1222491c9564d"; + name = "mailcommon-20.08.2.tar.xz"; }; }; mailimporter = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/mailimporter-20.08.1.tar.xz"; - sha256 = "dcf2b94d4f66be2b339b31dfebef7af373e0cf59f09e4cfb664eb828e1d4f73f"; - name = "mailimporter-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/mailimporter-20.08.2.tar.xz"; + sha256 = "a255b60378c1cf77e517919d072cb44bd8c25e8ed8f07429763bb7915b3cc711"; + name = "mailimporter-20.08.2.tar.xz"; }; }; marble = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/marble-20.08.1.tar.xz"; - sha256 = "96b019a41ae4e0aaab59950b6be040bd2145f130190b8c0dea436c791e3192ed"; - name = "marble-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/marble-20.08.2.tar.xz"; + sha256 = "f44ac10de33dc31ce1cb99635131fe2c7bf3f60f09204b2061f81042a725475c"; + name = "marble-20.08.2.tar.xz"; }; }; mbox-importer = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/mbox-importer-20.08.1.tar.xz"; - sha256 = "262c8805539b7c766099c6287d1dbf88161afe6d32c1c6821ebe63cff4fe3b71"; - name = "mbox-importer-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/mbox-importer-20.08.2.tar.xz"; + sha256 = "3b3bee33683c534974255616f3b2f3baebf85363b2c24bbee9cc195ddf35ca9a"; + name = "mbox-importer-20.08.2.tar.xz"; }; }; messagelib = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/messagelib-20.08.1.tar.xz"; - sha256 = "fc41124e905456a3c5227ca6154dc3e77620e307458fbb19f5421cbfb04523b3"; - name = "messagelib-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/messagelib-20.08.2.tar.xz"; + sha256 = "5cf3a3f2b6473e60a7c2af10aa4eb1cfba25a4786132ee87b657b0dafb9f5028"; + name = "messagelib-20.08.2.tar.xz"; }; }; minuet = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/minuet-20.08.1.tar.xz"; - sha256 = "a640025550337f415f7bfaaad7f6ef7de667dd054131be2c313d894c3f6703ea"; - name = "minuet-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/minuet-20.08.2.tar.xz"; + sha256 = "24383168e2a0b7b319ecb37e2b1f3b039ad790a7e0f49385657f049565f1ef84"; + name = "minuet-20.08.2.tar.xz"; }; }; okular = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/okular-20.08.1.tar.xz"; - sha256 = "77b5d8e410a2a008ea63f60a561f99053ec07d92da6ee3afaeefd977aadebd83"; - name = "okular-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/okular-20.08.2.tar.xz"; + sha256 = "6f1885ed8050a55bb2cbf05089b452f555852e003ec7fe89fe472c0dbc92e65b"; + name = "okular-20.08.2.tar.xz"; }; }; palapeli = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/palapeli-20.08.1.tar.xz"; - sha256 = "31b847caa89b998dfa580553d96c656b05f2d85fdd88f0ba71e953762cefac90"; - name = "palapeli-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/palapeli-20.08.2.tar.xz"; + sha256 = "a31b0db2f3e77eac8f527d26f8ed0400fe5bcdb3a3970b925f14886bd1bcd63e"; + name = "palapeli-20.08.2.tar.xz"; }; }; parley = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/parley-20.08.1.tar.xz"; - sha256 = "9617a90c2d4f9ab5d928febc6bcd10c9023dcc10e9f1202bfb97b77019948f0c"; - name = "parley-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/parley-20.08.2.tar.xz"; + sha256 = "cf2f00925730d8baec66d422f058e4b3e979678e79c57898ceffd8650720bda6"; + name = "parley-20.08.2.tar.xz"; }; }; picmi = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/picmi-20.08.1.tar.xz"; - sha256 = "027e37a2c9dcf828684a0f8ffdcfc6451a2bd62976c10d990e471fa0f5ba97c3"; - name = "picmi-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/picmi-20.08.2.tar.xz"; + sha256 = "35f2bf3d8375618f97aee01c8f2421521b2cd5c11d7b14fc9a376026d74c82a5"; + name = "picmi-20.08.2.tar.xz"; }; }; pimcommon = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/pimcommon-20.08.1.tar.xz"; - sha256 = "58a33349bf932076f6be343ae64e23f146e2a6a96e3af8ce68dbd752f2c80dd9"; - name = "pimcommon-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/pimcommon-20.08.2.tar.xz"; + sha256 = "cba9e66153d36debe3f046363af7ff40a4ba263f33bfe20c7ec10b5bf9183deb"; + name = "pimcommon-20.08.2.tar.xz"; }; }; pim-data-exporter = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/pim-data-exporter-20.08.1.tar.xz"; - sha256 = "54092763e4b951f4e90a217c876107900e0706da68ca5517184e5da258ae95ec"; - name = "pim-data-exporter-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/pim-data-exporter-20.08.2.tar.xz"; + sha256 = "54b09a3f763004c805cc0dce8ab2e665116b7ef29419f22ad413aa250dcb4ac0"; + name = "pim-data-exporter-20.08.2.tar.xz"; }; }; pim-sieve-editor = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/pim-sieve-editor-20.08.1.tar.xz"; - sha256 = "f788038796f226bfe426835fc6f186e23f2c7f9fda8316dfa6af307d6936d4ad"; - name = "pim-sieve-editor-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/pim-sieve-editor-20.08.2.tar.xz"; + sha256 = "e8c590a0fddc5292172115b11fb75c5f847347079100617dbf321875642d7098"; + name = "pim-sieve-editor-20.08.2.tar.xz"; }; }; poxml = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/poxml-20.08.1.tar.xz"; - sha256 = "9f4bcafc664532706fe634ce8b0f410619d5e3c285526a7b61969155d75bbad2"; - name = "poxml-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/poxml-20.08.2.tar.xz"; + sha256 = "67d260349489e92ebce20253f9a3ccde5bb75eb13eb4d1a08a86c18c82e4a2a9"; + name = "poxml-20.08.2.tar.xz"; }; }; print-manager = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/print-manager-20.08.1.tar.xz"; - sha256 = "52d41ca3ae69e6e8e1eb4ddf1d516868dc436e81779053efdea5e3819545ca5b"; - name = "print-manager-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/print-manager-20.08.2.tar.xz"; + sha256 = "de21f8c428198b906f4ae438d6ced8d707b12c15578409c2aa2f7b2f73feb990"; + name = "print-manager-20.08.2.tar.xz"; }; }; rocs = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/rocs-20.08.1.tar.xz"; - sha256 = "3c5f764f06f6f5b7c68523be4fdd37e75b2249e0b15001bc39e55051d9e271ef"; - name = "rocs-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/rocs-20.08.2.tar.xz"; + sha256 = "2d8efd62b89dd36033bb3d818c82fee67e6efa2d2bb98dda0d4eab13baaee485"; + name = "rocs-20.08.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/signon-kwallet-extension-20.08.1.tar.xz"; - sha256 = "10a0ea806dc63cbf6c6d4794fe596c68355bccb3e08370d70ce7a8e95af448a5"; - name = "signon-kwallet-extension-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/signon-kwallet-extension-20.08.2.tar.xz"; + sha256 = "a271f4d09511171dcf1ebcdaf0b7205f9ee6a75b20ef0801f36d136f7b4a70dd"; + name = "signon-kwallet-extension-20.08.2.tar.xz"; }; }; spectacle = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/spectacle-20.08.1.tar.xz"; - sha256 = "4a01b5ef41901ff2e83bb517c2e96a978188b98cb62243eb541a317f57a2bd69"; - name = "spectacle-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/spectacle-20.08.2.tar.xz"; + sha256 = "9a467ea3b05981d588d39573cca375636b825ad8cab8a36ce48dbbc12425ab0d"; + name = "spectacle-20.08.2.tar.xz"; }; }; step = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/step-20.08.1.tar.xz"; - sha256 = "6e04930963676b1bfa55ee095914c7491a61bf3963c45ed4157f868175ee6605"; - name = "step-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/step-20.08.2.tar.xz"; + sha256 = "a52e4b6f281ba1a7afd4ab3ac7307080464147c4052ee222399135fe61ac7958"; + name = "step-20.08.2.tar.xz"; }; }; svgpart = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/svgpart-20.08.1.tar.xz"; - sha256 = "206c3741464f959ffbaea09bc918fc3e88f32fcf12928cd8c399ab44d4b1f228"; - name = "svgpart-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/svgpart-20.08.2.tar.xz"; + sha256 = "3a46b5bd9acf5372f73b602d155517f0dff47f3337bd8a46a580aae7480dd771"; + name = "svgpart-20.08.2.tar.xz"; }; }; sweeper = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/sweeper-20.08.1.tar.xz"; - sha256 = "722c25de8cc74fe7e8310d47a7e794f32e935331f89d4f5249fd045a83ce0431"; - name = "sweeper-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/sweeper-20.08.2.tar.xz"; + sha256 = "0c255ef15c1e32eb561b26f5b73a6c154730be583efbc5ee713aaed17de14091"; + name = "sweeper-20.08.2.tar.xz"; }; }; umbrello = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/umbrello-20.08.1.tar.xz"; - sha256 = "d980d67f8a878e01cd3af5499aa843df703f20cdecca8a14b59d87d13c747328"; - name = "umbrello-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/umbrello-20.08.2.tar.xz"; + sha256 = "0357b44646c750253e3e7ee323b9e49e854c4c8cdf340eb5a11b2d42edfc4cd7"; + name = "umbrello-20.08.2.tar.xz"; }; }; yakuake = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/yakuake-20.08.1.tar.xz"; - sha256 = "6768a360a3d79080e6e53821460ed27f6c2e47fa11077bbec3213d85385d6fac"; - name = "yakuake-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/yakuake-20.08.2.tar.xz"; + sha256 = "8a0aa3a97a9fdc781887a6cb6480cba5079cf8aacd3345b63f5eb6be4d91665a"; + name = "yakuake-20.08.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.1/src/zeroconf-ioslave-20.08.1.tar.xz"; - sha256 = "ca1685a22922057ba89510d71a11218bf47db0d0313aec2b55aca21932564866"; - name = "zeroconf-ioslave-20.08.1.tar.xz"; + url = "${mirror}/stable/release-service/20.08.2/src/zeroconf-ioslave-20.08.2.tar.xz"; + sha256 = "0ad34f8361ee3ecd669e396265135b534239994d3bec5e9e6a43b7b7bf5c04e4"; + name = "zeroconf-ioslave-20.08.2.tar.xz"; }; }; } From d87b88361a5e4bca4f61871bea4fe7fa6019600c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 28 Oct 2020 16:13:05 +0800 Subject: [PATCH 203/294] okular: add missing dependency --- pkgs/applications/kde/okular.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 3bcdb9ca8424..288b2ceb807f 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -4,7 +4,7 @@ breeze-icons, chmlib ? null, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, - kpty, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, + kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash }: @@ -14,7 +14,7 @@ mkDerivation { buildInputs = [ breeze-icons discount djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons - kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet + kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 qtdeclarative qtsvg threadweaver kcrash ] ++ lib.optional (!stdenv.isAarch64) chmlib; From 0d25246f4dd651f9a82c7c38a872b6042901c89e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 28 Oct 2020 16:13:31 +0800 Subject: [PATCH 204/294] kdeconnect: part of kdeApplications --- pkgs/applications/kde/default.nix | 1 + .../default.nix => kde/kdeconnect-kde.nix} | 78 ++++++++----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 37 insertions(+), 47 deletions(-) rename pkgs/applications/{misc/kdeconnect/default.nix => kde/kdeconnect-kde.nix} (71%) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 9622404c456d..4713c9ecf494 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -107,6 +107,7 @@ let kcharselect = callPackage ./kcharselect.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; kdebugsettings = callPackage ./kdebugsettings.nix {}; + kdeconnect-kde = callPackage ./kdeconnect-kde.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/kde/kdeconnect-kde.nix similarity index 71% rename from pkgs/applications/misc/kdeconnect/default.nix rename to pkgs/applications/kde/kdeconnect-kde.nix index d042f011bb78..a1ebda75a9cc 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -1,39 +1,32 @@ { mkDerivation -, lib -, fetchurl -, fetchpatch , extra-cmake-modules +, fetchpatch , kcmutils , kconfigwidgets , kdbusaddons , kdoctools -, kiconthemes , ki18n -, knotifications -, qca-qt5 -, libfakekey -, libXtst -, qtx11extras -, qtmultimedia -, qtgraphicaleffects -, sshfs -, makeWrapper -, kwayland +, kiconthemes , kio -, kpeoplevcard -, kpeople , kirigami2 +, knotifications +, kpeople +, kpeoplevcard +, kwayland +, lib +, libXtst +, libfakekey +, makeWrapper , pulseaudio-qt +, qca-qt5 +, qtgraphicaleffects +, qtmultimedia +, qtx11extras +, sshfs }: -mkDerivation rec { - pname = "kdeconnect"; - version = "20.08.2"; - - src = fetchurl { - url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz"; - sha256 = "0rzfnkgkv759d4pa16qk0sw87wqzwgkd99yzrzfy2zcq423f6hvd"; - }; +mkDerivation { + name = "kdeconnect-kde"; patches = [ # https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328 @@ -44,39 +37,36 @@ mkDerivation rec { ]; buildInputs = [ - libfakekey - libXtst - qtmultimedia - qtgraphicaleffects - pulseaudio-qt - kpeoplevcard - kpeople - kirigami2 - ki18n - kiconthemes kcmutils kconfigwidgets kdbusaddons - knotifications - qca-qt5 - qtx11extras - makeWrapper - kwayland + ki18n + kiconthemes kio + kirigami2 + knotifications + kpeople + kpeoplevcard + kwayland + libXtst + libfakekey + pulseaudio-qt + qca-qt5 + qtgraphicaleffects + qtmultimedia + qtx11extras ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; postInstall = '' wrapProgram $out/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]} ''; - enableParallelBuilding = true; - meta = with lib; { description = "KDE Connect provides several features to integrate your phone and your computer"; - homepage = "https://community.kde.org/KDEConnect"; - license = with licenses; [ gpl2 ]; + homepage = "https://community.kde.org/KDEConnect"; + license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3538ac56ecfa..eeb5519233ce 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -224,6 +224,7 @@ mapAliases ({ kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15 julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15 + kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepassx-community = keepassxc; # added 2017-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d46ff6b8108..319d24d2e25d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21708,7 +21708,7 @@ in kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser - kdenlive kdf kdialog kdiamond + kdeconnect-kde kdenlive kdf kdialog kdiamond keditbookmarks kfind kfloppy kget kgpg @@ -21733,8 +21733,6 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdeconnect = libsForQt512.callPackage ../applications/misc/kdeconnect { }; - inherit (kdeFrameworks) kdesu; kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; From dfd29f9d7c878ab3e2a0bc0e8d8c7a41834fd3cc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 28 Oct 2020 21:10:17 +0800 Subject: [PATCH 205/294] zanshin: broken before the 20.08.2 upgrade --- pkgs/applications/office/zanshin/default.nix | 37 ++++++++++++++------ 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 18e762974964..e3b9408ed96d 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,10 +1,18 @@ -{ - mkDerivation, lib, - fetchurl, - extra-cmake-modules, - qtbase, boost, - akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap, - krunner, kwallet, kcalendarcore +{ mkDerivation +, lib +, fetchurl +, extra-cmake-modules +, qtbase +, boost +, akonadi-calendar +, akonadi-notes +, akonadi-search +, kidentitymanagement +, kontactinterface +, kldap +, krunner +, kwallet +, kcalendarcore }: mkDerivation rec { @@ -21,9 +29,17 @@ mkDerivation rec { ]; buildInputs = [ - qtbase boost - akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap - krunner kwallet kcalendarcore + qtbase + boost + akonadi-calendar + akonadi-notes + akonadi-search + kidentitymanagement + kontactinterface + kldap + krunner + kwallet + kcalendarcore ]; meta = with lib; { @@ -32,5 +48,6 @@ mkDerivation rec { maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = licenses.gpl2Plus; + broken = true; }; } From 05d95cfe79a69cf690cec5d356b37e29d7d13d18 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 29 Oct 2020 07:20:41 +0800 Subject: [PATCH 206/294] kdeconnect: avoid double-wrapping the binary --- pkgs/applications/kde/kdeconnect-kde.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index a1ebda75a9cc..83e54d1fa80c 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -59,9 +59,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - postInstall = '' - wrapProgram $out/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]} - ''; + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ sshfs ]}" + ]; meta = with lib; { description = "KDE Connect provides several features to integrate your phone and your computer"; From 52c05c879135d9c189831f3805330b5904e2823a Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 28 Oct 2020 05:30:02 +0800 Subject: [PATCH 207/294] perlPackages.NetAsyncWebSocket: init at 0.13 --- pkgs/top-level/perl-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 76e391213c3e..8cf13ad08691 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14586,6 +14586,25 @@ let }; }; + NetAsyncWebSocket = buildPerlModule { + pname = "Net-Async-WebSocket"; + version = "0.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-WebSocket-0.13.tar.gz"; + sha256 = "000nw7gnj7ks55nib3fiikxx9bfmbla6fimxrbn2z2n7sd187b0d"; + }; + propagatedBuildInputs = [ IOAsync ProtocolWebSocket URI ]; + preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + # network tests fail on Darwin/sandbox, so disable these + rm -f t/02server.t t/03cross.t + ''; + meta = { + description = "Use WebSockets with IO::Async"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + NetAMQP = buildPerlModule { pname = "Net-AMQP"; version = "0.06"; From c76692192ad25dbbfc9db9cf239f69a8c80a1062 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 29 Oct 2020 13:57:19 -0400 Subject: [PATCH 208/294] nixos ec2/create-amis.sh: shellcheck: quote region references --- nixos/maintainers/scripts/ec2/create-amis.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 89e24f2ccfd9..0a0b07577c26 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -p awscli -p jq -p qemu -i bash +# shellcheck shell=bash # Uploads and registers NixOS images built from the # amazonImage attribute. Images are uploaded and @@ -111,7 +112,7 @@ wait_for_import() { log "Waiting for import task $task_id to be completed" while true; do read state progress snapshot_id < <( - aws ec2 describe-import-snapshot-tasks --region $region --import-task-ids "$task_id" | \ + aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" | \ jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail | "\(.Status) \(.Progress) \(.SnapshotId)"' ) log " ... state=$state progress=$progress snapshot_id=$snapshot_id" @@ -139,7 +140,7 @@ wait_for_image() { while true; do read state < <( - aws ec2 describe-images --image-ids "$ami_id" --region $region | \ + aws ec2 describe-images --image-ids "$ami_id" --region "$region" | \ jq -r ".Images[].State" ) log " ... state=$state" @@ -163,7 +164,7 @@ make_image_public() { local region=$1 local ami_id=$2 - wait_for_image $region "$ami_id" + wait_for_image "$region" "$ami_id" log "Making image $ami_id public" @@ -185,7 +186,7 @@ upload_image() { log "Checking for image on S3" if ! aws s3 ls --region "$region" "s3://${bucket}/${aws_path}" >&2; then log "Image missing from aws, uploading" - aws s3 cp --region $region "$image_file" "s3://${bucket}/${aws_path}" >&2 + aws s3 cp --region "$region" "$image_file" "s3://${bucket}/${aws_path}" >&2 fi log "Importing image from S3 path s3://$bucket/$aws_path" @@ -197,7 +198,7 @@ upload_image() { \"S3Bucket\": \"$bucket\", \"S3Key\": \"$aws_path\" } - }" --region $region | jq -r '.ImportTaskId') + }" --region "$region" | jq -r '.ImportTaskId') write_state "$state_key" task_id "$task_id" fi @@ -230,7 +231,7 @@ upload_image() { aws ec2 register-image \ --name "$image_name" \ --description "$image_description" \ - --region $region \ + --region "$region" \ --architecture $amazon_arch \ --block-device-mappings "${block_device_mappings[@]}" \ "${extra_flags[@]}" \ @@ -240,7 +241,7 @@ upload_image() { write_state "$state_key" ami_id "$ami_id" fi - make_image_public $region "$ami_id" + make_image_public "$region" "$ami_id" echo "$ami_id" } @@ -268,7 +269,7 @@ copy_to_region() { write_state "$state_key" ami_id "$ami_id" fi - make_image_public $region "$ami_id" + make_image_public "$region" "$ami_id" echo "$ami_id" } From f5994c208df64f3db0f4f69efffb3a2868e688b3 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 29 Oct 2020 13:58:37 -0400 Subject: [PATCH 209/294] nixos ec2/create-amis.sh: shellcheck: quote state_dir reference --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 0a0b07577c26..6be9cd594006 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -101,7 +101,7 @@ write_state() { local type=$2 local val=$3 - mkdir -p $state_dir + mkdir -p "$state_dir" echo "$val" > "$state_dir/$state_key.$type" } From baf7ed3f2446c433885d0b99ace294b333358183 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 29 Oct 2020 13:59:34 -0400 Subject: [PATCH 210/294] nixos ec2/create-amis.sh: shellcheck: SC2155: Declare and assign separately to avoid masking return values. --- nixos/maintainers/scripts/ec2/create-amis.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 6be9cd594006..085de5a647d6 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -178,9 +178,12 @@ upload_image() { local aws_path=${image_file#/} local state_key="$region.$image_label.$image_system" - local task_id=$(read_state "$state_key" task_id) - local snapshot_id=$(read_state "$state_key" snapshot_id) - local ami_id=$(read_state "$state_key" ami_id) + local task_id + task_id=$(read_state "$state_key" task_id) + local snapshot_id + snapshot_id=$(read_state "$state_key" snapshot_id) + local ami_id + ami_id=$(read_state "$state_key" ami_id) if [ -z "$task_id" ]; then log "Checking for image on S3" From a66a22ca545ce94a7b69aefe163fea2c20241f9d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 29 Oct 2020 14:01:22 -0400 Subject: [PATCH 211/294] nixos ec2/create-amis.sh: shellcheck: read without -r mangles backslashes --- nixos/maintainers/scripts/ec2/create-amis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 085de5a647d6..6e2836a7a97d 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -111,7 +111,7 @@ wait_for_import() { local state snapshot_id log "Waiting for import task $task_id to be completed" while true; do - read state progress snapshot_id < <( + read -r state progress snapshot_id < <( aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" | \ jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail | "\(.Status) \(.Progress) \(.SnapshotId)"' ) @@ -139,7 +139,7 @@ wait_for_image() { log "Waiting for image $ami_id to be available" while true; do - read state < <( + read -r state < <( aws ec2 describe-images --image-ids "$ami_id" --region "$region" | \ jq -r ".Images[].State" ) From 7dac8470cf69d10bcea3a61b1919cebf12a94fe6 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 29 Oct 2020 14:01:43 -0400 Subject: [PATCH 212/294] nixos ec2/create-amis.sh: shellcheck: explicitly make the additions to block_device_mappings single strings --- nixos/maintainers/scripts/ec2/create-amis.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 6e2836a7a97d..16aa5ce35f45 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -225,10 +225,10 @@ upload_image() { --virtualization-type hvm ) - block_device_mappings+=(DeviceName=/dev/sdb,VirtualName=ephemeral0) - block_device_mappings+=(DeviceName=/dev/sdc,VirtualName=ephemeral1) - block_device_mappings+=(DeviceName=/dev/sdd,VirtualName=ephemeral2) - block_device_mappings+=(DeviceName=/dev/sde,VirtualName=ephemeral3) + block_device_mappings+=("DeviceName=/dev/sdb,VirtualName=ephemeral0") + block_device_mappings+=("DeviceName=/dev/sdc,VirtualName=ephemeral1") + block_device_mappings+=("DeviceName=/dev/sdd,VirtualName=ephemeral2") + block_device_mappings+=("DeviceName=/dev/sde,VirtualName=ephemeral3") ami_id=$( aws ec2 register-image \ From f92a883ddb2e26e34244cf764fbfa63a4e580afa Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 29 Oct 2020 14:02:11 -0400 Subject: [PATCH 213/294] nixos ec2/create-amis.sh: shellcheck: $ is not needed in arithmetic --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 16aa5ce35f45..6cac4bb58d51 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -65,7 +65,7 @@ image_logical_bytes=$(read_image_info .logical_bytes) # Derived attributes -image_logical_gigabytes=$((($image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB +image_logical_gigabytes=$(((image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB case "$image_system" in aarch64-linux) From e253de8a772d8c73173807fef2e82ebce59c5153 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 30 Oct 2020 11:40:58 -0400 Subject: [PATCH 214/294] create-amis.sh: log the full response if describing the import snapshot tasks fails --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 6cac4bb58d51..d8bdf022d616 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -126,6 +126,8 @@ wait_for_import() { ;; *) log "Unexpected snapshot import state: '${state}'" + log "Full response: " + aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" >&2 exit 1 ;; esac From e79ac7b3d6638e3234262649018e3b11d3284332 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 30 Oct 2020 17:08:35 +0100 Subject: [PATCH 215/294] bdf2psf: 1.197 -> 1.198 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 2b3445ac6c33..0316a9b08a40 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.197"; + version = "1.198"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "023zj08rk8pmvpr8zybxn2ibrl5qsarkn8rb908mxhhlwpp12f7n"; + sha256 = "1b57pk10wf667aag3mhh397sfra44gilnyyg7fm532qaw3xapv2i"; }; nativeBuildInputs = [ dpkg ]; From 2bf1fc034502dd89f1026f8cf7bbdcf250d82550 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 30 Oct 2020 11:59:09 -0400 Subject: [PATCH 216/294] create-amis: allow customizing the service role name The complete setup on the AWS end can be configured with the following Terraform configuration. It generates a ./credentials.sh which I just copy/pasted in to the create-amis.sh script near the top. Note: the entire stack of users and bucket can be destroyed at the end of the import. variable "region" { type = string } variable "availability_zone" { type = string } provider "aws" { region = var.region } resource "aws_s3_bucket" "nixos-amis" { bucket_prefix = "nixos-amis-" lifecycle_rule { enabled = true abort_incomplete_multipart_upload_days = 1 expiration { days = 7 } } } resource "local_file" "credential-file" { file_permission = "0700" filename = "${path.module}/credentials.sh" sensitive_content = <