From 62e0c07836f547c00770031deaed8ba76e4b1949 Mon Sep 17 00:00:00 2001 From: Tmplt Date: Tue, 8 Oct 2019 20:03:27 +0200 Subject: [PATCH 001/113] octave: build with gl2ps Resolves #38459 --- pkgs/development/interpreters/octave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index cc9f6fcc3c9..0a5d92206d9 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull , libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGLU_combined, fltk -, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp +, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp, gl2ps , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ gfortran readline ncurses perl flex texinfo qhull graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw - fftwSinglePrec portaudio qrupdate arpack libwebp ] + fftwSinglePrec portaudio qrupdate arpack libwebp gl2ps ] ++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qscintilla != null) qscintilla) ++ (stdenv.lib.optional (ghostscript != null) ghostscript) From cf2c59ee88974c5fac0c933e199eb10bcfa34a5f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Nov 2019 19:55:32 -0800 Subject: [PATCH 002/113] ibus-engines.typing-booster-unwrapped: 2.7.0 -> 2.7.2 --- .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 6980478f685..e10d6ed607a 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.7.0"; + version = "2.7.2"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "1rd9dkjc9s15mxifcbr12944rsh8z66p0j6abh3iw8vkiylk674s"; + sha256 = "1v11hipdh8chkd81gcack42v8h8q4z2x2gv2gyymqk15yj0959i3"; }; patches = [ ./hunspell-dirs.patch ]; From 5a0c2f2956493bf92d1ffafcb466106073504ea2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Nov 2019 02:40:59 -0800 Subject: [PATCH 003/113] qpdf: 9.0.2 -> 9.1.0 --- pkgs/development/libraries/qpdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 5cdde468416..68362be596b 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libjpeg, zlib, perl }: -let version = "9.0.2"; +let version = "9.1.0"; in stdenv.mkDerivation rec { pname = "qpdf"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz"; - sha256 = "0b6jhhsifgiwrznxxi3h7hqm7bi91wph65jjbvs4g2860vcm296h"; + sha256 = "0ygd80wxcmh613n04x2kmf8wlsl0drxyd5wwdcrm1rzj0xwvpfrs"; }; nativeBuildInputs = [ perl ]; From 0b05c612bedd46b4cc2f933790315a41f3f03af0 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Thu, 5 Dec 2019 18:49:36 +0300 Subject: [PATCH 004/113] skrooge: 2.20.0 -> 2.21.0 Update to new upstream version --- pkgs/applications/office/skrooge/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index fd68896ca67..f1148f66524 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -7,21 +7,13 @@ mkDerivation rec { pname = "skrooge"; - version = "2.20.0"; + version = "2.21.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; - sha256 = "0rakfngp7j2x7h1isg6lbc5kva6k1kg99dz0zl43dc28s15can1w"; + sha256 = "1aqn0367q7mdg728r5085aqzc4mgfz1bgqqlhgdjjp7r192yq7r2"; }; - patches = [ - (fetchpatch { - name = "skrooge-2.20.0-missing-header.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch?id=cb8c91474b0ae2f9e889f89afe2d9114dbd1784f"; - sha256 = "154zsidx45h6qrcqjh6czjxrcwrcmbyv3yh2k1s40v8pzvjwzrld"; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules kdoctools shared-mime-info ]; From 9f2e88c3631bb3acd576cee28cd804ffacbe9493 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 21 Jan 2019 23:15:16 +0000 Subject: [PATCH 005/113] qbittorrent-nox: init at 4.1.9.1 --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32dc0fe9b34..a050cb7a859 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20744,6 +20744,9 @@ in pythonmagick = callPackage ../applications/graphics/PythonMagick { }; qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; + qbittorrent-nox = qbittorrent.override { + guiSupport = false; + }; qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { }; From 2942490c2cfc54fb864cc975eeba0d9352559a87 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 Dec 2019 07:57:20 +0000 Subject: [PATCH 006/113] =?UTF-8?q?coq=5F8=5F11:=20init=20at=208.11+=CE=B2?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/coq-packages.nix | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index e5958f46cbf..2378cb9408e 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -32,6 +32,7 @@ let "8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg"; "8.10.1" = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4"; "8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz"; + "8.11+beta1" = "06dlxj6v7gd51dh6ir121z7lgqdagkq717xxxrc8bdqhz7d2z7qj"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6343d4929d..a4830a7d0d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23882,6 +23882,7 @@ in coqPackages_8_8 coq_8_8 coqPackages_8_9 coq_8_9 coqPackages_8_10 coq_8_10 + coqPackages_8_11 coq_8_11 coqPackages coq ; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 2cc1750c464..3fa3d30aa94 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -130,6 +130,9 @@ in rec { coq_8_10 = callPackage ../applications/science/logic/coq { version = "8.10.2"; }; + coq_8_11 = callPackage ../applications/science/logic/coq { + version = "8.11+beta1"; + }; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; @@ -137,6 +140,7 @@ in rec { coqPackages_8_8 = mkCoqPackages coq_8_8; coqPackages_8_9 = mkCoqPackages coq_8_9; coqPackages_8_10 = mkCoqPackages coq_8_10; + coqPackages_8_11 = mkCoqPackages coq_8_11; coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute coqPackages_8_9 ); From 61b7d24d916dba83f777f694a222411b82b9498c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 7 Dec 2019 22:56:19 -0500 Subject: [PATCH 007/113] nextcloud-client: disable shibboleth Allows to remove qtwebkit dependency --- pkgs/applications/networking/nextcloud-client/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 974d1e5a077..71fce57504c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -12,7 +12,6 @@ , qtkeychain , qttools , qtwebengine -, qtwebkit , sqlite }: @@ -45,7 +44,6 @@ mkDerivation rec { qtkeychain qttools qtwebengine - qtwebkit sqlite ]; @@ -55,6 +53,7 @@ mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH + "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit ]; meta = with lib; { From dd04fdd4d120254605b558ac66f68a8c5c5af696 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sun, 8 Dec 2019 16:21:35 +0100 Subject: [PATCH 008/113] openapi-generator-cli: 4.2.1 -> 4.2.2 --- pkgs/tools/networking/openapi-generator-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 9429dee64bd..1cb8e02130f 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.2.1"; + version = "4.2.2"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "1inkiqbr183ksmkvpawagv1gqgc323wa1d6sdrd33pb9lk6wahdl"; + sha256 = "1pafv432ll3pp52580pbnk0gnrm6byl5fkrf1rarhxfkpkr82yif"; }; phases = [ "installPhase" ]; From a75e475ed44d40c7b2f994cc922874256f03f3d2 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 8 Dec 2019 23:26:10 +0200 Subject: [PATCH 009/113] strace: 5.3 -> 5.4 --- pkgs/development/tools/misc/strace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 4f71d5ae410..2ecabb68670 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "0ix06z4vnc49mv76f22kixz8dsh7daqv9mpgwcgl0mlnfjc124vc"; + sha256 = "0hd7sb7l99y9rcj8jjc1b6m3ryds17krsymdg3dvd40jsla0bl7p"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://strace.io/; + homepage = "https://strace.io/"; description = "A system call tracer for Linux"; license = with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite platforms = platforms.linux; From 8ffb4ab81848ed535fce9868b7ab4e0a3947424a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 9 Dec 2019 13:18:39 +0100 Subject: [PATCH 010/113] mumble: add petabyteboy to maintainers --- pkgs/applications/networking/mumble/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index fe4c9f32b21..dfb49e14133 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -16,7 +16,8 @@ assert iceSupport -> zeroc-ice != null; with stdenv.lib; let generic = overrides: source: qt5.mkDerivation (source // overrides // { - name = "${overrides.type}-${source.version}"; + pname = overrides.type; + version = source.version; patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; @@ -63,9 +64,9 @@ let meta = { description = "Low-latency, high quality voice chat software"; - homepage = https://mumble.info; + homepage = "https://mumble.info"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ petabyteboy ]; platforms = platforms.linux; }; }); From be392b7c02ce273fb14206a3dd16034676c6fe69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 9 Dec 2019 13:18:57 +0100 Subject: [PATCH 011/113] mumble: build with pulseaudio support on linux Most users on Linux will want to have pulseaudio support in their mumble installations, and this way they don't have to recompile mumble with pulseaudio support. --- 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 4ad6d9346b3..b97f43b9ce8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20203,7 +20203,7 @@ in avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - pulseSupport = config.pulseaudio or false; + pulseSupport = config.pulseaudio or stdenv.isLinux; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { From ca9788d4de3ba787d670a94948efd1d3ed2977e6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 9 Dec 2019 14:11:24 +0100 Subject: [PATCH 012/113] nixos/sway: Enable the display manager integration If no display manager is enabled this will not make any difference, but if a Wayland compatible display manager like SDDM is enabled, a session for Sway will be available. Therefore it does make sense to enable this by default. This adds the display manager integration mentioned in #57602. --- nixos/modules/programs/sway.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index f92d09a7ef4..9a15c773463 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -87,6 +87,8 @@ in { hardware.opengl.enable = mkDefault true; fonts.enableDefaultFonts = mkDefault true; programs.dconf.enable = mkDefault true; + # To make a Sway session available if a display manager like SDDM is enabled: + services.xserver.displayManager.extraSessionFilePackages = [ swayJoined ]; }; meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ]; From 27ee40ae797da3a66a69535382b90ebfad370877 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 9 Dec 2019 14:37:52 +0100 Subject: [PATCH 013/113] range-v3: 0.9.1 -> 0.10.0 --- pkgs/development/libraries/range-v3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index f02093001e4..56c5754831e 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "range-v3"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; rev = version; - sha256 = "0qga2fnfrlrzrvnnk1z1plpmvcr8b4c75g5xz0jv0sav0kmq5zwn"; + sha256 = "1h9h5j7pdi0afpip9ncq76h1xjhvb8bnm585q17afz2l4fydy8qj"; }; nativeBuildInputs = [ cmake ]; From f95b93bba38c54bee38b11ed9dc09e8ce113dd9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Dec 2019 10:26:33 -0800 Subject: [PATCH 014/113] rabbitmq-server: 3.8.1 -> 3.8.2 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index bc83c5a8ea2..a25bf48f8dd 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.8.1"; + version = "3.8.2"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "17ymzjgz3544jgf321f8f788gdxs9l252ah61nlgsglv0x8gggrh"; + sha256 = "17gixahxass9n4d697my8sq4an51rw3cicb36fqvl8fbhnwjjrwc"; }; buildInputs = From 2b9fc07050c8dbbe8c5c642ae7ab8742274efaf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 10 Dec 2019 13:37:56 -0300 Subject: [PATCH 015/113] mate.atril: 1.22.2 -> 1.22.3 --- pkgs/desktops/mate/atril/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index f19114a5442..ecb9ea2e377 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atril"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11l78zkxszvsjr74cmk1wff5ycqrzd89y6k36rydv2rb5af2nsfw"; + sha256 = "06hmyw7fwdrdyl3n79b8qxlrwbzf240n82arzmlg62q9zxzdc0is"; }; nativeBuildInputs = [ From 9b2913b8544dd2f9b294ad9aa78c6a96e2e2a908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 10 Dec 2019 13:37:56 -0300 Subject: [PATCH 016/113] mate.marco: 1.22.3 -> 1.22.4 --- pkgs/desktops/mate/marco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 88dd9e79bc8..03461165633 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "marco"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0faiqj9i1mqqy1v4jdcwy8nsbkkvs0cwd2dqypgscmcqpbq7jf8a"; + sha256 = "0z8q4nwm43imbnbxz348ylgzfl25sknb19kml57d6z6flxws19k3"; }; nativeBuildInputs = [ From a24004fa383f7c01403cc45f165d787e57fac5ae Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 12 Dec 2019 07:22:37 -0500 Subject: [PATCH 017/113] nixos/lightdm-greeters/pantheon: show manual login card I find this important to be default on for users in https://github.com/elementary/greeter/issues/394 --- .../x11/display-managers/lightdm-greeters/pantheon.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 29cb6ccbc06..77c94114e6d 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -35,6 +35,9 @@ in name = "io.elementary.greeter"; }; + # Show manual login card. + services.xserver.displayManager.lightdm.extraSeatDefaults = "greeter-show-manual-login=true"; + environment.etc."lightdm/io.elementary.greeter.conf".source = "${pkgs.pantheon.elementary-greeter}/etc/lightdm/io.elementary.greeter.conf"; environment.etc."wingpanel.d/io.elementary.greeter.whitelist".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.whitelist"; From 6850842719d8bbe750a7a0263d241474edd24ea0 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 12 Dec 2019 10:08:08 -0400 Subject: [PATCH 018/113] chicken: fix chicken-4 evaluation broken by: 9b090ccbca3f7dd26d91db06e96e8bf8282c37ca --- pkgs/development/compilers/chicken/4/eggDerivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix index 16f9c413d4c..cd340c22174 100644 --- a/pkgs/development/compilers/chicken/4/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix @@ -8,7 +8,7 @@ let libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/"; overrides = import ./overrides.nix; - baseName = lib.getName name; + baseName = stdenv.lib.getName name; override = if builtins.hasAttr baseName overrides then builtins.getAttr baseName overrides From 2723d16a0f6032fd105b9d79dba7b8c853bd7ecf Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 12 Dec 2019 10:09:08 -0400 Subject: [PATCH 019/113] chicken: fix chicken-4 set -u regression --- pkgs/development/compilers/chicken/4/setup-hook.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/chicken/4/setup-hook.sh b/pkgs/development/compilers/chicken/4/setup-hook.sh index b0d9b53b537..661dc08c090 100644 --- a/pkgs/development/compilers/chicken/4/setup-hook.sh +++ b/pkgs/development/compilers/chicken/4/setup-hook.sh @@ -1,7 +1,6 @@ addChickenRepositoryPath() { addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_EXTRA "$1/lib/chicken/8/" - # addToSearchPathWithCustomDelimiter \; CHICKEN_INCLUDE_PATH "$1/share/" - export CHICKEN_INCLUDE_PATH="$1/share;$CHICKEN_INCLUDE_PATH" + export CHICKEN_INCLUDE_PATH="$1/share${CHICKEN_INCLUDE_PATH:+;$CHICKEN_INCLUDE_PATH}" } addEnvHooks "$targetOffset" addChickenRepositoryPath From ac08635414ab4ec526429fd484765a33f95c6b34 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 12 Dec 2019 10:09:50 -0400 Subject: [PATCH 020/113] chicken: remove parseDrvName from chicken-5 --- pkgs/development/compilers/chicken/5/eggDerivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index 3dc1c4afce9..8d4a62776d0 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -7,7 +7,7 @@ let overrides = import ./overrides.nix; - baseName = (builtins.parseDrvName name).name; + baseName = stdenv.lib.getName name; override = if builtins.hasAttr baseName overrides then builtins.getAttr baseName overrides From 02930180be7a6cd400c38a9db24690188f73e18f Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 12 Dec 2019 10:02:10 -0400 Subject: [PATCH 021/113] chicken: update eggs to latest Fixes #73650 --- pkgs/development/compilers/chicken/4/eggs.nix | 202 ++---------------- pkgs/development/compilers/chicken/5/eggs.nix | 6 +- 2 files changed, 25 insertions(+), 183 deletions(-) diff --git a/pkgs/development/compilers/chicken/4/eggs.nix b/pkgs/development/compilers/chicken/4/eggs.nix index 1f786f127c9..6e6f104f8a0 100644 --- a/pkgs/development/compilers/chicken/4/eggs.nix +++ b/pkgs/development/compilers/chicken/4/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, stdenv }: rec { inherit (pkgs) eggDerivation fetchegg; @@ -16,35 +16,6 @@ rec { ]; }; - blob-utils = eggDerivation { - name = "blob-utils-1.0.3"; - - src = fetchegg { - name = "blob-utils"; - version = "1.0.3"; - sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml"; - }; - - buildInputs = [ - setup-helper - string-utils - ]; - }; - - check-errors = eggDerivation { - name = "check-errors-1.13.0"; - - src = fetchegg { - name = "check-errors"; - version = "1.13.0"; - sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi"; - }; - - buildInputs = [ - setup-helper - ]; - }; - defstruct = eggDerivation { name = "defstruct-1.6"; @@ -60,31 +31,29 @@ rec { }; http-client = eggDerivation { - name = "http-client-0.7.1"; + name = "http-client-0.18"; src = fetchegg { name = "http-client"; - version = "0.7.1"; - sha256 = "1s03zgmb7kb99ld0f2ylqgicrab9qgza53fkgsqvg7bh5njmzhxr"; + version = "0.18"; + sha256 = "1b9x66kfcglld4xhm06vba00gw37vr07c859kj7lmwnk9nwhcplg"; }; buildInputs = [ intarweb uri-common - message-digest - md5 - string-utils + simple-md5 sendfile ]; }; intarweb = eggDerivation { - name = "intarweb-1.3"; + name = "intarweb-1.7"; src = fetchegg { name = "intarweb"; - version = "1.3"; - sha256 = "0izlby78c25py29bdcbc0vapb6h7xgchqrzi6i51d0rb3mnwy88h"; + version = "1.7"; + sha256 = "1arjgn5g4jfdzj3nlrhxk235qwf6k6jxr14yhnncnfbgdb820xp8"; }; buildInputs = [ @@ -94,92 +63,13 @@ rec { ]; }; - lookup-table = eggDerivation { - name = "lookup-table-1.13.5"; - - src = fetchegg { - name = "lookup-table"; - version = "1.13.5"; - sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb"; - }; - - buildInputs = [ - setup-helper - check-errors - miscmacros - record-variants - synch - ]; - }; - matchable = eggDerivation { - name = "matchable-3.3"; + name = "matchable-3.7"; src = fetchegg { name = "matchable"; - version = "3.3"; - sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990"; - }; - - buildInputs = [ - - ]; - }; - - md5 = eggDerivation { - name = "md5-3.1.0"; - - src = fetchegg { - name = "md5"; - version = "3.1.0"; - sha256 = "0bka43nx8x9b0b079qpvml2fl20km19ny0qjmhwzlh6rwmzazj2a"; - }; - - buildInputs = [ - message-digest - ]; - }; - - message-digest = eggDerivation { - name = "message-digest-3.1.0"; - - src = fetchegg { - name = "message-digest"; - version = "3.1.0"; - sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s"; - }; - - buildInputs = [ - setup-helper - miscmacros - check-errors - variable-item - blob-utils - string-utils - ]; - }; - - miscmacros = eggDerivation { - name = "miscmacros-2.96"; - - src = fetchegg { - name = "miscmacros"; - version = "2.96"; - sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc"; - }; - - buildInputs = [ - - ]; - }; - - record-variants = eggDerivation { - name = "record-variants-0.5.1"; - - src = fetchegg { - name = "record-variants"; - version = "0.5.1"; - sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h"; + version = "3.7"; + sha256 = "1vc9rpb44fhn0n91hzglin986dw9zj87fikvfrd7j308z22a41yh"; }; buildInputs = [ @@ -188,12 +78,12 @@ rec { }; sendfile = eggDerivation { - name = "sendfile-1.7.29"; + name = "sendfile-1.8.3"; src = fetchegg { name = "sendfile"; - version = "1.7.29"; - sha256 = "1dc02cbkx5kixhbqjy26g6gs680vy7krc9qis1p1v4aa0b2lgj7k"; + version = "1.8.3"; + sha256 = "036x4xdndx7qly94afnag5b9idd1yymdm8d832w2cy054y7lxqsi"; }; buildInputs = [ @@ -201,13 +91,13 @@ rec { ]; }; - setup-helper = eggDerivation { - name = "setup-helper-1.5.4"; + simple-md5 = eggDerivation { + name = "simple-md5-0.0.1"; src = fetchegg { - name = "setup-helper"; - version = "1.5.4"; - sha256 = "1k644y0md2isdcvazqfm4nyc8rh3dby6b0j3r4na4w8ryspqp6gj"; + name = "simple-md5"; + version = "0.0.1"; + sha256 = "1h0b51p9wl1dl3pzs39hdq3hk2qnjgn8n750bgmh0651g4lzmq3i"; }; buildInputs = [ @@ -215,38 +105,6 @@ rec { ]; }; - string-utils = eggDerivation { - name = "string-utils-1.2.4"; - - src = fetchegg { - name = "string-utils"; - version = "1.2.4"; - sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1"; - }; - - buildInputs = [ - setup-helper - miscmacros - lookup-table - check-errors - ]; - }; - - synch = eggDerivation { - name = "synch-2.1.2"; - - src = fetchegg { - name = "synch"; - version = "2.1.2"; - sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00"; - }; - - buildInputs = [ - setup-helper - check-errors - ]; - }; - uri-common = eggDerivation { name = "uri-common-1.4"; @@ -264,32 +122,16 @@ rec { }; uri-generic = eggDerivation { - name = "uri-generic-2.41"; + name = "uri-generic-2.46"; src = fetchegg { name = "uri-generic"; - version = "2.41"; - sha256 = "1r5jbzjllbnmhm5n0m3fcx0g6dc2c2jzp1dcndkfmxz0cl99zxac"; + version = "2.46"; + sha256 = "10ivf4xlmr6jcm00l2phq1y73hjv6g3qgr38ycc8rw56wv6sbm4g"; }; buildInputs = [ matchable - defstruct - ]; - }; - - variable-item = eggDerivation { - name = "variable-item-1.3.1"; - - src = fetchegg { - name = "variable-item"; - version = "1.3.1"; - sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n"; - }; - - buildInputs = [ - setup-helper - check-errors ]; }; } diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix index a8e3ee5976e..a35b1f05891 100644 --- a/pkgs/development/compilers/chicken/5/eggs.nix +++ b/pkgs/development/compilers/chicken/5/eggs.nix @@ -47,12 +47,12 @@ rec { }; srfi-13 = eggDerivation { - name = "srfi-13-0.2.1"; + name = "srfi-13-0.3"; src = fetchegg { name = "srfi-13"; - version = "0.2.1"; - sha256 = "0204i7fhc4dy0l89lbi2lv9cjndrvwyrk68z3wy7x445jb4ky1gq"; + version = "0.3"; + sha256 = "0yaw9i6zhpxl1794pirh168clprjgmsb0xlr96drirjzsslgm3zp"; }; buildInputs = [ From bbb9f053b4bb2cea956d1aa079d625c3061ed68e Mon Sep 17 00:00:00 2001 From: David Terry Date: Thu, 12 Dec 2019 15:39:46 +0100 Subject: [PATCH 022/113] wireguard-tools: 0.0.20191127 -> 0.0.20191212 --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index d5edb128cd5..b8297629ff7 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "0.0.20191127"; + version = "0.0.20191212"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1n1x5858c32p0a13rrhn9a491174k5z4wd0gsy8qn546k1a8qj99"; + sha256 = "1vyin3i4nqc4syri49jhjc4qm0qshpvgw7k4d3g5vlyskhdfv5q0"; }; sourceRoot = "source/src/tools"; From 7443d9dfd4d18f0307ca9f9ff3ba0eb36b2af2bd Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 9 Dec 2019 21:03:48 +0300 Subject: [PATCH 023/113] nixos/unit: enable sanboxing --- .../services/web-servers/unit/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index 32f6d475b34..2c5639b99f9 100644 --- a/nixos/modules/services/web-servers/unit/default.nix +++ b/nixos/modules/services/web-servers/unit/default.nix @@ -85,7 +85,7 @@ in { systemd.tmpfiles.rules = [ "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -" "d '${cfg.logDir}' 0750 ${cfg.user} ${cfg.group} - -" - ]; + ]; systemd.services.unit = { description = "Unit App Server"; @@ -99,17 +99,33 @@ in { curl -X PUT --data-binary '@${configFile}' --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config' ''; serviceConfig = { - User = cfg.user; - Group = cfg.group; - AmbientCapabilities = "CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID"; - CapabilityBoundingSet = "CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID"; ExecStart = '' ${cfg.package}/bin/unitd --control 'unix:/run/unit/control.unit.sock' --pid '/run/unit/unit.pid' \ --log '${cfg.logDir}/unit.log' --state '${cfg.stateDir}' --no-daemon \ --user ${cfg.user} --group ${cfg.group} ''; + # User and group + User = cfg.user; + Group = cfg.group; + # Capabilities + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" ]; + # Security + NoNewPrivileges = true; + # Sanboxing + ProtectSystem = "full"; + ProtectHome = true; RuntimeDirectory = "unit"; RuntimeDirectoryMode = "0750"; + PrivateTmp = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + PrivateMounts = true; }; }; From e1e0059667ecd406d4c72b692871ae557fe42312 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 10 Dec 2019 09:49:58 +0300 Subject: [PATCH 024/113] nixos/unit: update preStart script --- nixos/modules/services/web-servers/unit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index 2c5639b99f9..b07212580a5 100644 --- a/nixos/modules/services/web-servers/unit/default.nix +++ b/nixos/modules/services/web-servers/unit/default.nix @@ -93,7 +93,7 @@ in { wantedBy = [ "multi-user.target" ]; path = with pkgs; [ curl ]; preStart = '' - test -f '/run/unit/control.unit.sock' || rm -f '/run/unit/control.unit.sock' + test -f '${cfg.stateDir}/conf.json' || rm -f '${cfg.stateDir}/conf.json' ''; postStart = '' curl -X PUT --data-binary '@${configFile}' --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config' From a552a7d5cf64c1ccb430905697acfd00eb2fae00 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 12 Dec 2019 22:23:33 +0100 Subject: [PATCH 025/113] vscodium: 1.40.1 -> 1.41.0 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 2ecb979ac4b..310d839088d 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "01mblkwq3qnj70rwizv408x6sc0jg4wav44p9z3cmzcf9prpm2gs"; - x86_64-darwin = "1lvh735vddz65l1ahbl66k04rck36lpvp1n3z3hrk0mjn451ga6v"; + x86_64-linux = "1njxa19mzzydz1jacghwmha3dl4a13m9xzzwsb0rbks5zc9a0v7m"; + x86_64-darwin = "0cpd87q0q3i172l4s43s79by42wa9k5pyik3v2z5mq8zpms8qcq4"; }.${system}; sourceRoot = { @@ -23,7 +23,7 @@ in callPackage ./generic.nix rec { inherit sourceRoot; - version = "1.40.1"; + version = "1.41.0"; pname = "vscodium"; executableName = "codium"; From 76c69056bdaa8f3e826b659a2688ce6e0206a493 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 Dec 2019 00:00:00 -0500 Subject: [PATCH 026/113] gitAndTools.lab: 0.17.0 -> 0.17.1 --- .../version-management/git-and-tools/lab/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index d31381eff68..c8700c18ea1 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,18 +2,20 @@ buildGoModule rec { pname = "lab"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "1p8q21k8p1zw1g4fn6f7b80r3wziywbm1av1vg7hc8w1rfqj51wp"; + sha256 = "1z83v1dl9c5f99jvvc23ijkwrfrv489la05rlsrc3r4zzza1hx1f"; }; subPackages = [ "." ]; - modSha256 = "1cwj7p03j2bglj379h4hb25kxayx07msz0mnqwwbjv5i3zkc6kkg"; + modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" From 7cbdbabb4e6fcc102491ff93fcfe6383069f0bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 13 Dec 2019 07:30:49 +0100 Subject: [PATCH 027/113] gnome3.gnome-shell: 3.34.1 -> 3.34.2 https://gitlab.gnome.org/GNOME/gnome-shell/blob/3.34.2/NEWS --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index e8d5b7dbffd..e2d14ffcd26 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07kd7wdk12nba33jfr44xqdlryiy86wgvsyjs8cw55y8p5cnbn6c"; + sha256 = "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh"; }; LANG = "en_US.UTF-8"; From 39634ac2b852764946532e7511c58d6b70d87960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 13 Dec 2019 07:34:06 +0100 Subject: [PATCH 028/113] gnome3.mutter: 3.34.1 -> 3.34.2 https://gitlab.gnome.org/GNOME/mutter/blob/3.34.2/NEWS --- pkgs/desktops/gnome-3/core/mutter/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 63136d95f81..61024788f15 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.34.1"; + version = "3.34.2"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13kmmgg2zizr0522clwc2zn3bkwbir503b1wjiiixf5xi37jc65s"; + sha256 = "0b8bz5kvs7rlwvqsg87cf6jhrrj95vgd1l235mjx8rip35ipfvrd"; }; mesonFlags = [ @@ -105,17 +105,6 @@ stdenv.mkDerivation rec { ]; patches = [ - # Fixes from gnome-3-34 branch 2019-11-29. - (fetchpatch { - name = "gnome-3-34-2019-11-29.patch"; - url = "https://github.com/GNOME/mutter/compare/3.34.1...c0e76186da5b7baf7c8804c0ffa80232a5a6bf98.patch"; - excludes = [ - ".gitlab-ci.yml" - ".gitlab-ci/checkout-gnome-shell.sh" - ]; - sha256 = "1qmxic83bd3dvg6isipqy8jaaksd7p5s3cb7h44zinq738n8d0fb"; - }) - # Fix build with libglvnd provided headers (fetchpatch { url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch"; From 0101712a5b46746882578865630fa5ccc9f9946d Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Fri, 13 Dec 2019 09:24:52 +0100 Subject: [PATCH 029/113] conmon: v2.0.6 -> v2.0.7 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/conmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index fdeb913c564..a2afd938d66 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { project = "conmon"; name = "${project}-${version}"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "containers"; repo = project; rev = "v${version}"; - sha256 = "0h0cfpay296pbz0912aifhbq6g6imarpa22rkm8fdipwkqhhdidz"; + sha256 = "1sfh94a1if907kky0wlqz188v6kfdl6v1i34pikpxjllngxzyfr9"; }; nativeBuildInputs = [ pkgconfig ]; From ad9b68ca0403a804e3acab7b42561e78794cc07a Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 1 Nov 2019 13:23:14 +0100 Subject: [PATCH 030/113] bitcoin: install desktop file and pixmaps --- pkgs/applications/blockchains/bitcoin.nix | 24 +++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index f3804db48b9..2fa8ea6467c 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -3,9 +3,24 @@ , withGui }: with stdenv.lib; -stdenv.mkDerivation rec{ - pname = if withGui then "bitcoin" else "bitcoind"; + +let version = "0.19.0.1"; + majorMinorVersion = versions.majorMinor version; + + desktop = fetchurl { + url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop"; + sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha"; + }; + + pixmap = fetchurl { + url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"; + sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d"; + }; + +in stdenv.mkDerivation rec { + pname = if withGui then "bitcoin" else "bitcoind"; + inherit version; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" @@ -22,6 +37,11 @@ stdenv.mkDerivation rec{ ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qtbase qttools qrencode ]; + postInstall = optional withGui '' + install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop + install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png + ''; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" ] ++ optionals (!doCheck) [ From 7f2e8f6367043ba22edf37a2d417faa2e7c591a5 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Fri, 13 Dec 2019 09:47:13 +0100 Subject: [PATCH 031/113] pythonPackages.aws-adfs: 1.19.1 -> 1.20.0; fix build --- pkgs/development/python-modules/aws-adfs/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 428ac495941..0c16480e9c4 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -1,13 +1,15 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: +, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3 +, requests, click, configparser, fido2, isPy27 }: buildPythonPackage rec { pname = "aws-adfs"; - version = "1.19.1"; + version = "1.20.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "20b2ad44d19aa494fa11cb2d1290359b3a7a0c6c8908179b4af0c9367d83e370"; + sha256 = "1j18ffq5z8bcajavnlpbfhxrcadld5iv5gsfxg543yvdsp6hn2dg"; }; # Relax version constraint @@ -22,7 +24,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; - propagatedBuildInputs = [ lxml boto3 requests click configparser ]; + propagatedBuildInputs = [ lxml boto3 requests click configparser fido2 ]; meta = with lib; { description = "Command line tool to ease aws cli authentication against ADFS"; From fcaaffedefeefb4839cda989968a7457b280995c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= <65870+suhr@users.noreply.github.com> Date: Fri, 13 Dec 2019 15:21:09 +0300 Subject: [PATCH 032/113] cue: 0.0.14 -> 0.0.15 --- pkgs/development/tools/cue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 2046ea90fd1..98bf5249b62 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "cue"; - version = "0.0.14"; + version = "0.0.15"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "1gbw377wm41bhn9pw0l5l7v6g5s9jw1p2jammflac7hgwdrxkb64"; + sha256 = "0mipzci2zjp6yh4lxg9jrdxn03ska188zg3jl6g1zr8rn0ry274h"; }; modSha256 = "04dapx75zwi8cv1pj3c6266znrhwihv3df4izm3gjk34r2i07q6s"; From 185cf2cf0d800d32cb282dcd5917e50b948882e0 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 13 Dec 2019 13:50:17 +0100 Subject: [PATCH 033/113] tig: 2.4.1 -> 2.5.0 Signed-off-by: Matthias Beyer --- .../version-management/git-and-tools/tig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 59354598d00..f8f0a6402d8 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd"; + sha256 = "1lrzgnq8ywq28qd4xyd0y5qfv3j25ra81lcbdqqfywasl8lwz3lf"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; From 8d5e90bdb32c7f8708a5b75eaaca00551e2f1d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 13 Dec 2019 14:07:43 +0100 Subject: [PATCH 034/113] vscode: 1.40.1 -> 1.41.0 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index f914c90dd79..9abee88d8b0 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1zxj1vav7swjmvvgcn1y61figjhqrczf8d16rk6yayja1pfjgvs5"; - x86_64-darwin = "0f6ck40rkngzcm5xih1rbwpz905r533n2z08maycgf4iajgwrn43"; + x86_64-linux = "1ziw2b851kg17jaf713nwhsv5ikbvivq3h01xximhcglv9vzk93l"; + x86_64-darwin = "0nndasa130551jf06mfrym593c02c3ypgg9f9rdg1fw5qbyjb8hm"; }.${system}; in callPackage ./generic.nix rec { - version = "1.40.1"; + version = "1.41.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 00875c07354b19d82a07d21806bb28cd808a9297 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 13 Dec 2019 08:28:26 -0500 Subject: [PATCH 035/113] linux: 4.19.88 -> 4.19.89 --- 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 a81f24ae934..8ac7e720a37 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.88"; + version = "4.19.89"; # 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 = "1gizkdmq46ykw7ya3hibd6lalww2kvsia346pq3xvrk6s5mkp4n1"; + sha256 = "0ijx8ih91p4g95zpwz6ga3q2x9lf1948xf2v5mz4348byf5hdwv8"; }; } // (args.argsOverride or {})) From b7c613e3e6bb06fa55f58c77dc16e370cdbb1486 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 13 Dec 2019 08:28:57 -0500 Subject: [PATCH 036/113] linux: 5.3.15 -> 5.3.16 --- pkgs/os-specific/linux/kernel/linux-5.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix index e5c3b29ed42..d384ae67587 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3.15"; + version = "5.3.16"; # 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 = "15qidl06lyfylx1b43b4wz2zfkr4000bkr7ialslmb7yi7mamj6f"; + sha256 = "19asdv08rzp33f0zxa2swsfnbhy4zwg06agj7sdnfy4wfkrfwx49"; }; } // (args.argsOverride or {})) From 4974c6fd23787c36094427b11dba554cc035b545 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 13 Dec 2019 08:29:19 -0500 Subject: [PATCH 037/113] linux: 5.4.2 -> 5.4.3 --- 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 cfeeabc4697..ea332a246b3 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.2"; + version = "5.4.3"; # 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 = "0mx50cp61kajya3lfcksw7wksq7ihkqzrzszf4bb19kwhxb85y9j"; + sha256 = "0lgfg31pgvdhkh9y4y4yh075mlk3qa6npxp7n19yxcg168pnhcb7"; }; } // (args.argsOverride or {})) From e9767b9ad2078b72143fc1a86ff53f7c2b60fa06 Mon Sep 17 00:00:00 2001 From: Kirill Strukov Date: Fri, 13 Dec 2019 18:19:39 +0300 Subject: [PATCH 038/113] add novox maintainer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 02ebefa1a0f..b23e1614915 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4679,6 +4679,12 @@ githubId = 2946283; name = "Brian Cohen"; }; + novoxudonoser = { + email = "radnovox@gmail.com"; + github = "novoxudonoser"; + githubId = 6052922; + name = "Kirill Struokov"; + }; np = { email = "np.nix@nicolaspouillard.fr"; github = "np"; From c2cf629a20c907bcbac0d557944db29fddf087d2 Mon Sep 17 00:00:00 2001 From: Kirill Strukov Date: Fri, 13 Dec 2019 18:26:17 +0300 Subject: [PATCH 039/113] dupeguru: init at 4.0.4 --- pkgs/applications/misc/dupeguru/default.nix | 62 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/misc/dupeguru/default.nix diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix new file mode 100644 index 00000000000..0e7155f374d --- /dev/null +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -0,0 +1,62 @@ +{stdenv, python3Packages, gettext, qt5, fetchFromGitHub}: + +python3Packages.buildPythonApplication rec { + pname = "dupeguru"; + version = "4.0.4"; + + format = "other"; + + src = fetchFromGitHub { + owner = "arsenetar"; + repo = "dupeguru"; + rev = "${version}"; + sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + gettext + python3Packages.pyqt5 + qt5.wrapQtAppsHook + ]; + + pythonPath = with python3Packages; [ + pyqt5 + send2trash + sphinx + polib + hsaudiotag3k + ]; + + makeFlags = [ + "PREFIX=${placeholder ''out''}" + "NO_VENV=1" + ]; + + # TODO: package pytest-monkeyplus for running tests + # https://github.com/NixOS/nixpkgs/pull/75054/files#r357690123 + doCheck = false; + + # Avoid double wrapping Python programs. + dontWrapQtApps = true; + + preFixup = '' + # TODO: A bug in python wrapper + # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916 + makeWrapperArgs="''${qtWrapperArgs[@]}" + ''; + + postFixup = '' + # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py + # so wrapPythonPrograms hook does not handle it automatically. + wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath" + ''; + + meta = with stdenv.lib; { + description = "GUI tool to find duplicate files in a system"; + homepage = "https://github.com/arsenetar/dupeguru"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.novoxudonoser ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67a338e5a79..ccd69f5568a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -215,6 +215,8 @@ in dispad = callPackage ../tools/X11/dispad { }; + dupeguru = callPackage ../applications/misc/dupeguru { }; + dump1090 = callPackage ../applications/radio/dump1090 { }; ebook2cw = callPackage ../applications/radio/ebook2cw { }; From 919297f369c77e35b82290aaf34558b484be20b7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 13 Dec 2019 17:16:59 +0100 Subject: [PATCH 040/113] nixosTests.xmonad: fix --- nixos/tests/xmonad.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index c2e5ba60d7b..ab3888ca43f 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -27,13 +27,13 @@ import ./make-test-python.nix ({ pkgs, ...} : { machine.wait_for_x() machine.wait_for_file("${user.home}/.Xauthority") machine.succeed("xauth merge ${user.home}/.Xauthority") - machine.send_chars("alt-ctrl-x") + machine.send_key("alt-ctrl-x") machine.wait_for_window("${user.name}.*machine") machine.sleep(1) machine.screenshot("terminal") machine.wait_until_succeeds("xmonad --restart") machine.sleep(3) - machine.send_chars("alt-shift-ret") + machine.send_key("alt-shift-ret") machine.wait_for_window("${user.name}.*machine") machine.sleep(1) machine.screenshot("terminal") From ed0562c308e5d12abcc3bc58dbe66ddb80fe7f14 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Fri, 13 Dec 2019 08:34:14 -0800 Subject: [PATCH 041/113] Added softinio to maintainers list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6e3e1b5dbfe..aa0423560c2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6391,6 +6391,12 @@ githubId = 1437166; name = "Xia Bin"; }; + softinio = { + email = "code@softinio.com"; + github = "softinio"; + githubId = 3371635; + name = "Salar Rahmanian"; + }; solson = { email = "scott@solson.me"; github = "solson"; From 7406c0af9820b0734ad13421a8033fb9458c110b Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sat, 12 Oct 2019 21:35:11 +0200 Subject: [PATCH 042/113] services.xserver.imwheel: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/x11/imwheel.nix | 68 ++++++++++++++++++++++++++ pkgs/tools/X11/imwheel/default.nix | 13 +++-- 3 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 nixos/modules/services/x11/imwheel.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bb217d873bb..e577ea9ab05 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -866,6 +866,7 @@ ./services/x11/hardware/digimend.nix ./services/x11/hardware/cmt.nix ./services/x11/gdk-pixbuf.nix + ./services/x11/imwheel.nix ./services/x11/redshift.nix ./services/x11/urxvtd.nix ./services/x11/window-managers/awesome.nix diff --git a/nixos/modules/services/x11/imwheel.nix b/nixos/modules/services/x11/imwheel.nix new file mode 100644 index 00000000000..871f8851a7e --- /dev/null +++ b/nixos/modules/services/x11/imwheel.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.xserver.imwheel; +in + { + options = { + services.xserver.imwheel = { + enable = mkEnableOption "IMWheel service"; + + extraOptions = mkOption { + type = types.listOf types.str; + default = [ "--buttons 45" ]; + example = [ "--debug" ]; + description = '' + Additional command-line arguments to pass to + imwheel. + ''; + }; + + rules = mkOption { + type = types.attrsOf types.str; + default = {}; + example = literalExample '' + ".*" = ''' + None, Up, Button4, 8 + None, Down, Button5, 8 + Shift_L, Up, Shift_L|Button4, 4 + Shift_L, Down, Shift_L|Button5, 4 + Control_L, Up, Control_L|Button4 + Control_L, Down, Control_L|Button5 + '''; + ''; + description = '' + Window class translation rules. + /etc/X11/imwheelrc is generated based on this config + which means this config is global for all users. + See offical man pages + for more informations. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.imwheel ]; + + environment.etc."X11/imwheel/imwheelrc".source = + pkgs.writeText "imwheelrc" (concatStringsSep "\n\n" + (mapAttrsToList + (rule: conf: "\"${rule}\"\n${conf}") cfg.rules + )); + + systemd.user.services.imwheel = { + description = "imwheel service"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = "${pkgs.imwheel}/bin/imwheel " + escapeShellArgs ([ + "--detach" + "--kill" + ] ++ cfg.extraOptions); + ExecStop = "${pkgs.procps}/bin/pkill imwheel"; + Restart = "on-failure"; + }; + }; + }; + } diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/tools/X11/imwheel/default.nix index f33e15e59cc..efed00f9639 100644 --- a/pkgs/tools/X11/imwheel/default.nix +++ b/pkgs/tools/X11/imwheel/default.nix @@ -10,10 +10,15 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXext libXi libXmu libXt libXtst ]; - postPatch = '' - substituteInPlace Makefile.in --replace "ETCDIR = " "ETCDIR = $out" - substituteInPlace util.c --replace "/etc/X11/imwheel" "$out/etc/X11/imwheel" - ''; + makeFlags = [ + "sysconfdir=/etc" + "ETCDIR=/etc" + ]; + + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + "ETCDIR=${placeholder "out"}/etc" + ]; meta = with stdenv.lib; { homepage = "http://imwheel.sourceforge.net/"; From c644c7578df9623a0589f19eb55331655b209c27 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 13 Dec 2019 13:14:35 -0500 Subject: [PATCH 043/113] texlive.bin.dvipng: fix "Fatal error, PK file ends prematurely" Closes: #75605 --- pkgs/tools/typesetting/tex/texlive/bin.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index d251d55c9f5..2b26d9462bf 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -302,6 +302,15 @@ dvipng = stdenv.mkDerivation { nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; + patches = [ + (fetchpatch { + url = "http://git.savannah.nongnu.org/cgit/dvipng.git/patch/?id=f3ff241827a587e3d39eda477041fd3280f5b245"; + sha256 = "1a0ixl9mga24p6xk8dy3v60yifvbzd27vs0hv8996rfkp8jqa7is"; + stripLen = 1; + extraPrefix = "texk/dvipng/dvipng-src/"; + }) + ]; + preConfigure = '' cd texk/dvipng patchShebangs doc/texi2pod.pl From fca98ea5be372f788e51a1973a7a58c79a1cbbb2 Mon Sep 17 00:00:00 2001 From: cap Date: Tue, 10 Dec 2019 20:33:22 +0100 Subject: [PATCH 044/113] tor-browser-bundle-bin: 9.0.1 -> 9.0.2 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 0494de83708..28de1c90115 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -93,19 +93,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.0.1"; + version = "9.0.2"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "09iasj13wn3d1dygpxn4www4rx8wnxxlm9h6df9lzf4wll15px55"; + sha256 = "1xdnqphsj7wzwyv927jwd3fi36srx0minydwl5jg5yyd3m3if9hb"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1vz3pvqi114c9lkyhqy754ngi90708c187xwiyr9786ff89sjw5i"; + sha256 = "1qk9fg5dvyyvbngsqla00by8a974mpvq9pnm2djif54lr2nfivwf"; }; }; in From 6a958bdd7b95066bf2ae70e784ea612ca4deef44 Mon Sep 17 00:00:00 2001 From: cap Date: Tue, 10 Dec 2019 20:46:41 +0100 Subject: [PATCH 045/113] maintainers: add cap --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e47fa02e5f2..36ffc2f029e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1110,6 +1110,12 @@ githubId = 5555066; name = "Andrew Cann"; }; + cap = { + name = "cap"; + email = "nixos_xasenw9@digitalpostkasten.de"; + github = "scaredmushroom"; + githubId = 45340040; + }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; From e99248632e4c52067c961d347e00a45be70693d4 Mon Sep 17 00:00:00 2001 From: cap Date: Fri, 13 Dec 2019 20:20:52 +0100 Subject: [PATCH 046/113] tor-browser-bundle-bin: add cap to maintainers --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 28de1c90115..ff87e6b703d 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -397,7 +397,7 @@ stdenv.mkDerivation rec { longDescription = tor-browser-bundle.meta.longDescription; homepage = "https://www.torproject.org/"; platforms = attrNames srcs; - maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 ]; + maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap ]; hydraPlatforms = []; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain From 6a800927bbd97c606b3c0096cab9c218d652cc6f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 13 Dec 2019 20:29:16 +0100 Subject: [PATCH 047/113] pybrial: 1.2.3 -> 1.2.5, directly use the brial src The pybrial package is a bit awkward. It doesn't have its own top-level attribute, since it has a cyclic dependency with sage. That's one of the reasons why it rarely gets updated. Its distributed along with brial, so its best to keep the versions synchronized. The easiest way to do this is to just re-use the source of brial. --- pkgs/applications/science/math/sage/pybrial.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix index 092a340bb5b..718414126ae 100644 --- a/pkgs/applications/science/math/sage/pybrial.nix +++ b/pkgs/applications/science/math/sage/pybrial.nix @@ -1,6 +1,7 @@ { stdenv , fetchFromGitHub , buildPythonPackage +, brial }: # This has a cyclic dependency with sage. I don't include sage in the # buildInputs and let python figure it out at runtime. Because of this, @@ -9,15 +10,10 @@ # it). buildPythonPackage rec { pname = "pyBRiAl"; - version = "1.2.3"; + version = brial.version; # included with BRiAl source - src = fetchFromGitHub { - owner = "BRiAl"; - repo = "BRiAl"; - rev = version; - sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg"; - }; + src = brial.src; sourceRoot = "source/sage-brial"; From 135081a53821ff49f5dc93b24dba585dd867a78a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 13 Dec 2019 20:31:31 +0100 Subject: [PATCH 048/113] brial: 1.2.5 -> 1.2.6 Motivation is mostly https://github.com/BRiAl/BRiAl/pull/37, which is a pre-requiste for getting the sage tests to pass with python3. --- pkgs/development/libraries/science/math/brial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index f08f6425655..56a78b00cd6 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.5"; + version = "1.2.6"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "1nv56fp3brpzanxj7vwvxqdafqfsfhdgq5imr3m94psw5gdfqwja"; + sha256 = "1mc1zjr3mxcx6bg0js5k9jx65japg7644b0aj1al75m4nwh2ygab"; }; # FIXME package boost-test and enable checks From c01e7b9703d3e936a636034cb12268a5033582e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2019 10:44:21 +0100 Subject: [PATCH 049/113] LTS Haskell 14.17 --- .../configuration-hackage2nix.yaml | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 48263695f46..c21f473bfda 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.16 + # LTS Haskell 14.17 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -176,7 +176,7 @@ default-package-overrides: - bencoding ==0.4.5.2 - between ==0.11.0.0 - bibtex ==0.1.0.6 - - bifunctors ==5.5.5 + - bifunctors ==5.5.6 - bimap ==0.4.0 - bimap-server ==0.1.0.1 - binary-bits ==0.5 @@ -222,7 +222,7 @@ default-package-overrides: - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 - - boolean-normal-forms ==0.0.1 + - boolean-normal-forms ==0.0.1.1 - boolsimplifier ==0.1.8 - boots ==0.0.100 - bordacount ==0.1.0.0 @@ -267,7 +267,7 @@ default-package-overrides: - cabal-doctest ==1.0.8 - cabal-file-th ==0.2.6 - cabal-rpm ==1.0.1 - - cache ==0.1.1.2 + - cache ==0.1.2.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - call-stack ==0.1.0 @@ -326,7 +326,7 @@ default-package-overrides: - classy-prelude ==1.5.0 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 - - clay ==0.13.2 + - clay ==0.13.3 - clientsession ==0.9.1.2 - Clipboard ==2.3.2.0 - clock ==0.8 @@ -355,7 +355,7 @@ default-package-overrides: - comfort-array ==0.4 - comfort-graph ==0.0.3.1 - commutative ==0.0.2 - - comonad ==5.0.5 + - comonad ==5.0.6 - compact ==0.1.0.1 - compactmap ==0.1.4.2.1 - compensated ==0.7.3 @@ -512,7 +512,7 @@ default-package-overrides: - dependent-sum-template ==0.0.0.6 - deque ==0.4.3 - deriveJsonNoPrefix ==0.1.0.1 - - deriving-compat ==0.5.7 + - deriving-compat ==0.5.8 - derulo ==1.0.7 - detour-via-sci ==1.0.0 - dhall ==1.24.0 @@ -684,7 +684,7 @@ default-package-overrides: - fixed-vector-hetero ==0.5.0.0 - flac ==0.2.0 - flac-picture ==0.1.2 - - flags-applicative ==0.1.0.1 + - flags-applicative ==0.1.0.2 - flat-mcmc ==1.5.0 - flay ==0.4 - flexible-defaults ==0.0.3 @@ -707,11 +707,11 @@ default-package-overrides: - force-layout ==0.4.0.6 - foreign-store ==0.2 - forkable-monad ==0.2.0.3 - - forma ==1.1.2 + - forma ==1.1.3 - format-numbers ==0.1.0.0 - formatting ==6.3.7 - foundation ==0.0.25 - - free ==5.1.2 + - free ==5.1.3 - freenect ==1.2.1 - freer-simple ==1.2.1.1 - freetype2 ==0.1.2 @@ -770,7 +770,7 @@ default-package-overrides: - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-exactprint ==0.6.1 - - ghcid ==0.7.6 + - ghcid ==0.7.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - ghc-lib ==8.8.0.20190424 @@ -854,7 +854,7 @@ default-package-overrides: - HandsomeSoup ==0.4.2 - hapistrano ==0.3.10.0 - happy ==1.19.12 - - hasbolt ==0.1.3.5 + - hasbolt ==0.1.3.6 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 @@ -875,7 +875,7 @@ default-package-overrides: - haskell-src-meta ==0.8.3 - haskey-btree ==0.3.0.1 - haskintex ==0.8.0.0 - - haskoin-core ==0.9.6 + - haskoin-core ==0.9.7 - hasql ==1.4.0.1 - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.1 @@ -895,7 +895,7 @@ default-package-overrides: - hedgehog ==1.0.1 - hedgehog-corpus ==0.1.0 - hedgehog-fn ==1.0 - - hedis ==0.12.9 + - hedis ==0.12.10 - hedn ==0.2.0.1 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -929,7 +929,7 @@ default-package-overrides: - hmpfr ==0.4.4 - hoauth2 ==1.8.9 - Hoed ==0.5.1 - - hOpenPGP ==2.8.4 + - hOpenPGP ==2.8.5 - hopenpgp-tools ==0.21.3 - hopfli ==0.2.2.1 - hosc ==0.17 @@ -1028,7 +1028,7 @@ default-package-overrides: - hvect ==0.4.0.0 - hvega ==0.3.0.1 - hw-balancedparens ==0.2.0.4 - - hw-bits ==0.7.0.8 + - hw-bits ==0.7.1.0 - hw-conduit ==0.2.0.6 - hw-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.7 @@ -1049,7 +1049,7 @@ default-package-overrides: - hw-parser ==0.1.0.2 - hw-prim ==0.6.2.39 - hw-rankselect ==0.13.0.0 - - hw-rankselect-base ==0.3.2.3 + - hw-rankselect-base ==0.3.3.0 - hw-simd ==0.1.1.5 - hw-streams ==0.0.0.12 - hw-string-parse ==0.0.0.4 @@ -1087,7 +1087,7 @@ default-package-overrides: - indexed ==0.1.3 - indexed-list-literals ==0.2.1.2 - infer-license ==0.2.0 - - inflections ==0.4.0.4 + - inflections ==0.4.0.5 - influxdb ==1.7.1.1 - ini ==0.4.1 - inj ==1.0 @@ -1124,7 +1124,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.1.0 - ip ==1.5.1 - ip6addr ==1.0.0 - - iproute ==1.7.7 + - iproute ==1.7.8 - IPv6Addr ==1.1.2 - ipynb ==0.1 - ipython-kernel ==0.10.1.0 @@ -1228,14 +1228,14 @@ default-package-overrides: - LibZip ==1.0.1 - lifted-async ==0.10.0.4 - lifted-base ==0.2.3.12 - - lift-generics ==0.1.2 + - lift-generics ==0.1.3 - line ==4.0.1 - linear ==1.20.9 - linear-circuit ==0.1.0.2 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.6.2 + - ListLike ==4.6.3 - listsafe ==0.1.0.1 - list-t ==1.0.4 - ListTree ==0.2.3 @@ -1278,7 +1278,7 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.4.3.0 + - massiv ==0.4.4.0 - massiv-io ==0.1.9.0 - massiv-test ==0.1.1 - mathexpr ==0.3.0.0 @@ -1297,7 +1297,7 @@ default-package-overrides: - megaparsec-tests ==7.0.5 - mega-sdist ==0.4.0.1 - memory ==0.14.18 - - MemoTrie ==0.6.9 + - MemoTrie ==0.6.10 - menshen ==0.0.3 - mercury-api ==0.1.0.2 - merkle-tree ==0.1.1 @@ -1348,10 +1348,10 @@ default-package-overrides: - monad-extras ==0.6.0 - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - - monad-logger ==0.3.30 + - monad-logger ==0.3.31 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.11 - - monad-logger-syslog ==0.1.5.0 + - monad-logger-syslog ==0.1.6.0 - monad-loops ==0.4.3 - monad-memo ==0.5.1 - monad-metrics ==0.2.1.4 @@ -1412,7 +1412,7 @@ default-package-overrides: - natural-sort ==0.1.2 - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - - neat-interpolation ==0.3.2.4 + - neat-interpolation ==0.3.2.5 - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.1 - netlib-ffi ==0.1.1 @@ -1426,7 +1426,7 @@ default-package-overrides: - network-anonymous-i2p ==0.10.0 - network-attoparsec ==0.12.2 - network-bsd ==2.8.0.0 - - network-byte-order ==0.1.1.1 + - network-byte-order ==0.1.2.0 - network-conduit-tls ==1.3.2 - network-house ==0.1.0.2 - network-info ==0.2.0.10 @@ -1486,7 +1486,7 @@ default-package-overrides: - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 - - OpenGLRaw ==3.3.3.0 + - OpenGLRaw ==3.3.4.0 - openpgp-asciiarmor ==0.1.2 - opensource ==0.1.1.0 - openssl-streams ==1.2.2.0 @@ -1574,7 +1574,7 @@ default-package-overrides: - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.1.4 - - pipes ==4.3.12 + - pipes ==4.3.13 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 @@ -1613,7 +1613,7 @@ default-package-overrides: - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 - - postgresql-binary ==0.12.1.3 + - postgresql-binary ==0.12.2 - postgresql-libpq ==0.9.4.2 - postgresql-orm ==0.5.1 - postgresql-schema ==0.1.14 @@ -1661,8 +1661,8 @@ default-package-overrides: - prospect ==0.1.0.0 - protobuf ==0.2.1.2 - protobuf-simple ==0.1.1.0 - - protocol-buffers ==2.4.12 - - protocol-buffers-descriptor ==2.4.12 + - protocol-buffers ==2.4.13 + - protocol-buffers-descriptor ==2.4.13 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - proto-lens ==0.5.1.0 @@ -1708,7 +1708,7 @@ default-package-overrides: - rando ==0.0.0.4 - random ==1.1 - random-bytestring ==0.1.3.2 - - random-fu ==0.2.7.0 + - random-fu ==0.2.7.3 - random-shuffle ==0.0.4 - random-source ==0.3.0.6 - random-tree ==0.6.0.5 @@ -1717,7 +1717,7 @@ default-package-overrides: - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.0 - rank2classes ==1.3.1.2 - - Rasterific ==0.7.4.4 + - Rasterific ==0.7.5 - rasterific-svg ==0.3.3.2 - ratel ==1.0.9 - ratel-wai ==1.1.1 @@ -1735,7 +1735,7 @@ default-package-overrides: - reanimate ==0.1.8.0 - reanimate-svg ==0.9.3.1 - rebase ==1.3.1.1 - - record-dot-preprocessor ==0.2.1 + - record-dot-preprocessor ==0.2.2 - record-hasfield ==1.0 - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 @@ -1804,7 +1804,7 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.5.0.0 - - safe ==0.3.17 + - safe ==0.3.18 - safecopy ==0.9.4.3 - safe-exceptions ==0.1.7.0 - safe-exceptions-checked ==0.1.0 @@ -1847,7 +1847,7 @@ default-package-overrides: - selective ==0.3 - semialign ==1 - semigroupoid-extras ==5 - - semigroupoids ==5.3.3 + - semigroupoids ==5.3.4 - semigroups ==0.18.5 - semirings ==0.4.2 - semiring-simple ==1.0.0.1 @@ -2131,7 +2131,7 @@ default-package-overrides: - these ==1.0.1 - th-expand-syns ==0.4.5.0 - th-extras ==0.0.0.4 - - th-lift ==0.8.0.1 + - th-lift ==0.8.1 - th-lift-instances ==0.1.14 - th-nowq ==0.1.0.3 - th-orphans ==0.13.9 @@ -2278,7 +2278,7 @@ default-package-overrides: - users-test ==0.5.0.1 - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - - util ==0.1.14.0 + - util ==0.1.14.1 - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 @@ -2298,7 +2298,7 @@ default-package-overrides: - vault ==0.3.1.3 - vec ==0.1.1.1 - vector ==0.12.0.3 - - vector-algorithms ==0.8.0.1 + - vector-algorithms ==0.8.0.3 - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 - vector-builder ==0.3.8 @@ -2357,7 +2357,7 @@ default-package-overrides: - webrtc-vad ==0.1.0.3 - websockets ==0.12.6.1 - websockets-snap ==0.10.3.1 - - weigh ==0.0.14 + - weigh ==0.0.16 - wide-word ==0.1.0.9 - wikicfp-scraper ==0.1.0.11 - wild-bind ==0.1.2.4 @@ -2397,7 +2397,7 @@ default-package-overrides: - Xauth ==0.1 - xdg-basedir ==0.2.2 - xdg-userdirs ==0.1.0.2 - - xeno ==0.3.5.1 + - xeno ==0.3.5.2 - xenstore ==0.1.1 - xls ==0.1.2 - xlsx ==0.7.2 @@ -2434,7 +2434,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1.1 - yesod-auth-oauth2 ==0.6.1.2 - yesod-bin ==1.6.0.4 - - yesod-core ==1.6.16.1 + - yesod-core ==1.6.17 - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 @@ -2448,7 +2448,7 @@ default-package-overrides: - yesod-recaptcha2 ==0.3.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.8 + - yesod-test ==1.6.9 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.2 - yes-precure5-command ==5.5.3 From 82d49ffa82c19c8efe46e0e8f7b7e82623846ca7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2019 11:05:02 +0100 Subject: [PATCH 050/113] hackage2nix: disable broken builds --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c21f473bfda..b87db387706 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4192,6 +4192,7 @@ broken-packages: - dhall-lsp-server - dhall-nix - dhall-to-cabal + - dhall-yaml - dhcp-lease-parser - dhrun - dia-base @@ -9971,6 +9972,7 @@ broken-packages: - vector-space-opengl - vector-static - vectortiles + - venzone - Verba - verbalexpressions - verdict From e449a21f19fb963dde5a99c181cb3cb03e673577 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 7 Dec 2019 11:56:38 +0100 Subject: [PATCH 051/113] haskell-systemd: use correct version of network to fix the build --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3c11205de73..ac064e971b7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -394,6 +394,11 @@ self: super: { Random123 = dontCheck super.Random123; systemd = dontCheck super.systemd; + # use the correct version of network + systemd_2_2_0 = dontCheck (super.systemd_2_2_0.override { + network = self.network_3_1_1_1; + }); + # https://github.com/eli-frey/cmdtheline/issues/28 cmdtheline = dontCheck super.cmdtheline; From 1fef36e671dc4ba4e8e48c85fef59137cada0e2b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 7 Dec 2019 11:57:02 +0100 Subject: [PATCH 052/113] haskell-spacecookie: use correct version of systemd to fix the build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ac064e971b7..403620e51d8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1319,4 +1319,7 @@ self: super: { # https://github.com/kazu-yamamoto/dns/issues/150 dns = dontCheck super.dns; + # needs newer version of the systemd package + spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b87db387706..e5e8f55305f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9112,7 +9112,6 @@ broken-packages: - SourceGraph - sousit - soyuz - - spacecookie - SpaceInvaders - spacepart - SpacePrivateers From d5814bc0e611930d0dac1235278ceab24b4eaab7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Dec 2019 20:39:55 +0100 Subject: [PATCH 053/113] haskell-ghcide: use latest haskell-lsp versions ghcide needs version 0.18.x of the haskell-lsp package to build. Closes https://github.com/NixOS/nixpkgs/pull/75610. --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 403620e51d8..90030c0c8d1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1322,4 +1322,9 @@ self: super: { # needs newer version of the systemd package spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; }; + # ghcide needs the latest versions of haskell-lsp. + ghcide = super.ghcide.override { haskell-lsp = self.haskell-lsp_0_18_0_0; lsp-test = self.lsp-test_0_8_2_0; }; + haskell-lsp_0_18_0_0 = super.haskell-lsp_0_18_0_0.override { haskell-lsp-types = self.haskell-lsp-types_0_18_0_0; }; + lsp-test_0_8_2_0 = (dontCheck super.lsp-test_0_8_2_0).override { haskell-lsp = self.haskell-lsp_0_18_0_0; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e5e8f55305f..d35249cd48d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5015,7 +5015,6 @@ broken-packages: - ghci-lib - ghci-ng - ghci-pretty - - ghcide - ghcjs-base-stub - ghcjs-dom-jsffi - ghcjs-fetch From c02f1b47cd0873091103f63771dbcd4d2f8da8e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Dec 2019 02:31:03 +0100 Subject: [PATCH 054/113] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.0-9-g650d530 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/df9ca29882f513b25d100052d92b04f55ebb0cb7. --- .../haskell-modules/hackage-packages.nix | 1733 +++++++---------- 1 file changed, 723 insertions(+), 1010 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8c09bd83891..0ec409dc8ed 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5214,12 +5214,13 @@ self: { }) {}; "Enum" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, smallcheck, tasty, tasty-hunit }: mkDerivation { pname = "Enum"; - version = "0.1.0.0"; - sha256 = "1zl5w5w3rqbh4awp4b4rbamkqcvnrzn944rjc84sq3rqad3wlww2"; + version = "0.2.0.0"; + sha256 = "0bk44zim92b5qb95byvcyy8cmbgzbxf06mp0nr765p9v48rjkr91"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base smallcheck tasty tasty-hunit ]; description = "Non-crashing `Enum` operations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -9234,7 +9235,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; - "HTF_0_14_0_1" = callPackage + "HTF_0_14_0_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff , directory, filepath, haskell-src, HUnit, lifted-base @@ -9244,8 +9245,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.14.0.1"; - sha256 = "025gcc77j547713bxm8y2i7xmq95nc4imyym6agmfrd7bh8h1jdb"; + version = "0.14.0.3"; + sha256 = "138gh5a2nx25czhp9qpaav2lq7ff142q4n6sbkrglfsyn48rifqp"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -12479,27 +12480,6 @@ self: { }) {}; "ListLike" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string - , vector - }: - mkDerivation { - pname = "ListLike"; - version = "4.6.2"; - sha256 = "0m65x8yaq7q50gznln8mga2wrc8cvjx6gw9rim8s7xqcrx6y5zjh"; - libraryHaskellDepends = [ - array base bytestring containers deepseq dlist fmlist text - utf8-string vector - ]; - testHaskellDepends = [ - array base bytestring containers dlist fmlist HUnit QuickCheck - random text utf8-string vector - ]; - description = "Generalized support for list-like structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ListLike_4_6_3" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string , vector @@ -12518,7 +12498,6 @@ self: { ]; description = "Generalized support for list-like structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListT" = callPackage @@ -13090,19 +13069,6 @@ self: { }) {}; "MemoTrie" = callPackage - ({ mkDerivation, base, newtype-generics }: - mkDerivation { - pname = "MemoTrie"; - version = "0.6.9"; - sha256 = "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base newtype-generics ]; - description = "Trie-based memo functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "MemoTrie_0_6_10" = callPackage ({ mkDerivation, base, newtype-generics }: mkDerivation { pname = "MemoTrie"; @@ -13113,7 +13079,6 @@ self: { libraryHaskellDepends = [ base newtype-generics ]; description = "Trie-based memo functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MetaHDBC" = callPackage @@ -14119,8 +14084,8 @@ self: { }: mkDerivation { pname = "Network-NineP"; - version = "0.4.5"; - sha256 = "1s11idqg8bvimhal86569wlw746cyyq67dxvvabnbn3q23mjkflh"; + version = "0.4.6"; + sha256 = "0aq8888z0fcsd18shsqjsgrpxm417cfh250vyd2660ajc0ymj3q3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14858,8 +14823,8 @@ self: { }: mkDerivation { pname = "OpenGLRaw"; - version = "3.3.3.0"; - sha256 = "0zgllb4bcash2i2cispa3j565aw3dpxs41ghmhpvyvi4a6xmyldx"; + version = "3.3.4.0"; + sha256 = "0gmsmysqzpm13qnyq4vvqxm4dzw25nayfd9wi5x645pympm6jqbm"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -16741,23 +16706,6 @@ self: { }) {}; "Rasterific" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity - , free, JuicyPixels, mtl, primitive, transformers, vector - , vector-algorithms - }: - mkDerivation { - pname = "Rasterific"; - version = "0.7.4.4"; - sha256 = "1s8d0yyh2xz8kb9476nr11jzxvgq0y9sgspgzhh9shf44fbz4gs0"; - libraryHaskellDepends = [ - base bytestring containers dlist FontyFruity free JuicyPixels mtl - primitive transformers vector vector-algorithms - ]; - description = "A pure haskell drawing engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Rasterific_0_7_5" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity , free, JuicyPixels, mtl, primitive, transformers, vector , vector-algorithms @@ -16772,7 +16720,6 @@ self: { ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -23548,8 +23495,8 @@ self: { }: mkDerivation { pname = "aeson-filthy"; - version = "0.1.3"; - sha256 = "121ygm5k9qjizwjj7w5dklxs5sv0zysrnpvwb37ar4bjkcxhs0ap"; + version = "0.1.4"; + sha256 = "1mjlgq1h09plpllmh7manbcjnl57pmjap0kz9ahzrpv02zrfkszi"; libraryHaskellDepends = [ aeson base bytestring text time unordered-containers ]; @@ -28219,18 +28166,18 @@ self: { "amqp-utils" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers - , data-default-class, hinotify, magic, process, text, time, tls - , unix, x509-system + , data-default-class, hinotify, magic, network, process, text, time + , tls, unix, x509-system }: mkDerivation { pname = "amqp-utils"; - version = "0.4.0.1"; - sha256 = "1xym969csbq08alvvvvwikcl4qg733x1sp13qn4p0xj2kkfayhzf"; + version = "0.4.1.0"; + sha256 = "1p0pvl88xp9m0b9k7nqxln3702kp4lk05f60mag3swa09rvzcg47"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ amqp base bytestring connection containers data-default-class - hinotify magic process text time tls unix x509-system + hinotify magic network process text time tls unix x509-system ]; description = "Generic Haskell AMQP tools"; license = stdenv.lib.licenses.gpl3; @@ -28818,8 +28765,10 @@ self: { }: mkDerivation { pname = "ansi-terminal-game"; - version = "0.7.2.0"; - sha256 = "041xw7kq620ydnbdawmsdb65021p2534f9725qddv1i0pcwdn274"; + version = "1.0.0.0"; + sha256 = "0h33ih7sxzyp1a6r6ivk73lrfx6haxxzmgh56n75sa7p8vhr8f1i"; + revision = "1"; + editedCabalFile = "1x601p97ragf9k56qy1ndmn7g3brs8fvvmf1wcrxz1ynhndqqpjw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30628,6 +30577,8 @@ self: { pname = "arbor-monad-logger"; version = "0.1.1.3"; sha256 = "1x44kavmgm7nffvnakyrmcxq03vshg15vkk8wcpvkq43dndk9jb2"; + revision = "1"; + editedCabalFile = "0srypscv4gd1q2h6namm507211xd3cnqv144h2pb1mayy20m9a8m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37765,28 +37716,6 @@ self: { }) {}; "bifunctors" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , hspec-discover, QuickCheck, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - }: - mkDerivation { - pname = "bifunctors"; - version = "5.5.5"; - sha256 = "0rn47q8dzv0g1fyams99p4py6q0asxdc50q9k0nj497brk738xcb"; - libraryHaskellDepends = [ - base base-orphans comonad containers tagged template-haskell - th-abstraction transformers - ]; - testHaskellDepends = [ - base hspec QuickCheck template-haskell transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - description = "Bifunctors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bifunctors_5_5_6" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec , hspec-discover, QuickCheck, tagged, template-haskell , th-abstraction, transformers, transformers-compat @@ -37806,7 +37735,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -38002,6 +37930,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bin" = callPackage + ({ mkDerivation, base, dec, deepseq, fin, hashable, QuickCheck }: + mkDerivation { + pname = "bin"; + version = "0.1"; + sha256 = "008i0yxvg9v05gby6ysq3f7ygh125p9xa5vwrcrbq5xw79igyzq5"; + libraryHaskellDepends = [ + base dec deepseq fin hashable QuickCheck + ]; + description = "Bin: binary natural numbers"; + license = stdenv.lib.licenses.gpl2Plus; + }) {}; + "binary_0_7_6_1" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal , containers, criterion, deepseq, directory, filepath, HUnit, mtl @@ -39248,8 +39189,8 @@ self: { ({ mkDerivation, base, bindings-DSL, portaudio, vector }: mkDerivation { pname = "bindings-portaudio"; - version = "0.2"; - sha256 = "0jxpp8iwb6v0g0y81vnqxqycfh4gzykq4ijn4ir8hzajy7bglb1n"; + version = "0.2.1"; + sha256 = "1i2r01jhf8k7820zzwqbss0z3kxd15pvdz7ss8s9gczv88nwxvxk"; libraryHaskellDepends = [ base bindings-DSL vector ]; libraryPkgconfigDepends = [ portaudio ]; description = "Low-level bindings to portaudio library"; @@ -40357,6 +40298,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bits-extra_0_0_1_5" = callPackage + ({ mkDerivation, base, criterion, doctest, doctest-discover + , ghc-prim, hedgehog, hspec, hspec-discover, hw-hedgehog + , hw-hspec-hedgehog, vector + }: + mkDerivation { + pname = "bits-extra"; + version = "0.0.1.5"; + sha256 = "1f29jn8gxmi9nrwnrykq4z88cg8zsknbw7licmf44hlid0s5glf5"; + libraryHaskellDepends = [ base ghc-prim vector ]; + testHaskellDepends = [ + base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog + hw-hspec-hedgehog + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; + description = "Useful bitwise operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bits-extras" = callPackage ({ mkDerivation, base, gcc_s }: mkDerivation { @@ -41810,25 +41772,26 @@ self: { "boltzmann-brain" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , edit-distance, graphviz, haskell-src-exts, hmatrix, megaparsec - , MonadRandom, mtl, multiset, pretty-terminal, process, random - , text, time, transformers + , edit-distance, filepath, graphviz, haskell-src-exts, hmatrix + , megaparsec, MonadRandom, mtl, multiset, pretty-terminal, process + , random, template-haskell, text, time, transformers }: mkDerivation { pname = "boltzmann-brain"; - version = "1.4"; - sha256 = "17xny78fkqm344cddkklv4sj8c7dnps8bn1n21xa392l2zyf7mqz"; + version = "1.6"; + sha256 = "1k6zsj4wijvxbbf3n95b61bii3p5m257capdw382613v7wp1yh6a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers edit-distance graphviz haskell-src-exts - hmatrix megaparsec MonadRandom mtl multiset pretty-terminal process - random text time transformers + aeson base bytestring containers edit-distance graphviz + haskell-src-exts hmatrix megaparsec MonadRandom mtl multiset + pretty-terminal process random template-haskell text time + transformers ]; executableHaskellDepends = [ - aeson base bytestring containers directory megaparsec text + aeson base bytestring containers directory filepath megaparsec text ]; - description = "Boltzmann sampler compiler for combinatorial systems"; + description = "Analytic sampler compiler for combinatorial systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -42062,26 +42025,6 @@ self: { }) {}; "boolean-normal-forms" = callPackage - ({ mkDerivation, base, cond, containers, deepseq, QuickCheck, tasty - , tasty-quickcheck - }: - mkDerivation { - pname = "boolean-normal-forms"; - version = "0.0.1"; - sha256 = "12i0jarbv7gq2p8zw0jgh2gq3wqk6s0vsc9rd0g7c36srcmr944b"; - revision = "1"; - editedCabalFile = "1p31kqxp77xdhkszppmnzqgxp883vasrh5910qfif50lch39myfm"; - libraryHaskellDepends = [ base cond containers deepseq ]; - testHaskellDepends = [ - base cond containers QuickCheck tasty tasty-quickcheck - ]; - description = "Boolean normal form: NNF, DNF & CNF"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "boolean-normal-forms_0_0_1_1" = callPackage ({ mkDerivation, base, cond, containers, deepseq, QuickCheck, tasty , tasty-quickcheck }: @@ -42401,6 +42344,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "boring_0_1_3" = callPackage + ({ mkDerivation, adjunctions, base, base-compat, bin, constraints + , dec, fin, generics-sop, ral, singleton-bool, streams, tagged + , transformers, transformers-compat, vec + }: + mkDerivation { + pname = "boring"; + version = "0.1.3"; + sha256 = "1fljlkzc5016xbq9jykh0wr1mbyfcikh818pp54djws5vm66hh6d"; + libraryHaskellDepends = [ + adjunctions base base-compat bin constraints dec fin generics-sop + ral singleton-bool streams tagged transformers transformers-compat + vec + ]; + description = "Boring and Absurd types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "boring-game" = callPackage ({ mkDerivation, base, gloss }: mkDerivation { @@ -43135,6 +43097,46 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "brittany_0_12_1_1" = callPackage + ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs + , containers, czipwith, data-tree-print, deepseq, directory, extra + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec + , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty + , random, safe, semigroups, strict, syb, text, transformers + , uniplate, unsafe, yaml + }: + mkDerivation { + pname = "brittany"; + version = "0.12.1.1"; + sha256 = "0nw7ymdb7xam634w42l1xjgyvpla8grcg02aj19fscw2fn9gfh7z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths monad-memo mtl multistate + neat-interpolation pretty random safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + executableHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths monad-memo mtl multistate + neat-interpolation pretty safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + testHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate + neat-interpolation parsec pretty safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + description = "Haskell source code formatter"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "broadcast-chan" = callPackage ({ mkDerivation, async, base, criterion, deepseq, stm, transformers , unliftio-core @@ -45678,8 +45680,8 @@ self: { }: mkDerivation { pname = "cabal-fmt"; - version = "0.1.1"; - sha256 = "07hx1s7l5zmh7vs2zmmm56msz2m7wnzn919mvnpypvrsswmmnnd9"; + version = "0.1.2"; + sha256 = "0h4qxbwykddbdbiw5j140v8cin5h4aqi260wd9fddpxdpkpmdrda"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -46113,6 +46115,28 @@ self: { broken = true; }) {}; + "cabal-rpm_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , http-client, http-client-tls, http-conduit, optparse-applicative + , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "1.0.2"; + sha256 = "03315wka46mqz090cijz1rk69i861nm6yc0jm6xjlgrbhi4ngmri"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory filepath http-client + http-client-tls http-conduit optparse-applicative process + simple-cabal simple-cmd simple-cmd-args time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -46624,8 +46648,8 @@ self: { }: mkDerivation { pname = "cache"; - version = "0.1.1.2"; - sha256 = "0b0jggcbnrs0pppn60kaggxkwmg0ri7b1i4j5613abgw8bj258s8"; + version = "0.1.2.0"; + sha256 = "12mxziwz8qn26v5xkp0bh13jqf9hd8pi9flm68nz82p15vhcs01s"; libraryHaskellDepends = [ base clock hashable stm transformers unordered-containers ]; @@ -46634,6 +46658,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cache_0_1_3_0" = callPackage + ({ mkDerivation, base, clock, hashable, hspec, stm, transformers + , unordered-containers + }: + mkDerivation { + pname = "cache"; + version = "0.1.3.0"; + sha256 = "0d75257kvjpnv95ja50x5cs77pj8ccfr0nh9q5gzvcps83qdksa2"; + libraryHaskellDepends = [ + base clock hashable stm transformers unordered-containers + ]; + testHaskellDepends = [ base clock hspec stm transformers ]; + description = "An in-memory key/value store with expiration support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cached" = callPackage ({ mkDerivation, base, containers, directory, doctest, filepath , protolude, QuickCheck, quickcheck-assertions, shake, text @@ -48523,6 +48564,8 @@ self: { pname = "castagnoli"; version = "0.1.0.0"; sha256 = "10mznwl00lmx5zmha7w0p7yx406k0qvv74x6lcms4ynq4z5hi8fj"; + revision = "1"; + editedCabalFile = "1yp0c8klbf81m2v7qwj22l2yh0w6q6xgnk44zwxdkgpbsjghdp14"; libraryHaskellDepends = [ base byteslice primitive primitive-slice primitive-unlifted ]; @@ -52035,21 +52078,6 @@ self: { }) {}; "clay" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, mtl, text }: - mkDerivation { - pname = "clay"; - version = "0.13.2"; - sha256 = "1jxwq159hcc55ijga18zdlqr3ga1flilymq96hqpizb4khpq7y6j"; - libraryHaskellDepends = [ base mtl text ]; - testHaskellDepends = [ base hspec hspec-discover mtl text ]; - testToolDepends = [ hspec-discover ]; - description = "CSS preprocessor as embedded Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "clay_0_13_3" = callPackage ({ mkDerivation, base, hspec, hspec-discover, mtl, text }: mkDerivation { pname = "clay"; @@ -52060,8 +52088,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "clckwrks" = callPackage @@ -52078,8 +52104,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.25.2"; - sha256 = "087k0n6ri0pg5wmjnw3gkjaz5d627519vby9kmiagck7id7f89q9"; + version = "0.25.4"; + sha256 = "0mlrkyhs095b8bwsk4mjq4wys6ydn4m9nds37lxqnw6qzl6rk5hl"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -52107,8 +52133,8 @@ self: { }: mkDerivation { pname = "clckwrks-cli"; - version = "0.3.0"; - sha256 = "0ardhl27n3al945s88dmygnw42ki5sn23s59rkhbs4pdyp9yawhs"; + version = "0.3.0.1"; + sha256 = "0f44ndvnkivwc72lxfr779kyn20g7f4wy3prqazdhk47xvl1fps6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52235,8 +52261,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.16.6"; - sha256 = "05gmr0y5ygsybmdp1k2xcfhbn7wix9mrwvwsv4x0has9l8xc92q1"; + version = "0.6.16.8"; + sha256 = "0l6rb5gjag9mxcn067yp3h0bd37jg18p3sg79gkf2pzkxyzhgwqk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers @@ -52262,8 +52288,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.18"; - sha256 = "0fgz0rxzkbavzqci4kcav1pljkhdy1mgmf3mldbxp8f88pr5lm42"; + version = "0.4.3.19"; + sha256 = "06lvr3sq5slcfc1r3vmip9flh5dn50mz6ar7x11zk4dm365g4vhk"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory @@ -52286,14 +52312,13 @@ self: { }: mkDerivation { pname = "clckwrks-theme-bootstrap"; - version = "0.4.2.1"; - sha256 = "1mkqi3qx6k86d2xr4cyxg0ym5c71ip4ijgg6mg20gf3jkjjzvha4"; + version = "0.4.2.2"; + sha256 = "0sa3k34m1kf6r7i42rfg5v3g1m9drisfnn2bvlfcbyk8sna7mf80"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro mtl text web-plugins ]; - libraryToolDepends = [ hsx2hs ]; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -53752,8 +53777,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.2.1"; - sha256 = "17rl3xbap3fgn2bg0iykysxaff1rakr8fq759hl7pmx3qnr8xz12"; + version = "0.1.2.3"; + sha256 = "0z4im9z5yi18kdw99d50zbcala619hba3iwka7ny5krladnz75ha"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -53776,8 +53801,8 @@ self: { }: mkDerivation { pname = "cobot-tools"; - version = "0.1.2.0"; - sha256 = "1spivkpb7ql8k17im175i4ijg4bi8d24a6q1ijwfkq4nnrbssg6q"; + version = "0.1.2.1"; + sha256 = "0qd3w9y3fps7kkpkvdh3wd54mm9z6ikr16f9f8jvn2gza0xc4l0m"; libraryHaskellDepends = [ array base bytestring cobot containers data-default data-msgpack deepseq lens mtl regex-tdfa text @@ -55178,24 +55203,6 @@ self: { }) {}; "comonad" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, containers - , distributive, doctest, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "comonad"; - version = "5.0.5"; - sha256 = "1l7snp2mszgnjgd0nc9kzfyd13vla0rlazqi03rwx2akcxk14n3c"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base containers distributive tagged transformers - transformers-compat - ]; - testHaskellDepends = [ base doctest ]; - description = "Comonads"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "comonad_5_0_6" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers , distributive, doctest, tagged, transformers, transformers-compat }: @@ -55211,7 +55218,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Comonads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comonad-extras" = callPackage @@ -68271,29 +68277,6 @@ self: { }) {}; "deriving-compat" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged - , template-haskell, th-abstraction, transformers - , transformers-compat - }: - mkDerivation { - pname = "deriving-compat"; - version = "0.5.7"; - sha256 = "0bp4f0is84cv139s35669dv23mcp6lhp2wall72yvkk12lp2l2mg"; - libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell - th-abstraction transformers transformers-compat - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck tagged - template-haskell transformers transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "deriving-compat_0_5_8" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged , template-haskell, th-abstraction, transformers @@ -68314,7 +68297,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derp" = callPackage @@ -69083,6 +69065,36 @@ self: { broken = true; }) {}; + "dhall-yaml" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall + , dhall-json, exceptions, HsYAML, HsYAML-aeson + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , tasty, tasty-expected-failure, tasty-hunit, text, vector + }: + mkDerivation { + pname = "dhall-yaml"; + version = "1.0.0"; + sha256 = "05jhcvikm3rbcf9jzw747x70c3dsslcij977yhqks0c59nr9pqn6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson + optparse-applicative text vector + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring dhall dhall-json exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + base bytestring dhall dhall-json tasty tasty-expected-failure + tasty-hunit text + ]; + description = "Convert between Dhall and YAML"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -69641,6 +69653,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-postscript_1_5" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , diagrams-core, diagrams-lib, hashable, lens, monoid-extras, mtl + , semigroups, split, statestack + }: + mkDerivation { + pname = "diagrams-postscript"; + version = "1.5"; + sha256 = "00j58mc84srjvrf21v6zjxxlbw6b8ahhn1jmbq697w8kw3cvygpa"; + libraryHaskellDepends = [ + base bytestring containers data-default-class diagrams-core + diagrams-lib hashable lens monoid-extras mtl semigroups split + statestack + ]; + description = "Postscript backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-qrcode" = callPackage ({ mkDerivation, array, base, colour, diagrams-core, diagrams-lib }: @@ -69678,6 +69709,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-rasterific_1_4_2" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity + , hashable, JuicyPixels, lens, mtl, optparse-applicative + , Rasterific + }: + mkDerivation { + pname = "diagrams-rasterific"; + version = "1.4.2"; + sha256 = "161rsy3g59n3sfrbfyvd4i4hszl0zm59w21b7pk6w88n0bk8gf2l"; + libraryHaskellDepends = [ + base bytestring containers data-default-class diagrams-core + diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels + lens mtl optparse-applicative Rasterific + ]; + testHaskellDepends = [ base diagrams-core diagrams-lib ]; + description = "Rasterific backend for diagrams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-reflex" = callPackage ({ mkDerivation, base, colour, containers, diagrams-core , diagrams-lib, lens, monoid-extras, mtl, reflex, reflex-dom @@ -69750,6 +69802,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-svg_1_4_3" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, colour + , containers, diagrams-core, diagrams-lib, filepath, hashable + , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative + , semigroups, split, svg-builder, text + }: + mkDerivation { + pname = "diagrams-svg"; + version = "1.4.3"; + sha256 = "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8"; + libraryHaskellDepends = [ + base base64-bytestring bytestring colour containers diagrams-core + diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl + optparse-applicative semigroups split svg-builder text + ]; + description = "SVG backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-tikz" = callPackage ({ mkDerivation, base, diagrams-core, diagrams-lib, dlist, mtl }: mkDerivation { @@ -70630,8 +70702,8 @@ self: { }: mkDerivation { pname = "dino"; - version = "0.1.1"; - sha256 = "05n0zsl9wvwilnmh28s89cda8a72qfbnhwkbbnw9yihpbamx59z9"; + version = "0.1.2"; + sha256 = "0sk7p89fmjynykk7djfn8cmmjrqyv5pml9ny2dycr1n86cnxr88x"; libraryHaskellDepends = [ ansi-wl-pprint base containers errors exceptions hashable monad-loops mtl text transformers tree-view unordered-containers @@ -72856,7 +72928,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "doctemplates_0_7_2" = callPackage + "doctemplates_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text @@ -72864,8 +72936,8 @@ self: { }: mkDerivation { pname = "doctemplates"; - version = "0.7.2"; - sha256 = "1sadadxq3vyzq4l3p05wvmkw68nwjprn98hn4l5zxif0r722jyxj"; + version = "0.8"; + sha256 = "0zhnhdpbh0cyh6nr655yfik135gssa1qhfhzsvaph2n1qwq1l6nn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath HsYAML mtl parsec safe @@ -73561,6 +73633,22 @@ self: { broken = true; }) {}; + "downloader" = callPackage + ({ mkDerivation, base, directory, filepath, network-uri, process + , safe + }: + mkDerivation { + pname = "downloader"; + version = "0.1.0.1"; + sha256 = "1mjsdnghlbi1c0pzhrng1dcvs1syisxrv7ygg5267f9hmcwk5zgn"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base directory filepath network-uri process safe + ]; + description = "A small, low-dependency library that provides turn-key file download over HTTP and HTTPS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dozenal" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -75861,6 +75949,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "edit-distance-linear" = callPackage + ({ mkDerivation, array, base, bytestring, criterion, edit-distance + , hspec, QuickCheck, text, text-metrics + }: + mkDerivation { + pname = "edit-distance-linear"; + version = "0.2.0.2"; + sha256 = "0l95jjhjn39slyaixis2z6w0mly1vk1c2ia3nykhkvwp2adyn5nf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base bytestring ]; + testHaskellDepends = [ + array base bytestring edit-distance hspec QuickCheck + ]; + benchmarkHaskellDepends = [ + array base bytestring criterion text text-metrics + ]; + description = "Efficient implementation of the Levenshtein edit distance in linear memory"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "edit-distance-vector" = callPackage ({ mkDerivation, base, QuickCheck, quickcheck-instances, vector }: mkDerivation { @@ -77679,6 +77788,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "emojis" = callPackage + ({ mkDerivation, base, containers, HUnit, text }: + mkDerivation { + pname = "emojis"; + version = "0.1"; + sha256 = "1c6zkj9gmk1y90gbdrn50hyp7mw1mggzhnr2khqd728ryipw60ss"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base HUnit text ]; + description = "Conversion between emoji characters and their names"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "empty" = callPackage ({ mkDerivation }: mkDerivation { @@ -79214,7 +79335,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "esqueleto_3_2_3" = callPackage + "esqueleto_3_3_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -79224,8 +79345,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.2.3"; - sha256 = "1m8ib08bnrmigpf0lzkn1wm8p479aflm92irzq5v3gg07dqgypcy"; + version = "3.3.0"; + sha256 = "0qscm9b4zqb0w78xpf1yhmjlbapvghmvsqxqwx2x0grb4yvv7cwq"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -79811,15 +79932,15 @@ self: { "evdev" = callPackage ({ mkDerivation, base, bytestring, c2hs, composition, containers , either, evdev, extra, hinotify, posix-paths, process, rawfilepath - , streamly, time, unix + , safe, streamly, time, unix }: mkDerivation { pname = "evdev"; - version = "0.1.0.1"; - sha256 = "17y1rg6p8inzf3zdakfxwp4f3yrak83lqfdjiwg786x4f0ab3jaq"; + version = "0.2.0.1"; + sha256 = "0b005anc3bxs8ys5zmzzs81n4wmjabvv7fbcj5w62ddsjfq38p62"; libraryHaskellDepends = [ base bytestring composition containers either extra hinotify - posix-paths process rawfilepath streamly time unix + posix-paths process rawfilepath safe streamly time unix ]; librarySystemDepends = [ evdev ]; libraryToolDepends = [ c2hs ]; @@ -82581,10 +82702,8 @@ self: { }: mkDerivation { pname = "fastsum"; - version = "0.1.1.0"; - sha256 = "0fa3wjdsjl8wwlw194g1b7j8rvwix2b1hgwm1s10fq91a10mca6n"; - revision = "1"; - editedCabalFile = "0cjzy6q0srff2ygwrffgf4a6clpva4fd7jx5z3pv7ym64w5f4l97"; + version = "0.1.1.1"; + sha256 = "0j9jd068xgk7nn2ilgdkv1pxngflqqgxz1pnhdssgiih04v8zw5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84352,6 +84471,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "filepath-bytestring" = callPackage + ({ mkDerivation, base, bytestring, filepath, QuickCheck, unix }: + mkDerivation { + pname = "filepath-bytestring"; + version = "1.4.2.1.0"; + sha256 = "1q2d02p87yfvqbqhgry6lzqkjhscqfacpcxgnc6xz9b1rvg1mwvj"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ base bytestring filepath QuickCheck ]; + description = "Library for manipulating RawFilePaths in a cross platform way"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "filepath-crypto" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , cryptoids, cryptoids-class, cryptoids-types, exceptions, filepath @@ -84592,6 +84723,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fin_0_1_1" = callPackage + ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing + , QuickCheck, tagged + }: + mkDerivation { + pname = "fin"; + version = "0.1.1"; + sha256 = "0zwc8x2ilbk1bhsk85brf6g300cx4w2j3602gjh6rv900961gqri"; + libraryHaskellDepends = [ base dec deepseq hashable QuickCheck ]; + testHaskellDepends = [ base inspection-testing tagged ]; + description = "Nat and Fin: peano naturals and finite numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "final" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -85607,22 +85753,6 @@ self: { }) {}; "flags-applicative" = callPackage - ({ mkDerivation, base, casing, containers, hspec, mtl, network - , text - }: - mkDerivation { - pname = "flags-applicative"; - version = "0.1.0.1"; - sha256 = "1pamcfv5g6d42ksq10af0l2a6k8y997zx3y4pvf5gcy5hlxr2gwv"; - libraryHaskellDepends = [ - base casing containers mtl network text - ]; - testHaskellDepends = [ base containers hspec text ]; - description = "Applicative flag parsing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "flags-applicative_0_1_0_2" = callPackage ({ mkDerivation, base, casing, containers, hspec, mtl, network , text }: @@ -85636,7 +85766,6 @@ self: { testHaskellDepends = [ base containers hspec text ]; description = "Applicative flag parsing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flamethrower" = callPackage @@ -87284,24 +87413,6 @@ self: { }) {}; "forma" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, mtl, text - , unordered-containers - }: - mkDerivation { - pname = "forma"; - version = "1.1.2"; - sha256 = "1ppgqwqm157ygj992r0cbarfii127g7nm63wbnrqvr9k1wmnlxx0"; - libraryHaskellDepends = [ - aeson base containers mtl text unordered-containers - ]; - testHaskellDepends = [ aeson base containers hspec mtl text ]; - description = "Parse and validate forms in JSON format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "forma_1_1_3" = callPackage ({ mkDerivation, aeson, base, containers, hspec, mtl, text , unordered-containers }: @@ -88068,23 +88179,6 @@ self: { }) {}; "free" = callPackage - ({ mkDerivation, base, comonad, containers, distributive - , exceptions, mtl, profunctors, semigroupoids, template-haskell - , transformers, transformers-base - }: - mkDerivation { - pname = "free"; - version = "5.1.2"; - sha256 = "0vlf3f2ckl3cr7z2zl8c9c8qkdlfgvmh04gxkp2fg0z9dz80nlyb"; - libraryHaskellDepends = [ - base comonad containers distributive exceptions mtl profunctors - semigroupoids template-haskell transformers transformers-base - ]; - description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "free_5_1_3" = callPackage ({ mkDerivation, base, comonad, containers, distributive , exceptions, mtl, profunctors, semigroupoids, template-haskell , transformers, transformers-base @@ -88099,7 +88193,6 @@ self: { ]; description = "Monads for free"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-algebras" = callPackage @@ -94596,8 +94689,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.7.6"; - sha256 = "0ic4v2l2mlcbgshd2p3834mdzagprc2bqjhnm9z38yvwj4bjgp5r"; + version = "0.7.7"; + sha256 = "1qrj6is1f6jnx9m2g7cp2009dik7inzf5yqlvqv4pwzzxp0nhl3a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94645,20 +94738,18 @@ self: { "ghcide" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot - , ghc-boot-th, ghc-paths, hashable, haskell-lsp, haskell-lsp-types - , hie-bios, hslogger, lens, lsp-test, mtl, network-uri - , optparse-applicative, parser-combinators, prettyprinter - , prettyprinter-ansi-terminal, rope-utf16-splay, safe-exceptions - , shake, sorted-list, stm, syb, tasty, tasty-expected-failure - , tasty-hunit, text, time, transformers, unix, unordered-containers - , utf8-string + , ghc-boot-th, ghc-paths, ghc-typelits-knownnat, hashable + , haskell-lsp, haskell-lsp-types, hie-bios, hslogger, lens + , lsp-test, mtl, network-uri, optparse-applicative + , parser-combinators, prettyprinter, prettyprinter-ansi-terminal + , rope-utf16-splay, safe-exceptions, shake, sorted-list, stm, syb + , tasty, tasty-expected-failure, tasty-hunit, text, time + , transformers, unix, unordered-containers, utf8-string }: mkDerivation { pname = "ghcide"; - version = "0.0.4"; - sha256 = "19iasnsqz9a07gw1f3cxraij1hykwxsidx1c26ws8l13nhnh6mpr"; - revision = "1"; - editedCabalFile = "028g2g8g3r4phazry3faj7ham11m95v4aq314kjbkpx8lxva2ipv"; + version = "0.0.5"; + sha256 = "014l2gg7ln2q9c7qpga45iicxi5mcyjzllvyiwb4vd8rmbkvr1bm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94674,14 +94765,12 @@ self: { haskell-lsp hie-bios hslogger optparse-applicative shake text ]; testHaskellDepends = [ - base containers directory extra filepath ghc haskell-lsp-types lens - lsp-test parser-combinators tasty tasty-expected-failure - tasty-hunit text + base bytestring containers directory extra filepath ghc + ghc-typelits-knownnat haskell-lsp-types lens lsp-test + parser-combinators tasty tasty-expected-failure tasty-hunit text ]; description = "The core of an IDE"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghcjs-ajax" = callPackage @@ -104708,8 +104797,8 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.8.4"; - sha256 = "0vvr86y29ncgs3j2hd5qhsxix09jf01ah8qqq6n12zsh484cr127"; + version = "2.8.5"; + sha256 = "1d5cmgj3rg8snc2b5jn9h7hb83j2hhf0c9shiiyrpr8rrl4hx2mj"; libraryHaskellDepends = [ aeson asn1-encoding attoparsec base base16-bytestring bifunctors binary binary-conduit bytestring bzlib conduit conduit-extra @@ -105689,6 +105778,8 @@ self: { pname = "hackage-repo-tool"; version = "0.1.1.2"; sha256 = "1zgsmibi24w2wsd828hnls1yv9lrl9xwsi2aay3d603j8mg8vd0r"; + revision = "1"; + editedCabalFile = "1x8cqmfyc168jrmvg2c8as1gj4qys10hyr71nmcyskvqrk5bsxf8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105741,6 +105832,8 @@ self: { pname = "hackage-security"; version = "0.6.0.0"; sha256 = "1y9vs30y474ri8b9jqkbwfkcfh7p7jaafzwxina9z0xl32d0bn1c"; + revision = "1"; + editedCabalFile = "0iw1vy9xapwrwsg38pb6lr26yprwhz1j2w2kzkqfapxmwx37v639"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -106171,6 +106264,8 @@ self: { pname = "haddock-library"; version = "1.8.0"; sha256 = "15xpv29yh3kb9qq9gmws2l8m64i7phvf47y08vxc2j55101sg4vh"; + revision = "1"; + editedCabalFile = "09v6lq3ncf3ax7b6n36vhsflm488x0qc8sgc3w17m09x1jl48d99"; libraryHaskellDepends = [ base bytestring containers parsec text transformers ]; @@ -108984,26 +109079,6 @@ self: { }) {}; "hasbolt" = callPackage - ({ mkDerivation, base, binary, bytestring, connection, containers - , data-binary-ieee754, data-default, hex, hspec, mtl, network - , QuickCheck, text - }: - mkDerivation { - pname = "hasbolt"; - version = "0.1.3.5"; - sha256 = "0qd5rh0jdwhkjcz5kg1bqwd5hpz5w9ph9k0vxaam1lnjjniw7zbj"; - libraryHaskellDepends = [ - base binary bytestring connection containers data-binary-ieee754 - data-default mtl network text - ]; - testHaskellDepends = [ - base bytestring containers hex hspec QuickCheck text - ]; - description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hasbolt_0_1_3_6" = callPackage ({ mkDerivation, base, binary, bytestring, connection, containers , data-binary-ieee754, data-default, hex, hspec, mtl, network , QuickCheck, text @@ -109021,7 +109096,6 @@ self: { ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasbolt-extras" = callPackage @@ -109032,8 +109106,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.24"; - sha256 = "16hybk7f8rx81a50zbj6i4isx4fi2yr7aw9n36h8qab4dxil4szy"; + version = "0.0.0.25"; + sha256 = "0cd0c6vcyfzrg3bzs1mv2c7alr7ncz5gkj6r70n2fb41mxnz9i2l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112414,20 +112488,20 @@ self: { "haskey" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers - , directory, exceptions, filepath, focus, haskey-btree, HUnit - , list-t, lz4, mtl, QuickCheck, random, semigroups, stm + , directory, exceptions, filepath, focus, hashable, haskey-btree + , HUnit, list-t, lz4, mtl, QuickCheck, random, semigroups, stm , stm-containers, temporary, test-framework, test-framework-hunit , test-framework-quickcheck2, text, transformers, unix, vector , xxhash-ffi }: mkDerivation { pname = "haskey"; - version = "0.3.0.2"; - sha256 = "1s24k6mwb1231j3ryd4iizday4l966vs9rcghr53k3jx2nl0h74h"; + version = "0.3.1.0"; + sha256 = "06q5gwjpgrgjq07iz7368yfghsfc2im1gbwqqixb1lqbiz7q6dbs"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions filepath - focus haskey-btree list-t lz4 mtl semigroups stm stm-containers - transformers unix xxhash-ffi + focus hashable haskey-btree list-t lz4 mtl semigroups stm + stm-containers transformers unix xxhash-ffi ]; testHaskellDepends = [ async base binary bytestring containers directory exceptions @@ -112621,34 +112695,6 @@ self: { }) {}; "haskoin-core" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring - , cereal, conduit, containers, cryptonite, entropy, hashable, hspec - , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck - , safe, scientific, secp256k1-haskell, split, string-conversions - , text, time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "haskoin-core"; - version = "0.9.6"; - sha256 = "1sj54ajnqdkf3fnsz5i41p0mglixabyh5csnpzlvhh0wmaca0g52"; - libraryHaskellDepends = [ - aeson array base base16-bytestring bytestring cereal conduit - containers cryptonite entropy hashable memory mtl murmur3 network - QuickCheck scientific secp256k1-haskell split string-conversions - text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring cereal containers hspec HUnit mtl QuickCheck - safe split string-conversions text unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Bitcoin & Bitcoin Cash library for Haskell"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "haskoin-core_0_9_7" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring , cereal, conduit, containers, cryptonite, entropy, hashable, hspec , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck @@ -112711,8 +112757,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.9.13"; - sha256 = "15z6qnaj5lk6kd151nl6ddjza0ngpgx8j29ayd5pcwr59r40hl95"; + version = "0.9.14"; + sha256 = "17nd6spm2bskgnxp2v7jfb66ds2qgxzhzlvd4yhgbf63kqfhlkjl"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -112790,8 +112836,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.18.8"; - sha256 = "084lbgc80hgjbv4grjm3m40i4n092c075whaz33jav0nkbzpmhd0"; + version = "0.18.9"; + sha256 = "0gfvlah265mdc52nxkb2mlq1qblli0fm7lrxhwbggjjssj0jbp05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116160,30 +116206,6 @@ self: { }) {}; "hedis" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri - , resource-pool, scanner, stm, test-framework, test-framework-hunit - , text, time, tls, unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.12.9"; - sha256 = "1j0qismms4ylphm86sn6bkg10c8am234nbp6yw4lngi0axf0iz83"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq errors HTTP mtl - network network-uri resource-pool scanner stm text time tls - unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring doctest HUnit mtl stm test-framework - test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedis_0_12_10" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, stm, test-framework, test-framework-hunit @@ -116205,7 +116227,6 @@ self: { benchmarkHaskellDepends = [ base mtl time ]; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -119455,8 +119476,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "0.11.0"; - sha256 = "1p878194kl4dma6xmp73j4m87yjs7lprjqm3pb81li222fcylz88"; + version = "1.0.0"; + sha256 = "18vhpmhpfam1nbh5fgbcfjnmsnsbkzq9qmr64alldlvwf6brs0kp"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite deepseq exceptions lifted-async lifted-base memory monad-control @@ -122708,8 +122729,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.17.12"; - sha256 = "114m87b5zyjdqk86hxh71vwdl9v1hm6hls49zd1f8rdsiay8kczb"; + version = "5.0.17.13"; + sha256 = "1lbn4ji8l20pvyn5r2cdys0cnxhhac1559q54c6kb4vz4fr0a82p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131928,29 +131949,6 @@ self: { }) {}; "hw-bits" = callPackage - ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim - , hw-string-parse, vector - }: - mkDerivation { - pname = "hw-bits"; - version = "0.7.0.8"; - sha256 = "1yrck20adphrqai9nq8qxyi3l5y7gx9gjvr4vgdzg39mnl6057s4"; - libraryHaskellDepends = [ - base bytestring hw-int hw-prim hw-string-parse vector - ]; - testHaskellDepends = [ - base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Bit manipulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-bits_0_7_1_0" = callPackage ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, hw-int , hw-prim, hw-string-parse, vector @@ -132907,32 +132905,6 @@ self: { }) {}; "hw-rankselect-base" = callPackage - ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec - , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int - , hw-prim, hw-string-parse, QuickCheck, vector - }: - mkDerivation { - pname = "hw-rankselect-base"; - version = "0.3.2.3"; - sha256 = "1gkgbrpklzzfxs5b2w98l5zr48pvdc1l4zll77s2ya7lw0hc69m5"; - libraryHaskellDepends = [ - base bits-extra hw-bits hw-int hw-prim hw-string-parse vector - ]; - testHaskellDepends = [ - base bits-extra hedgehog hspec hw-bits hw-hedgehog - hw-hspec-hedgehog hw-prim QuickCheck vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bits-extra criterion hw-bits hw-prim vector - ]; - description = "Rank-select base"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-rankselect-base_0_3_3_0" = callPackage ({ mkDerivation, base, bits-extra, bitvec, criterion, hedgehog , hspec, hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog , hw-int, hw-prim, hw-string-parse, QuickCheck, vector @@ -136880,25 +136852,6 @@ self: { }) {}; "inflections" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec - , hspec-megaparsec, megaparsec, QuickCheck, text - , unordered-containers - }: - mkDerivation { - pname = "inflections"; - version = "0.4.0.4"; - sha256 = "0lspb0xpfj4q6wrzgss7pfjmr6xb5clj7y686vsairbkpcj3cfcl"; - libraryHaskellDepends = [ - base exceptions megaparsec text unordered-containers - ]; - testHaskellDepends = [ - base containers hspec hspec-megaparsec megaparsec QuickCheck text - ]; - description = "Inflections library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inflections_0_4_0_5" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , hspec-megaparsec, megaparsec, QuickCheck, text , unordered-containers @@ -136915,7 +136868,6 @@ self: { ]; description = "Inflections library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inflist" = callPackage @@ -137215,14 +137167,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "inline-c-cpp_0_4_0_0" = callPackage + "inline-c-cpp_0_4_0_1" = callPackage ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions , template-haskell }: mkDerivation { pname = "inline-c-cpp"; - version = "0.4.0.0"; - sha256 = "10d0yxs3jfkws440wzxrzwcyxjszv8c3f45hbfmj5ln0b0hpfrq0"; + version = "0.4.0.1"; + sha256 = "1bsmm6sqxjzlk6mdq5a8vwsc1cy0ag0lvajdpsbqq7vradj54yqq"; libraryHaskellDepends = [ base containers inline-c safe-exceptions template-haskell ]; @@ -139072,25 +139024,6 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.7"; - sha256 = "0gab5930nvzrpvisx3x43ydnp2rd4fbmy9cq1zpgqy1adx5gx8z6"; - libraryHaskellDepends = [ - appar base byteorder containers network - ]; - testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe - ]; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_8" = callPackage ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec , network, QuickCheck, safe }: @@ -139107,7 +139040,6 @@ self: { ]; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -140461,8 +140393,8 @@ self: { }: mkDerivation { pname = "ixset"; - version = "1.1.1"; - sha256 = "1wjv6jfkv5z5j3af6dg7zlbir780mshq01x2wzlyav5dwr40di3m"; + version = "1.1.1.1"; + sha256 = "1d3h53sq8i8azzr71yi4h5zma2bb2f623gpfw25x2kd4slhpkrgf"; libraryHaskellDepends = [ base containers safecopy syb syb-with-class template-haskell ]; @@ -145945,12 +145877,12 @@ self: { }: mkDerivation { pname = "lambda-options"; - version = "1.0.2.0"; - sha256 = "04h7i79iiq91606x3k7zr2gs3f7apswwv9xxv5lf4qr1h3i4lfix"; + version = "1.1.0.0"; + sha256 = "0ihbwml2l4jyd3h2kj5qz7fxzzkq47xk4fkybhp1rnfzxjlqfib3"; libraryHaskellDepends = [ base containers funspection mtl read-bounded ]; - description = "Declarative command-line parser using type-driven pattern matching"; + description = "Declarative command-line parser with type-driven pattern matching"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -151206,26 +151138,6 @@ self: { }) {}; "lift-generics" = callPackage - ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim - , hspec, template-haskell - }: - mkDerivation { - pname = "lift-generics"; - version = "0.1.2"; - sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf"; - revision = "3"; - editedCabalFile = "0ackkmjfqxyxhy9w03zlqvmi68la9yv4jf0sc8qdhyr5y30ac68s"; - libraryHaskellDepends = [ - base generic-deriving ghc-prim template-haskell - ]; - testHaskellDepends = [ - base base-compat generic-deriving hspec template-haskell - ]; - description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lift-generics_0_1_3" = callPackage ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim , hspec, hspec-discover, template-haskell }: @@ -151242,7 +151154,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lift-read-show" = callPackage @@ -152316,8 +152227,8 @@ self: { pname = "linux-evdev"; version = "0.3.2"; sha256 = "04ajbcvn8i2xa678f3sgbbrn00rxm1k86wrj9n6w2r8h2yda9s9r"; - revision = "1"; - editedCabalFile = "0s7yb9wwh5rp4v2phm5lih29f033rgffldhkm9i2mxsag2qbfg0k"; + revision = "2"; + editedCabalFile = "1gnjyc8q7xq60pm362hwibwh97jw8pv66xvqv88cm9nbh0ccf6q2"; libraryHaskellDepends = [ base bytestring time unix ]; description = "Bindings to Linux evdev input device interface"; license = stdenv.lib.licenses.bsd3; @@ -153382,8 +153293,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.8.2"; - sha256 = "0fv2q05w86xqak5b8w26iy9szzc6khghc622dgqkjywd9b72xs1s"; + version = "0.8.3"; + sha256 = "08d1ywx1m82qdyrcg607mbi7szg7mg4vszbnz4i3rgj9snlqj8hr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153706,8 +153617,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "3.1.2"; - sha256 = "0k5aj63hl78h8lkxizragvgh57yzzc5ns7h8kz93wicsdxaca8cn"; + version = "3.9"; + sha256 = "02x2pq4p9dgal6fri9w1r6dj37m0l8jh0gq6ry2xq0rmq2mz70w4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158405,31 +158316,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest - , data-default-class, deepseq, doctest, exceptions - , mersenne-random-pure64, primitive, QuickCheck, random, scheduler - , splitmix, template-haskell, unliftio-core, vector - }: - mkDerivation { - pname = "massiv"; - version = "0.4.3.0"; - sha256 = "0sydba4dr9y0ap8d0sqr52x1pi2qq56ciznznjgdzz6f5gip667c"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions primitive - scheduler unliftio-core vector - ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 QuickCheck random splitmix - template-haskell - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv_0_4_4_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -163020,8 +162906,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.4.1.0"; - sha256 = "04swk1r6aiakcs52v5n6pa7a2xwvxw60isb24nnhbb6h58xa9zzj"; + version = "0.5.1.0"; + sha256 = "1jmbfs0yi7r9lmaxq3dfyrw1rrwhknb7v4xfhrz3w7s8jg3vqs2x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -164003,29 +163889,6 @@ self: { }) {}; "monad-logger" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , exceptions, fast-logger, lifted-base, monad-control, monad-loops - , mtl, resourcet, stm, stm-chans, template-haskell, text - , transformers, transformers-base, transformers-compat - , unliftio-core - }: - mkDerivation { - pname = "monad-logger"; - version = "0.3.30"; - sha256 = "102l0v75hbvkmrypiyg4ybb6rbc7nij5nxs1aihmqfdpg04rkkp7"; - revision = "1"; - editedCabalFile = "0gm3gqbxkj8447js4a672snz0ir78syk890nqdmjb18hsjqy5p6a"; - libraryHaskellDepends = [ - base bytestring conduit conduit-extra exceptions fast-logger - lifted-base monad-control monad-loops mtl resourcet stm stm-chans - template-haskell text transformers transformers-base - transformers-compat unliftio-core - ]; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_31" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , exceptions, fast-logger, lifted-base, monad-control, monad-loops , mtl, resourcet, stm, stm-chans, template-haskell, text @@ -164044,7 +163907,6 @@ self: { ]; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -164081,21 +163943,6 @@ self: { }) {}; "monad-logger-syslog" = callPackage - ({ mkDerivation, base, bytestring, fast-logger, hsyslog - , monad-logger, text, transformers - }: - mkDerivation { - pname = "monad-logger-syslog"; - version = "0.1.5.0"; - sha256 = "0y96f5qan5na32s8xilky7z30mc7yci1s5i3585aqvqsyyvshchf"; - libraryHaskellDepends = [ - base bytestring fast-logger hsyslog monad-logger text transformers - ]; - description = "syslog output for monad-logger"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger-syslog_0_1_6_0" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog , monad-logger, text, transformers }: @@ -164108,7 +163955,6 @@ self: { ]; description = "syslog output for monad-logger"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-loops" = callPackage @@ -165601,8 +165447,8 @@ self: { pname = "months"; version = "0.1"; sha256 = "000fqmd5j3pxmfa5bpyk5fd0hbn9iq3g5v1slk4hrjdjm8k19wa0"; - revision = "1"; - editedCabalFile = "0d94g382scfwidsqmy417pz19748gs5zx2xykcg4vjwz1j3c47am"; + revision = "2"; + editedCabalFile = "030d693d4acc3zlha2rjzalrqn8i5pyqkw0zdp3i1hjr0694hwaf"; libraryHaskellDepends = [ aeson attoparsec base base-compat cassava deepseq hashable http-api-data intervals lens lucid QuickCheck swagger2 text @@ -169908,22 +169754,6 @@ self: { }) {}; "neat-interpolation" = callPackage - ({ mkDerivation, base, base-prelude, HTF, megaparsec - , template-haskell, text - }: - mkDerivation { - pname = "neat-interpolation"; - version = "0.3.2.4"; - sha256 = "0lhpjckwhzlvx4cdhrwprwb85vc7hc44ybvk5nswgn7z73cp0wyy"; - libraryHaskellDepends = [ - base base-prelude megaparsec template-haskell text - ]; - testHaskellDepends = [ base-prelude HTF ]; - description = "A quasiquoter for neat and simple multiline text interpolation"; - license = stdenv.lib.licenses.mit; - }) {}; - - "neat-interpolation_0_3_2_5" = callPackage ({ mkDerivation, base, base-prelude, HTF, megaparsec , template-haskell, text }: @@ -169937,7 +169767,6 @@ self: { testHaskellDepends = [ base-prelude HTF ]; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "needle" = callPackage @@ -171180,18 +171009,6 @@ self: { }) {}; "network-byte-order" = callPackage - ({ mkDerivation, base, bytestring, doctest }: - mkDerivation { - pname = "network-byte-order"; - version = "0.1.1.1"; - sha256 = "19cs6157amcc925vwr92q1azwwzkbam5g0k70i6qi80fhpikh37c"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring doctest ]; - description = "Network byte order utilities"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-byte-order_0_1_2_0" = callPackage ({ mkDerivation, base, bytestring, doctest }: mkDerivation { pname = "network-byte-order"; @@ -171201,7 +171018,6 @@ self: { testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-bytestring" = callPackage @@ -172803,8 +172619,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.6"; - sha256 = "0805n1dk8w3r2wisqjay36wwvcf4b1f3hx4a368vl2dxw43p9j20"; + version = "0.2.8"; + sha256 = "0nggarlbfc8x5y7rp8n5fdzy3xipykxq4fk6irz1jsz4m6fbi9a4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178778,6 +178594,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pagure-cli" = callPackage + ({ mkDerivation, base, bytestring, http-client, http-client-tls + , microlens, microlens-aeson, optparse-applicative, simple-cmd-args + , text + }: + mkDerivation { + pname = "pagure-cli"; + version = "0.1"; + sha256 = "092frs6240wf4nyqdkhny3jkd4v7gjmnd5gwxv9vlprimszns1vi"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring http-client http-client-tls microlens + microlens-aeson optparse-applicative simple-cmd-args text + ]; + description = "Pagure client"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "pagure-hook-receiver" = callPackage ({ mkDerivation, base, containers, scotty, shelly, text , transformers, unix @@ -178988,25 +178823,25 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_8_1" = callPackage + "pandoc_2_9" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, cmark-gfm, containers, criterion, data-default - , deepseq, Diff, directory, doclayout, doctemplates, exceptions - , executable-path, filepath, Glob, haddock-library, hslua - , hslua-module-system, hslua-module-text, HsYAML, HTTP, http-client - , http-client-tls, http-types, ipynb, JuicyPixels, mtl, network - , network-uri, pandoc-types, parsec, process, QuickCheck, random - , safe, scientific, SHA, skylighting, skylighting-core, split, syb - , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua - , tasty-quickcheck, template-haskell, temporary, texmath, text - , text-conversions, time, unicode-transforms, unix - , unordered-containers, vector, weigh, xml, zip-archive, zlib + , deepseq, Diff, directory, doclayout, doctemplates, emojis + , exceptions, executable-path, filepath, Glob, haddock-library + , hslua, hslua-module-system, hslua-module-text, HsYAML, HTTP + , http-client, http-client-tls, http-types, ipynb, JuicyPixels, mtl + , network, network-uri, pandoc-types, parsec, process, QuickCheck + , random, safe, scientific, SHA, skylighting, skylighting-core + , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-transforms, unix, unordered-containers, vector + , weigh, xml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.8.1"; - sha256 = "0lxlsa26ndp09vmi526cg02lwslfryhyw1xk5vlc6v4jb5i7f46x"; + version = "2.9"; + sha256 = "1j4n7r4rh22ba4m4h3psy2jm3cxfd6pxlbpw0z613z01g30mr90c"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -179015,12 +178850,12 @@ self: { aeson aeson-pretty attoparsec base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive cmark-gfm containers data-default deepseq directory doclayout doctemplates - exceptions filepath Glob haddock-library hslua hslua-module-system - hslua-module-text HsYAML HTTP http-client http-client-tls - http-types ipynb JuicyPixels mtl network network-uri pandoc-types - parsec process random safe scientific SHA skylighting - skylighting-core split syb tagsoup template-haskell temporary - texmath text text-conversions time unicode-transforms unix + emojis exceptions filepath Glob haddock-library hslua + hslua-module-system hslua-module-text HsYAML HTTP http-client + http-client-tls http-types ipynb JuicyPixels mtl network + network-uri pandoc-types parsec process random safe scientific SHA + skylighting skylighting-core split syb tagsoup temporary texmath + text text-conversions time unicode-transforms unix unordered-containers vector xml zip-archive zlib ]; executableHaskellDepends = [ base ]; @@ -179079,7 +178914,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_16_4" = callPackage + "pandoc-citeproc_0_16_4_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc @@ -179089,8 +178924,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.16.4"; - sha256 = "0mnkhyj56pw8cnycf4ny082rz67gii1x6clzhmxi60zafg07v04c"; + version = "0.16.4.1"; + sha256 = "1jbd6g82sn3546kimm0p6n7spfqr3b4dssjkr5v679jwb5w6hwmx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -179143,8 +178978,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.5.0"; - sha256 = "1x01qf7v88f42p6h4mjm8rllxm8jl7bj8rq3512qjksns6qajvk4"; + version = "0.3.6.0"; + sha256 = "0k1wvkjhlwgr8njsrjiivzyb1pbi17y6nxky4pb5wkkg57fd5847"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -183547,6 +183382,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistent-iproute_0_2_4" = callPackage + ({ mkDerivation, aeson, aeson-iproute, base, bytestring + , http-api-data, iproute, path-pieces, persistent, text + }: + mkDerivation { + pname = "persistent-iproute"; + version = "0.2.4"; + sha256 = "1lsprnlgcnj8v38cnbgf2vpj9ivgsvgi3yy3nh1gmvyj7maznkq5"; + libraryHaskellDepends = [ + aeson aeson-iproute base bytestring http-api-data iproute + path-pieces persistent text + ]; + description = "Persistent instances for types in iproute"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-map" = callPackage ({ mkDerivation, base, binary, containers, directory, EdisonAPI , EdisonCore, filepath, LRU, mtl, stm-io-hooks @@ -185523,29 +185375,6 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, semigroups, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; - version = "4.3.12"; - sha256 = "0ni5szs9jl4map05lcyl97dgb69g2xk1a1rdiw8p4024vfyskp8c"; - libraryHaskellDepends = [ - base exceptions mmorph mtl semigroups transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes_4_3_13" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, semigroups, test-framework , test-framework-quickcheck2, transformers, void @@ -185566,7 +185395,6 @@ self: { ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -189432,35 +189260,6 @@ self: { }) {}; "postgresql-binary" = callPackage - ({ mkDerivation, aeson, base, base-prelude, binary-parser - , bytestring, bytestring-strict-builder, containers, conversion - , conversion-bytestring, conversion-text, criterion, json-ast - , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck - , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.12.1.3"; - sha256 = "0y2irx1fw0xqs77qpaa3lk06r2q7j7wzbzriyc274h6lmn85sjdw"; - libraryHaskellDepends = [ - aeson base base-prelude binary-parser bytestring - bytestring-strict-builder containers loch-th network-ip - placeholders scientific text time transformers unordered-containers - uuid vector - ]; - testHaskellDepends = [ - aeson conversion conversion-bytestring conversion-text json-ast - loch-th network-ip placeholders postgresql-libpq QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = stdenv.lib.licenses.mit; - }) {}; - - "postgresql-binary_0_12_2" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, bytestring-strict-builder, containers, conversion , conversion-bytestring, conversion-text, criterion, json-ast @@ -189487,7 +189286,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-common" = callPackage @@ -191868,10 +191666,8 @@ self: { }: mkDerivation { pname = "primitive-containers"; - version = "0.4.0"; - sha256 = "0ljb6np2yxnclqvz2sbpvjs027z701nsdhvmgy607am95sskxlrz"; - revision = "1"; - editedCabalFile = "18pxbfqjy2kfxgq1033bp3ci6xjj1ilnik2v5dzdcqlxr923zvkc"; + version = "0.4.1"; + sha256 = "1gi4fbxdhlzdyi9nnfmfyxl012hs5bam2kgvv8240mq5kxgimf06"; libraryHaskellDepends = [ base contiguous deepseq hashable primitive primitive-sort primitive-unlifted @@ -194105,23 +193901,6 @@ self: { }) {}; "protocol-buffers" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, containers, directory, filepath, mtl, parsec, syb - , text, utf8-string, vector - }: - mkDerivation { - pname = "protocol-buffers"; - version = "2.4.12"; - sha256 = "0z1vkqdhj41bqnjhks4d82jby6l9j91k8ycna76bhv9p2w0gvp4g"; - libraryHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - directory filepath mtl parsec syb text utf8-string vector - ]; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers_2_4_13" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, containers, directory, filepath, mtl, parsec, syb , text, utf8-string, vector @@ -194136,24 +193915,9 @@ self: { ]; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor" = callPackage - ({ mkDerivation, base, bytestring, containers, protocol-buffers }: - mkDerivation { - pname = "protocol-buffers-descriptor"; - version = "2.4.12"; - sha256 = "0h4c1pgl51h7xrsm76mz6wd1l41ps93y3nvdl0p7mks9w7wlpccn"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers protocol-buffers - ]; - description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers-descriptor_2_4_13" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; @@ -194165,7 +193929,6 @@ self: { ]; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor-fork" = callPackage @@ -197852,14 +197615,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rainbox_0_24_2_0" = callPackage + "rainbox_0_24_4_0" = callPackage ({ mkDerivation, base, bytestring, containers, lens, QuickCheck , rainbow, tasty, tasty-quickcheck, text }: mkDerivation { pname = "rainbox"; - version = "0.24.2.0"; - sha256 = "1b1nkw7j24fcmgzkcn92j6c8v6abrhg9580hnwna1b4sjjx6ayak"; + version = "0.24.4.0"; + sha256 = "13532qzpvlq976049bdfyqzhb4g843ij3b7w654xqb2ng9q4inwz"; libraryHaskellDepends = [ base bytestring containers lens rainbow text ]; @@ -197959,6 +197722,45 @@ self: { broken = true; }) {}; + "ral" = callPackage + ({ mkDerivation, adjunctions, base, bin, criterion, deepseq + , distributive, fin, hashable, QuickCheck, semigroupoids, vector + }: + mkDerivation { + pname = "ral"; + version = "0.1"; + sha256 = "0h8jqaapagrp9faixq817lib8l4nq4ycjj6ppl1ra8llnfsz5304"; + libraryHaskellDepends = [ + adjunctions base bin deepseq distributive fin hashable QuickCheck + semigroupoids + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Random access lists"; + license = stdenv.lib.licenses.gpl2Plus; + }) {}; + + "ral-lens" = callPackage + ({ mkDerivation, base, bin, fin, lens, ral }: + mkDerivation { + pname = "ral-lens"; + version = "0.1"; + sha256 = "0hm8mzj51hdql8rp3v0yvmcvmgha4ys8zsgbbx93mlp2b4rfhzpv"; + libraryHaskellDepends = [ base bin fin lens ral ]; + description = "Length-indexed random access lists: lens utilities"; + license = stdenv.lib.licenses.gpl2Plus; + }) {}; + + "ral-optics" = callPackage + ({ mkDerivation, base, bin, fin, optics-core, ral }: + mkDerivation { + pname = "ral-optics"; + version = "0.1"; + sha256 = "0sky2zbh6wn4xlfc6sbrx7lvvy01qv69j80k0n4w9fyrq9ammb3r"; + libraryHaskellDepends = [ base bin fin optics-core ral ]; + description = "Length-indexed random access lists: optics utilities"; + license = stdenv.lib.licenses.gpl2Plus; + }) {}; + "ralist" = callPackage ({ mkDerivation, base, criterion, deepseq, hspec }: mkDerivation { @@ -198201,23 +198003,6 @@ self: { }) {}; "random-fu" = callPackage - ({ mkDerivation, base, erf, log-domain, math-functions, monad-loops - , mtl, random-shuffle, random-source, rvar, syb, template-haskell - , transformers, vector - }: - mkDerivation { - pname = "random-fu"; - version = "0.2.7.0"; - sha256 = "1i5hg74gv6885vnhmyknydhsyrps2h5zjiq4dv992jg3xnrs9cxn"; - libraryHaskellDepends = [ - base erf log-domain math-functions monad-loops mtl random-shuffle - random-source rvar syb template-haskell transformers vector - ]; - description = "Random number generation"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "random-fu_0_2_7_3" = callPackage ({ mkDerivation, base, erf, math-functions, monad-loops, mtl , random-shuffle, random-source, rvar, syb, template-haskell , transformers, vector @@ -198232,7 +198017,6 @@ self: { ]; description = "Random number generation"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "random-fu-multivariate" = callPackage @@ -200312,8 +200096,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.1"; - sha256 = "1l6s793l4xxmm7x6zxinvfi19wdnhvklv7lp15gk0mw43ddmpbv5"; + version = "0.2.2"; + sha256 = "1rxa8dzh0ga9xrlwrwzf5lm9miql9lkmcyiy0nrc3s5lkxdsppww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -201607,8 +201391,8 @@ self: { ({ mkDerivation, base, hsp, hsx2hs, reform, text }: mkDerivation { pname = "reform-hsp"; - version = "0.2.7.1"; - sha256 = "084d03inyplx3n2zykaz2g7gskzs9hcjq8klhlnzpb1b6ahx5va8"; + version = "0.2.7.2"; + sha256 = "1vjbj41yl158h59wcx190jb4s627bhrhcbp21ykn93n4j454kfns"; libraryHaskellDepends = [ base hsp hsx2hs reform text ]; description = "Add support for using HSP with Reform"; license = stdenv.lib.licenses.bsd3; @@ -207957,18 +207741,6 @@ self: { }) {}; "safe" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck }: - mkDerivation { - pname = "safe"; - version = "0.3.17"; - sha256 = "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base deepseq QuickCheck ]; - description = "Library of safe (exception free) functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "safe_0_3_18" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "safe"; @@ -207980,7 +207752,6 @@ self: { testHaskellDepends = [ base deepseq QuickCheck ]; description = "Library of safe (exception free) functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-access" = callPackage @@ -212023,27 +211794,6 @@ self: { }) {}; "semigroupoids" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, Cabal - , cabal-doctest, comonad, containers, contravariant, distributive - , doctest, hashable, tagged, template-haskell, transformers - , transformers-compat, unordered-containers - }: - mkDerivation { - pname = "semigroupoids"; - version = "5.3.3"; - sha256 = "016hc4imr9l4szs3p7f1aahvxr5wv4clvr3qzrm3nibssg5vrs61"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad containers contravariant - distributive hashable tagged template-haskell transformers - transformers-compat unordered-containers - ]; - testHaskellDepends = [ base doctest ]; - description = "Semigroupoids: Category sans id"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semigroupoids_5_3_4" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, Cabal , cabal-doctest, comonad, containers, contravariant, distributive , doctest, hashable, tagged, template-haskell, transformers @@ -212062,7 +211812,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroupoids-syntax" = callPackage @@ -218314,6 +218063,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_1" = callPackage + ({ mkDerivation, base, directory, filepath, process, unix }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.1"; + sha256 = "1b35hsxr63n3nbpjdf7ailsmp4yk6k8nscx8xxv453v0r3v89hss"; + libraryHaskellDepends = [ base directory filepath process unix ]; + description = "Simple String-based process commands"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -220819,28 +220580,27 @@ self: { }) {}; "smcdel" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, base, containers - , criterion, cudd, directory, file-embed, filepath, graphviz, happy - , HasCacBDD, hspec, js-jquery, lens, process, QuickCheck, scotty - , tagged, template-haskell, temporary, text, time + ({ mkDerivation, ansi-terminal, array, base, containers, criterion + , cudd, directory, file-embed, filepath, graphviz, HasCacBDD, hspec + , js-jquery, process, QuickCheck, scotty, tagged, template-haskell + , temporary, text, time }: mkDerivation { pname = "smcdel"; - version = "1.0.0"; - sha256 = "1yi2qw76i9cch1flnqd7gsradkm2gr31i8595rwf11xgvj3r3s3f"; + version = "1.1.0"; + sha256 = "0dz1hbhf3y57cn4hh5s2fscnpw7zjnrl2hl644xl81vbpl1zbzyn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers cudd graphviz HasCacBDD lens process - QuickCheck tagged temporary text time + array base containers cudd graphviz HasCacBDD process QuickCheck + tagged temporary text time ]; executableHaskellDepends = [ ansi-terminal base directory file-embed filepath HasCacBDD js-jquery process scotty template-haskell text ]; - executableToolDepends = [ alex happy ]; testHaskellDepends = [ base containers hspec QuickCheck ]; - benchmarkHaskellDepends = [ base containers criterion time ]; + benchmarkHaskellDepends = [ base criterion time ]; description = "Symbolic Model Checking for Dynamic Epistemic Logic"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -223696,8 +223456,8 @@ self: { }: mkDerivation { pname = "spacecookie"; - version = "0.2.1.0"; - sha256 = "0a8zsywkmbw7rj4iin72l2zcbyzjb0yhpmz6bv226cn0x44iy1nc"; + version = "0.2.1.1"; + sha256 = "0l3knzsqab58yyk6kafpxxh465ncgqr2gi388k89gxwrlcqkl8wr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223710,8 +223470,6 @@ self: { ]; description = "Gopher Library and Server Daemon"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "spacefill" = callPackage @@ -226133,8 +225891,10 @@ self: { }: mkDerivation { pname = "stack2cabal"; - version = "1.0.4"; - sha256 = "1s0icdri5gqk01x7r8gnml4wx1bd2500456iif1dg858c41rgzl6"; + version = "1.0.5"; + sha256 = "15swq7rv997fh1qka7ga5hc90gc889xzkx61910jz3an6sy5zx0p"; + revision = "1"; + editedCabalFile = "15qc686alcfbxjpr7iyi2bxv801cmbkqvncpb6jd0879ll9lznrh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229217,6 +228977,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streamly-fsnotify" = callPackage + ({ mkDerivation, base, fsnotify, paths, semirings, streamly, text + , time + }: + mkDerivation { + pname = "streamly-fsnotify"; + version = "1.0.0.1"; + sha256 = "0w81r0szdf4q8v6n389qlzwslhfwvjf0m9nihxsm1y0jgxbzy5cb"; + libraryHaskellDepends = [ + base fsnotify paths semirings streamly text time + ]; + description = "Folder watching as a Streamly stream"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -231904,8 +231679,8 @@ self: { }: mkDerivation { pname = "syb-with-class"; - version = "0.6.1.11"; - sha256 = "0fgmcxhrhcjcv5nmb5irp6mqcwknpk15azzd0qhajwx8mqpw6b8l"; + version = "0.6.1.12"; + sha256 = "1cxy0mph0kqdi3hzy5x3c754a3sjdn14x64ga4bkhvzi6iwbfcq0"; libraryHaskellDepends = [ array base bytestring containers template-haskell ]; @@ -232835,8 +232610,8 @@ self: { }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.8.2"; - sha256 = "0vf0p1ajs7k327cc1dwm6ja2qyby865g1bqc6mzrjn826dv2vric"; + version = "0.8.2.1"; + sha256 = "0bgla347pfdaai41rp9jny2k1hv0k1s8jdmqhd54v5c60cxl6p9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234364,6 +234139,8 @@ self: { pname = "tar"; version = "0.5.1.1"; sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k"; + revision = "1"; + editedCabalFile = "1ni8zym7k6f1hg6wfvnnf3xcs2ar3z8xaabkgjg8q329arjcm8wp"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -235059,18 +234836,18 @@ self: { }) {}; "tasty-rerun" = callPackage - ({ mkDerivation, base, containers, mtl, optparse-applicative - , reducers, split, stm, tagged, tasty, transformers + ({ mkDerivation, base, containers, mtl, optparse-applicative, split + , stm, tagged, tasty, transformers }: mkDerivation { pname = "tasty-rerun"; - version = "1.1.14"; - sha256 = "0s0zj8ds4g1w2cjzm2lh25ivg962jigqdrbj08v3dbz64lx4mlzr"; + version = "1.1.15"; + sha256 = "008pwf3mqn18vxzxym6zbfm7kf4g415g3722r41vdbh972xkz3w2"; libraryHaskellDepends = [ - base containers mtl optparse-applicative reducers split stm tagged - tasty transformers + base containers mtl optparse-applicative split stm tagged tasty + transformers ]; - description = "Run tests by filtering the test tree depending on the result of previous test runs"; + description = "Rerun only tests which failed in a previous test run"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -235477,8 +235254,8 @@ self: { pname = "tdigest-Chart"; version = "0.2"; sha256 = "1ciq7d187as9sk1dpccm2s02b6jdhij1l477wff0a7labgw21l0l"; - revision = "1"; - editedCabalFile = "1095k2sgyjd5m38j1qxa1df9izzdpjl80lrsmwhjm1jw4lmk8cys"; + revision = "2"; + editedCabalFile = "07fg2pnj06vz2cwyxqyx40ghd0d7p9byazds7lhim4z397gngk0f"; libraryHaskellDepends = [ base base-compat Chart colour lens semigroupoids tdigest ]; @@ -236624,12 +236401,12 @@ self: { , hedgehog, inline-c, lens, mono-traversable, pcre2, pretty-simple , QuickCheck, singletons, tasty, tasty-hedgehog, tasty-hspec , template-haskell, text, transformers, vte_291, xml-conduit - , xml-html-qq + , xml-html-qq, yaml }: mkDerivation { pname = "termonad"; - version = "2.1.0.0"; - sha256 = "0acw3qkph2j5vxl1zw4g21z6xn3w8r6q0v6wpnavd3drzyvw6hyn"; + version = "3.0.0.0"; + sha256 = "11c58k6iyqry5dfdbxsvmca19w10igb4yd1nk2ap6h7zsav2rjgn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -236640,6 +236417,7 @@ self: { focuslist gi-gdk gi-gio gi-glib gi-gtk gi-pango gi-vte haskell-gi-base inline-c lens mono-traversable pretty-simple QuickCheck singletons text transformers xml-conduit xml-html-qq + yaml ]; libraryPkgconfigDepends = [ gtk3 pcre2 vte_291 ]; executableHaskellDepends = [ base ]; @@ -238897,21 +238675,6 @@ self: { }) {}; "th-lift" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction - }: - mkDerivation { - pname = "th-lift"; - version = "0.8.0.1"; - sha256 = "1a6qlbdg15cfr5rvl9g3blgwx4v1p0xic0pzv13zx165xbc36ld0"; - libraryHaskellDepends = [ - base ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base ghc-prim template-haskell ]; - description = "Derive Template Haskell's Lift class for datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift_0_8_1" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: mkDerivation { @@ -238924,7 +238687,6 @@ self: { testHaskellDepends = [ base ghc-prim template-haskell ]; description = "Derive Template Haskell's Lift class for datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-lift-instances" = callPackage @@ -239974,10 +239736,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.10"; - sha256 = "11bzcan2vfhdz6lwfvfgiyycqf30p4kdkzn47pm4ydr6bbpz8aia"; - revision = "1"; - editedCabalFile = "0gm271p3m3y0x9lfi5yviznqfr65f0if553z6h977dqk3f3psyfd"; + version = "0.1.2.0"; + sha256 = "1bw10jahy0s9ai6ryfdx58jzjib146x7kzqkg65z71brvm0cliza"; libraryHaskellDepends = [ base composition-prelude megaparsec text ]; @@ -241688,7 +241448,7 @@ self: { broken = true; }) {}; - "tmp-postgres_1_27_0_4" = callPackage + "tmp-postgres_1_31_0_1" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, base64-bytestring , bytestring, containers, criterion, cryptohash-sha1, deepseq , directory, generic-monoid, hspec, mtl, network, port-utils @@ -241697,8 +241457,8 @@ self: { }: mkDerivation { pname = "tmp-postgres"; - version = "1.27.0.4"; - sha256 = "0iqr0w9yhxxx9ld7bd96zal08q75ca9b9mpifhjj1wll05ml9vdq"; + version = "1.31.0.1"; + sha256 = "0nlg0hi0rcfk77jm927i1w63mh4x9y1p4j3fqbd13c2a6pg084vw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -241717,7 +241477,7 @@ self: { unix ]; benchmarkHaskellDepends = [ - base criterion deepseq postgres-options postgresql-simple + base criterion deepseq postgres-options postgresql-simple temporary ]; description = "Start and stop a temporary postgres"; license = stdenv.lib.licenses.bsd3; @@ -242847,19 +242607,19 @@ self: { }) {}; "tptp" = callPackage - ({ mkDerivation, attoparsec, base, Cabal, directory, doctest, extra + ({ mkDerivation, attoparsec, base, Cabal, directory, extra , generic-random, prettyprinter, QuickCheck, scientific, text }: mkDerivation { pname = "tptp"; - version = "0.1.0.3"; - sha256 = "1h00g4263akyfgirvdw5ylbiskl3hhrx58jar59blj57k0i969wi"; + version = "0.1.1.0"; + sha256 = "0cwjl8531zzl9mmgp7hq9jr9i9m32yf2j016v2p6h3r93kysbhrf"; libraryHaskellDepends = [ attoparsec base prettyprinter scientific text ]; testHaskellDepends = [ - attoparsec base Cabal directory doctest extra generic-random - prettyprinter QuickCheck scientific text + attoparsec base Cabal directory extra generic-random prettyprinter + QuickCheck scientific text ]; description = "A parser and a pretty printer for the TPTP language"; license = stdenv.lib.licenses.gpl3; @@ -243897,8 +243657,8 @@ self: { }: mkDerivation { pname = "tree-sitter"; - version = "0.6.0.0"; - sha256 = "1kdx7axkx34h6jlmpzvmqbabyiqj3yp78bl1qn6aj5c2mql4hi12"; + version = "0.7.1.0"; + sha256 = "1xbgii27xn858373nly4q73y1ghrpv069pxjd5bc30rff611rqvz"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath fused-effects semantic-source split template-haskell text unordered-containers @@ -243914,8 +243674,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-go"; - version = "0.2.0.1"; - sha256 = "1l1phqnsfsi47pqcjn84i8pqxfyslnrhw8an9g6fxx21gc6sdn45"; + version = "0.3.0.0"; + sha256 = "07r8dlx8r3g1sdc23w544clb658wiw5rjl33m967li5sq7g1w1aj"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Go"; @@ -243947,8 +243707,8 @@ self: { }: mkDerivation { pname = "tree-sitter-java"; - version = "0.5.0.0"; - sha256 = "0rmmsp1alyvc94f61qfha5wm0z2605n9wz3yxaac58bqghsqjx8f"; + version = "0.6.0.0"; + sha256 = "1jz740pj2ihmkf06ixii93msfn40lh5mky3qc5bvwk5xqf4ai716"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base semantic-source template-haskell tree-sitter @@ -243968,8 +243728,8 @@ self: { ({ mkDerivation, base, template-haskell, text, tree-sitter }: mkDerivation { pname = "tree-sitter-json"; - version = "0.4.0.0"; - sha256 = "1syd5md8gwxhcfqwvfy4f3rilpn8fr83ib54wa3mmf7165jscwpz"; + version = "0.5.0.0"; + sha256 = "1mq1v81d00l80pg6mji9w1g464hxvgv28djnxany5vy2g38ns7q9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base template-haskell text tree-sitter ]; doHaddock = false; @@ -243985,6 +243745,8 @@ self: { pname = "tree-sitter-php"; version = "0.2.0.1"; sha256 = "0dxszds10fr3zp1vjcj18b44mv6hmbzskmai14x03zgimxgwwaqm"; + revision = "1"; + editedCabalFile = "0k5qq7m0m3imgyhwyakrfjzxf5pjw6p7p3iwm01bj96ya8iy71ia"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for PHP"; @@ -244001,8 +243763,8 @@ self: { }: mkDerivation { pname = "tree-sitter-python"; - version = "0.7.0.0"; - sha256 = "0s86c4jbfp8dbkkqxdq9k28xphx5vrkf2ss1xzjq88bkzz6q7hqy"; + version = "0.8.0.0"; + sha256 = "08a698qqjck0nml11nrgyzvgrjbkanyvfv0x0bqng0w3mjk62yf0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base directory filepath semantic-source template-haskell @@ -244023,8 +243785,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-ruby"; - version = "0.2.0.1"; - sha256 = "1rk49pm93avr9fap8xim7zl26wms50q2f5x2yp9nq5w3mbm3j3sc"; + version = "0.3.1.0"; + sha256 = "0kndnmnhfff4d936irvsc545x3npxqspf21qwwqwn4c5n3ispv2p"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Ruby"; @@ -244037,8 +243799,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-tsx"; - version = "0.2.1.1"; - sha256 = "1r4kr4c0vslw3j2hanzf8wifabfynz5brayd6kz1hpczg8icandm"; + version = "0.3.0.0"; + sha256 = "029dapll3jw4m0fxmbxn3nj4jgi8j777ajyc8zx8m2f12zly3y5i"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for TSX"; @@ -244051,8 +243813,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-typescript"; - version = "0.2.1.1"; - sha256 = "0i8vnc0afqnf8lnl8rmsax6b9pfx3s14s8q35f0h3ghpv9b38bs6"; + version = "0.3.0.0"; + sha256 = "0gkhbsmrjkf6q4bwlhws2zmnkhjval7qrbvqlcnmmvx384aiis72"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for TypeScript"; @@ -244065,8 +243827,8 @@ self: { ({ mkDerivation, base, containers, doctest, mtl }: mkDerivation { pname = "tree-traversals"; - version = "0.1.0.0"; - sha256 = "0wdy1p94096qdc00w8pmbz6qcawc0ivlhy0sg0b3jir0s2ksdccb"; + version = "0.1.1.0"; + sha256 = "0wsa4qxlxk6308smv957by8fmnsnsxnxxga8c66bvnhlr95rg9rk"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest mtl ]; description = "Functions and newtype wrappers for traversing Trees"; @@ -246784,6 +246546,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "typed-digits" = callPackage + ({ mkDerivation, base, doctest, Glob, hspec, hspec-discover, nats + , QuickCheck, singletons + }: + mkDerivation { + pname = "typed-digits"; + version = "0.1.0.0"; + sha256 = "1x2kyvz0bdcy9iqh0222386r4kbj2in7dpll9jn461v4v0s9bgvc"; + libraryHaskellDepends = [ base nats singletons ]; + testHaskellDepends = [ + base doctest Glob hspec hspec-discover QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Digits, indexed by their base at the type level"; + license = stdenv.lib.licenses.mit; + }) {}; + "typed-duration" = callPackage ({ mkDerivation, base, lifted-base, monad-control , transformers-base @@ -247442,6 +247221,24 @@ self: { license = "(BSD-3-Clause OR Apache-2.0)"; }) {}; + "ucd" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, gauge + , regex-applicative, util + }: + mkDerivation { + pname = "ucd"; + version = "0.0.1.3"; + sha256 = "1za494jgm3zml4ik203863kwni6pz5dsw6ssn06bjbyk7l7pbg33"; + setupHaskellDepends = [ + base Cabal containers directory regex-applicative util + ]; + libraryHaskellDepends = [ base util ]; + testHaskellDepends = [ base util ]; + benchmarkHaskellDepends = [ base gauge util ]; + description = "Unicode Character Database — Predicates on characters specified by Unicode"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uconv" = callPackage ({ mkDerivation, base, icu }: mkDerivation { @@ -250645,17 +250442,6 @@ self: { }) {}; "util" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "util"; - version = "0.1.14.0"; - sha256 = "0z3zwn3990nx26xrvdaz9dmlr01477jjfiqcjk5h5qy9h0npc4jd"; - libraryHaskellDepends = [ base transformers ]; - description = "Utilities"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "util_0_1_14_1" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "util"; @@ -250664,7 +250450,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "util-exception" = callPackage @@ -251025,8 +250810,8 @@ self: { }: mkDerivation { pname = "uuid-orphans"; - version = "1.4.3"; - sha256 = "0bfjyc6dg0k7vrd0i1w7ijdld3ns46jdy3dhybh9r2k08kr7fkgy"; + version = "1.4.4"; + sha256 = "1qmlnzqdm9wrczlknw53y91yvdzfjbxs10szxvg9xaa4bj7gs5rw"; libraryHaskellDepends = [ base safecopy text th-lift uuid-types web-routes ]; @@ -252091,17 +251876,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vec_0_2" = callPackage + "vec_0_3" = callPackage ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq - , distributive, fin, hashable, inspection-testing, lens + , distributive, fin, hashable, inspection-testing, QuickCheck , semigroupoids, tagged, transformers, vector }: mkDerivation { pname = "vec"; - version = "0.2"; - sha256 = "0jh3na9nvljvshzij3hca8g2gpbsrp253fqnqzpq4p8bkv8zkfj1"; + version = "0.3"; + sha256 = "0r2jk3jqwn0r4wnpgc8k8i664g3rrs6dkyfsysysn4w10j22j5sr"; libraryHaskellDepends = [ - adjunctions base base-compat deepseq distributive fin hashable lens + adjunctions base deepseq distributive fin hashable QuickCheck semigroupoids transformers ]; testHaskellDepends = [ @@ -252113,6 +251898,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vec-lens" = callPackage + ({ mkDerivation, base, fin, lens, vec }: + mkDerivation { + pname = "vec-lens"; + version = "0.3"; + sha256 = "0i08p7rfmivf03mir7hcbkr7rarji95icsyvi6diclav1jd6fa7q"; + libraryHaskellDepends = [ base fin lens vec ]; + description = "Vec: length-indexed (sized) list: lens support"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "vec-optics" = callPackage + ({ mkDerivation, base, fin, optics-core, vec }: + mkDerivation { + pname = "vec-optics"; + version = "0.3"; + sha256 = "13g0j9hn27jfjlrm7c6bdsb2lhwrg016cal7hdic8azdxgdp8n0a"; + libraryHaskellDepends = [ base fin optics-core vec ]; + description = "Vec: length-indexed (sized) list: optics support"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vect" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -252199,25 +252006,6 @@ self: { }) {}; "vector-algorithms" = callPackage - ({ mkDerivation, base, bytestring, containers, mwc-random - , primitive, QuickCheck, vector - }: - mkDerivation { - pname = "vector-algorithms"; - version = "0.8.0.1"; - sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m"; - revision = "2"; - editedCabalFile = "0ms473xd1d81dbg47kjr9gxqs11ipg2j1kk99q37rhvrbr5xv5l4"; - libraryHaskellDepends = [ base bytestring primitive vector ]; - testHaskellDepends = [ - base bytestring containers QuickCheck vector - ]; - benchmarkHaskellDepends = [ base mwc-random vector ]; - description = "Efficient algorithms for vector arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-algorithms_0_8_0_3" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random , primitive, QuickCheck, vector }: @@ -252232,7 +252020,6 @@ self: { benchmarkHaskellDepends = [ base mwc-random vector ]; description = "Efficient algorithms for vector arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-binary" = callPackage @@ -252748,6 +252535,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "venzone" = callPackage + ({ mkDerivation, ansi-terminal-game, base, containers, directory + , file-embed, filepath, fsnotify, hspec, line-drawing, megaparsec + , microlens, microlens-platform, mtl, QuickCheck, utf8-light + }: + mkDerivation { + pname = "venzone"; + version = "1.0.0.4"; + sha256 = "1jqhv6xi0yn970h0wlzhlhrfwjr44drpwvys9kvfi4di7cg4pc74"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + ansi-terminal-game base containers directory file-embed filepath + fsnotify line-drawing megaparsec microlens microlens-platform mtl + utf8-light + ]; + testHaskellDepends = [ + ansi-terminal-game base containers directory file-embed filepath + hspec line-drawing megaparsec microlens microlens-platform mtl + QuickCheck utf8-light + ]; + description = "ASCII platform-adventure game"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "verbalexpressions" = callPackage ({ mkDerivation, base, regex-pcre }: mkDerivation { @@ -257710,20 +257525,6 @@ self: { }) {}; "weigh" = callPackage - ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: - mkDerivation { - pname = "weigh"; - version = "0.0.14"; - sha256 = "0l85marb5rl9nr1c0id42dnr5i9fk1jciy5h6lywhb34w3hbj61g"; - libraryHaskellDepends = [ - base deepseq mtl process split temporary - ]; - testHaskellDepends = [ base deepseq ]; - description = "Measure allocations of a Haskell functions/values"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "weigh_0_0_16" = callPackage ({ mkDerivation, base, deepseq, ghc, mtl, process, split, temporary }: mkDerivation { @@ -257736,7 +257537,6 @@ self: { testHaskellDepends = [ base deepseq ]; description = "Measure allocations of a Haskell functions/values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "weighted" = callPackage @@ -260486,28 +260286,6 @@ self: { }) {}; "xeno" = callPackage - ({ mkDerivation, array, base, bytestring, criterion, deepseq - , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector - , weigh, xml - }: - mkDerivation { - pname = "xeno"; - version = "0.3.5.1"; - sha256 = "1bdvj5ql0q9i8vb3429d8kl3hyk45r37s23rm76mhwhazhqxcm60"; - revision = "1"; - editedCabalFile = "0d9w9x6lwhvshy4dbvd80ckb9p0g4vcmzy6kvwai9rqmszf89cnh"; - libraryHaskellDepends = [ - array base bytestring deepseq hspec mtl mutable-containers vector - ]; - testHaskellDepends = [ base bytestring hexml hspec ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml - ]; - description = "A fast event-based XML parser in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xeno_0_3_5_2" = callPackage ({ mkDerivation, array, base, bytestring, criterion, deepseq , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector , weigh, xml @@ -260525,7 +260303,6 @@ self: { ]; description = "A fast event-based XML parser in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xenstore" = callPackage @@ -261820,8 +261597,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.31"; - sha256 = "1sbxva4zaj060bigmxivpn4zlz0q1qbq2np8gljdqkjvysjzpbka"; + version = "0.32"; + sha256 = "0x2ki3v0pmhl4bva3qi1xx21axayc4sx1nkzhmk2ap4l0cj52jrd"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -264390,43 +264167,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, bytestring, case-insensitive, cereal, clientsession - , conduit, conduit-extra, containers, cookie, deepseq, fast-logger - , gauge, hspec, hspec-expectations, http-types, HUnit, memory - , monad-logger, mtl, network, parsec, path-pieces, primitive - , random, resourcet, rio, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.16.1"; - sha256 = "0a0yv7wkwvb0n6iia532y9nzrirgnm09pjc8hpm0lx4ff609pgd2"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types memory - monad-logger mtl parsec path-pieces primitive random resourcet rio - shakespeare template-haskell text time transformers unix-compat - unliftio unordered-containers vector wai wai-extra wai-logger warp - word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_17" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, bytestring, case-insensitive, cereal, clientsession , conduit, conduit-extra, containers, cookie, deepseq, fast-logger @@ -264461,7 +264201,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -264898,8 +264637,8 @@ self: { pname = "yesod-ip"; version = "0.5.1"; sha256 = "1gla2w9xi88y9d149n2r18xj5y1bmaykf258nl7x4hrkl0zgdq62"; - revision = "1"; - editedCabalFile = "0w0bw1zj984yl77vz3sx3avdjsck1chm262w64g4w6iaq6b9rbw1"; + revision = "2"; + editedCabalFile = "0yvi3mmknky12dqgjpfwa9nd6sn0n02xal6qcmr37dvnwnl4w87x"; libraryHaskellDepends = [ base http-api-data ip path-pieces persistent text yesod-core yesod-form @@ -265743,31 +265482,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, memory, network - , pretty-show, semigroups, text, time, transformers, unliftio, wai - , wai-extra, xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.8"; - sha256 = "1c8xana3lf79db17mc74q88ygdskhyhvrv325fpwdw00fcwc0fn6"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit memory network pretty-show semigroups text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers cookie hspec html-conduit http-types - HUnit text unliftio wai wai-extra xml-conduit yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_9" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , bytestring, case-insensitive, conduit, containers, cookie, hspec , hspec-core, html-conduit, http-types, HUnit, memory, network @@ -265792,7 +265506,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage From 2d94437a3247951a1b175cef1ff420d44ce30641 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2019 10:43:46 +0100 Subject: [PATCH 055/113] haskell-doctemplates: update override for ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 6f7b3a30ab1..50d4aeb3fc4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -72,7 +72,7 @@ self: super: { # use latest version to fix the build brick = self.brick_0_50_1; dbus = self.dbus_1_2_11; - doctemplates = self.doctemplates_0_7_2; + doctemplates = self.doctemplates_0_8; exact-pi = doJailbreak super.exact-pi; generics-sop = self.generics-sop_0_5_0_0; hackage-db = self.hackage-db_2_1_0; From bd11e12fcc30fd4901db28d707dbdd3751e67f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Tue, 10 Dec 2019 17:59:26 +0100 Subject: [PATCH 056/113] haskell-clay: unbreak the build; it succeeds fine --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d35249cd48d..0645db14eb0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3657,7 +3657,6 @@ broken-packages: - classy-miso - classy-parallel - ClassyPrelude - - clay - clckwrks - clckwrks-cli - clckwrks-dot-com From 69e794d1d884c05d5adeee061735c1e30b34d231 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Dec 2019 11:14:45 +0100 Subject: [PATCH 057/113] haskell-pandoc: update the ghc-8.8.x build to version 2.9 --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 50d4aeb3fc4..49aac23ab80 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -89,7 +89,7 @@ self: super: { microlens-th = self.microlens-th_0_4_3_2; network = self.network_3_1_1_1; optparse-applicative = self.optparse-applicative_0_15_1_0; - pandoc = self.pandoc_2_8_1; + pandoc = self.pandoc_2_9; pandoc-types = self.pandoc-types_1_20; prettyprinter = self.prettyprinter_1_5_1; primitive = dontCheck super.primitive_0_7_0_0; # evaluating the test suite gives an infinite recursion From 9c01e123d62b1c857281eba5dfac1946131c946f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Dec 2019 20:23:23 +0100 Subject: [PATCH 058/113] haskell-src-meta: update ghc-8.8.x build to the latest version This allows us to build the package without the need for patching. The test suite still doesn't compile unfortunately. Closes https://github.com/NixOS/nixpkgs/pull/75594. --- .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 49aac23ab80..b785c531479 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -77,6 +77,8 @@ self: super: { generics-sop = self.generics-sop_0_5_0_0; hackage-db = self.hackage-db_2_1_0; haddock-library = self.haddock-library_1_8_0; + haskell-src-meta = self.haskell-src-meta_0_8_5; + haskell-src-meta_0_8_5 = dontCheck super.haskell-src-meta_0_8_5; HaTeX = self.HaTeX_3_22_0_0; HsYAML = self.HsYAML_0_2_1_0; json-autotype = doJailbreak super.json-autotype; @@ -121,10 +123,6 @@ self: super: { sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5"; }); foundation = dontCheck super.foundation; - haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch"; - sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8"; - }); vault = dontHaddock super.vault; # https://github.com/snapframework/snap-core/issues/288 From 87db34e65f609327aec9ad45a9366540a7269e52 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Dec 2019 20:50:34 +0100 Subject: [PATCH 059/113] gsignond-mail: fix typo in all-packages.nix that caused evaluation errors --- 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 06cbdd971d5..3d5b6a95349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14667,7 +14667,7 @@ in sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { }; oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { }; lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { }; - mail = callPackages ../development/libraries/gsignond/plugins/mail.nix { }; + mail = callPackage ../development/libraries/gsignond/plugins/mail.nix { }; }; ### DEVELOPMENT / LIBRARIES / AGDA From b85286fe667f5c57a221a0e98269235507135c50 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sun, 8 Dec 2019 21:33:07 +0100 Subject: [PATCH 060/113] postgresql: Quote role names when creating database users --- nixos/modules/services/databases/postgresql.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 3bedfe96a18..c8fdd89d0d8 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -339,9 +339,9 @@ in '') cfg.ensureDatabases} '' + '' ${concatMapStrings (user: '' - $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc "CREATE USER ${user.name}" + $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"' ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' - $PSQL -tAc 'GRANT ${permission} ON ${database} TO ${user.name}' + $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' '') user.ensurePermissions)} '') cfg.ensureUsers} ''; From b2d67c08d03679ba1b9a928ac5610ad940846e7f Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sun, 8 Dec 2019 21:40:04 +0100 Subject: [PATCH 061/113] matrix-synapse: Use postgres service to create database and user --- .../modules/services/misc/matrix-synapse.nix | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 50661b873f6..0bda8980720 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -671,43 +671,30 @@ in { gid = config.ids.gids.matrix-synapse; } ]; - services.postgresql.enable = mkIf usePostgresql (mkDefault true); + services.postgresql = mkIf (usePostgresql && cfg.create_local_database) { + enable = mkDefault true; + ensureDatabases = [ cfg.database_name ]; + ensureUsers = [{ + name = cfg.database_user; + ensurePermissions = { "DATABASE \"${cfg.database_name}\"" = "ALL PRIVILEGES"; }; + }]; + }; systemd.services.matrix-synapse = { description = "Synapse Matrix homeserver"; - after = [ "network.target" "postgresql.service" ]; + after = [ "network.target" ] ++ lib.optional config.services.postgresql.enable "postgresql.service" ; wantedBy = [ "multi-user.target" ]; preStart = '' ${cfg.package}/bin/homeserver \ --config-path ${configFile} \ --keys-directory ${cfg.dataDir} \ --generate-keys - '' + optionalString (usePostgresql && cfg.create_local_database) '' - if ! test -e "${cfg.dataDir}/db-created"; then - ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \ - ${pg.package}/bin/createuser \ - --login \ - --no-createdb \ - --no-createrole \ - --encrypted \ - ${cfg.database_user} - ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \ - ${pg.package}/bin/createdb \ - --owner=${cfg.database_user} \ - --encoding=UTF8 \ - --lc-collate=C \ - --lc-ctype=C \ - --template=template0 \ - ${cfg.database_name} - touch "${cfg.dataDir}/db-created" - fi ''; serviceConfig = { Type = "notify"; User = "matrix-synapse"; Group = "matrix-synapse"; WorkingDirectory = cfg.dataDir; - PermissionsStartOnly = true; ExecStart = '' ${cfg.package}/bin/homeserver \ ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } From 6005fb02fcb9b9f1be2dad681057ad592f31fd8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Haudebourg?= Date: Fri, 13 Dec 2019 20:41:20 +0100 Subject: [PATCH 062/113] renoise: 3.1.0 -> 3.2.0 --- pkgs/applications/audio/renoise/default.nix | 28 ++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 62625aa421d..7b2d92ad59d 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -4,8 +4,7 @@ with stdenv.lib; # To use the full release version: -# 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version -# for your machine to some stable location. +# 1) Sign into https://backstage.renoise.com and download the release version to some stable location. # 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. # Note: Renoise creates an individual build for each license which screws somewhat with the # use of functions like requireFile as the hash will be different for every user. @@ -15,25 +14,20 @@ in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.1.0"; + version = "3.2.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then if releasePath == null then - fetchurl { - url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; - sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; - } + fetchurl { + urls = [ + "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" + "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" + ]; + sha256 = "0cfczzpk1ddz61nk4d72fydbm5nbgxqp95v81by2n87s1wffjjhi"; + } else - releasePath - else if stdenv.hostPlatform.system == "i686-linux" then - if releasePath == null then - fetchurl { - url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2"; - sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; - } - else - releasePath + releasePath else throw "Platform is not supported by Renoise"; buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ]; @@ -69,6 +63,6 @@ stdenv.mkDerivation rec { homepage = https://www.renoise.com/; license = licenses.unfree; maintainers = []; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } From bc5f25a71411df9840cc1899ad5c6535d6b6bad2 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Thu, 12 Dec 2019 04:19:00 +0100 Subject: [PATCH 063/113] jd-gui: 1.4.0 -> 1.6.5 --- pkgs/tools/security/jd-gui/default.nix | 48 ++++++++++++++++---------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 213f7c30051..86b88638bd7 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText, runtimeShell }: +{ stdenv, fetchFromGitHub, jre, jdk, makeDesktopItem, perl, writeText, runtimeShell }: let - version = "1.4.0"; - name = "jd-gui-${version}"; + pname = "jd-gui"; + version = "1.6.5"; - src = fetchurl { - url = "https://github.com/java-decompiler/jd-gui/archive/v${version}.tar.gz"; - sha256 = "0anz7szlr5kgmsmkyv34jdynsnk8v6kvibcyz98jsd96fh725lax"; + src = fetchFromGitHub { + owner = "java-decompiler"; + repo = pname; + rev = "v${version}"; + sha256 = "0yn2xcwznig941pw2f3wi8ixz1wprxcn9wl0g2ggdzx51rfwgzzi"; }; deps = stdenv.mkDerivation { - name = "${name}-deps"; + name = "${pname}-deps"; inherit src; - nativeBuildInputs = [ gradle_2_5 perl ]; + + nativeBuildInputs = [ jdk perl ]; + + patchPhase = "patchShebangs gradlew"; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d); - gradle --no-daemon build + ./gradlew --no-daemon jar ''; # Mavenize dependency paths @@ -25,11 +30,12 @@ let find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ | sh + cp -r $GRADLE_USER_HOME/wrapper $out ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1apmqiphnav79m4rdii58h7f4qslpfig4qybyyl2fr7zk92gv3l9"; + outputHash = "1s4p91iiyikrsgvpzkhw3jm5lsm0jpzp7iw7afdhhl9jm18igs70"; }; # Point to our local deps repo @@ -59,18 +65,24 @@ let comment = "Java Decompiler JD-GUI"; desktopName = "JD-GUI"; genericName = "Java Decompiler"; - mimeType = "application/x-java-archive;application/x-java"; + mimeType = "application/java;application/java-vm;application/java-archive"; categories = "Development;Debugger;"; + extraEntries="StartupWMClass=org-jd-gui-App"; }; -in stdenv.mkDerivation { - inherit name version src; +in stdenv.mkDerivation rec { + inherit pname version src; + name = "${pname}-${version}"; - nativeBuildInputs = [ gradle_2_5 perl makeWrapper ]; + nativeBuildInputs = [ jdk ]; + + patchPhase = "patchShebangs gradlew"; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon --info --init-script ${gradleInit} jar + cp -r ${deps}/wrapper $GRADLE_USER_HOME + chmod u+w $GRADLE_USER_HOME/wrapper/dists/gradle*/*/*.lck + ./gradlew --offline --no-daemon --info --init-script ${gradleInit} jar ''; installPhase = let @@ -83,18 +95,16 @@ in stdenv.mkDerivation { cat > $out/bin/jd-gui < Date: Fri, 13 Dec 2019 14:23:47 -0600 Subject: [PATCH 064/113] emacsMacport: add version attribute Changes in https://github.com/NixOS/nixpkgs/pull/74936 depend on emacs derivations to have a version attribute. --- pkgs/applications/editors/emacs/macport.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 649997171e9..e9307c7e80b 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -4,10 +4,12 @@ }: stdenv.mkDerivation rec { - emacsVersion = "26.3"; - emacsName = "emacs-${emacsVersion}"; + pname = "emacs"; + version = "26.3"; + + emacsName = "emacs-${version}"; macportVersion = "7.7"; - name = "emacs-mac-${emacsVersion}-${macportVersion}"; + name = "emacs-mac-${version}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; From 34cc9d7fa29af98cf7f3782118b32ba404231c06 Mon Sep 17 00:00:00 2001 From: Free Potion <42352817+freepotion@users.noreply.github.com> Date: Sat, 14 Dec 2019 01:43:20 +0300 Subject: [PATCH 065/113] harmonist: 0.2 -> 0.3.0 --- pkgs/games/harmonist/default.nix | 4 ++-- pkgs/games/harmonist/deps.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index a391a73069a..19074a309dd 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "harmonist"; - version = "0.2"; + version = "0.3.0"; goPackagePath = "git.tuxfamily.org/harmonist/harmonist.git"; src = fetchurl { url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz"; - sha256 = "1r78v312x2k1v9rkxkxffs5vxn9sc0dcszm66yw10p7qy9lyvicd"; + sha256 = "16bh4zzq7szwcw19n34bslkf81fz3i0p4zqkd8gdi5ixkbm998lm"; }; goDeps = ./deps.nix; diff --git a/pkgs/games/harmonist/deps.nix b/pkgs/games/harmonist/deps.nix index c65c0e33998..68290823625 100644 --- a/pkgs/games/harmonist/deps.nix +++ b/pkgs/games/harmonist/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "eeb6cd0a176293eeb2c69270d83835972e3567bc"; - sha256 = "14695dk07dj41s5f74l3wdf3xjj2flq4fq016i98f5xijh5f64i3"; + rev = "93860e16131719fa9722e7c448dbf8c0e3210a0d"; + sha256 = "03hz060cy8qrl4kgr80pbq6xvr38z4c6ghr3y81i8g854rvp6426"; }; } { @@ -13,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; - sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; + rev = "18c3d09a134a52720932bbaa92c798a0ab111004"; + sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; }; } ] From 0ee049be99f598035a4318c3309801cdd9230c56 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sat, 14 Dec 2019 01:00:11 +0200 Subject: [PATCH 066/113] starship: 0.29.0 -> 0.30.1 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 820c6c5d17c..4fdc2bbda2a 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.29.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "07haspmx0wid472jc8p92xqqf34rchc0jzx09089p9jcxi6qdv4y"; + sha256 = "19h6ahbqfrq5jfdjqxd7phzh1lanqqvkb1phr4fx6qnn5icj9hlm"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "19j7z0223f1yqhdgxgmzrl3ypx6d79lgccdacsmgnd8wgwxx05zg"; + cargoSha256 = "0391l44rqshjz62658mfl58c2npv7k11l4lb4kk9gb3ywdhbjv26"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { From 1bb1ac5b50951e2a850b34447d7fc37272bf6970 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 13 Dec 2019 01:19:48 -0800 Subject: [PATCH 067/113] vimPlugins: sort --- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 17245014844..5beb743b594 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -15,8 +15,8 @@ andviro/flake8-vim ap/vim-css-color arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 -ayu-theme/ayu-vim autozimu/LanguageClient-neovim +ayu-theme/ayu-vim bazelbuild/vim-bazel bbchung/clighter8 benmills/vimux From fcf9cb2c157196816a88a429c293bdeee8e993f5 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 13 Dec 2019 01:23:02 -0800 Subject: [PATCH 068/113] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 306 ++++++++++++++-------------- pkgs/misc/vim-plugins/overrides.nix | 6 +- 2 files changed, 156 insertions(+), 156 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d7933ba3b69..88640f3f57f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -39,12 +39,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2019-08-04"; + version = "2019-12-08"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "4fc0a0a95a347b7b98715a78b6f41edd5aa084c5"; - sha256 = "15zzc1aqzflw36462ka5914cmfqckciqcgcff0kfmzglfcx7is6z"; + rev = "fbb55d9ef8829630ea8f12c112bebc69c7a15337"; + sha256 = "0fg43ggaxpnybc9ism4b5q7l0n6rdgh4vkpch80x89mwld287lqv"; }; }; @@ -204,12 +204,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2019-12-03"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "335e67e32865259c8a1f27a08fd1260a8cb1897b"; - sha256 = "1n35sf4v1piww31kqzg88s4xb5gdsxqgjvfmlif16na1kdvyjwd5"; + rev = "6d6ac26c537b996819eda9f0cf8f303d10048c10"; + sha256 = "120bx0wskkpk2r05sv74430270lf3c5j1z02bd05i9747dbjcgq5"; }; }; @@ -413,12 +413,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-11-25"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "c3d8bca71ba4cbf6eefdd24e77e62b595dcff856"; - sha256 = "0djmzw782m8vy3sfff3gnnib4iz3wilvjv4hagv7mhzcf2lzswsb"; + rev = "6dde4a564e33251d6745631fcf3168663cad7551"; + sha256 = "1w6cln4ac6df4ka7q4wkv303sh5bmgfzl7gck2v2n5fff7yhrqxq"; }; }; @@ -435,12 +435,12 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2019-12-02"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "97a757cadecabd5a1bf0ed0eb831535d7011ecbd"; - sha256 = "0ygsiplb4slw7vf72njiy3cxslflnihr3qfi9i802dc9p02w4sl8"; + rev = "08ad1b1565960b41005bedbbd051f90c8edacc3c"; + sha256 = "0wfjs9hj11b0zfryfa2jnclgx4sfml9wvpjbwdqhhzz20ahc1jsh"; }; }; @@ -479,12 +479,12 @@ let coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2019-11-23"; + version = "2019-12-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "1c7df237f76a50f25e8bbe3d8bec897991ca86b2"; - sha256 = "0q9i1lz4id9c3d4lch3fxkh8qg9v59vh3kin9h2qdnp3xwgfcvjr"; + rev = "c899418e8fae4a8c3eb15fee48513ae050b11d60"; + sha256 = "0sipvs8r8i239l2334k4qnhwpaijwd524q598rp4ma34ry42c2xl"; }; }; @@ -501,12 +501,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-10-24"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "1294af604d65b66bac4ff05e159dc0bd0adb8710"; - sha256 = "093q9gx7fkahyk082gkawgvakzimvhhxazxhrdvmzsqs07yjxjmc"; + rev = "3ffd09dad94f6f41dd03cf3cec2a6b92a7028702"; + sha256 = "1qrkgva9yjjbjyflwaqfk84ia2vd5956ikjkmjfhd3gd52kh7hlg"; }; }; @@ -534,12 +534,12 @@ let coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-09-12"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "cb787892b860a53fea65954b4afa32331ab17851"; - sha256 = "0c7hk8alggvz837w48fqiz3d01z56pxg2qss13qpp01kvvw12np6"; + rev = "f72b4f47109918cc6ad43b42ed566bec61feff8e"; + sha256 = "1jaj6qsascdpdyz0g8yvi7bcxf4jwcrb0766x4dsmfk9r7prxifl"; }; }; @@ -567,12 +567,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-11-23"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "4f493d6c35bfef71ec21e8db648bcabda5f9ad21"; - sha256 = "1n1b9ss5cjmn5vazfmy97x88s4nqw6f2mwvnqbnvx3cjrpwvyjy6"; + rev = "1f76767ffb0c79a8917b122c8091dbcdf71aa824"; + sha256 = "0p6pkhq4y69ib408g2r3a20ycfh8yyr8a5jld9snc1jpb8vi0m1l"; }; }; @@ -622,12 +622,12 @@ let coc-yank = buildVimPluginFrom2Nix { pname = "coc-yank"; - version = "2019-11-23"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yank"; - rev = "1d145660c81cf4f160965feb12ea69129d1cce3e"; - sha256 = "1sdpkr1rkvqaiixiddd5a0095di071nxr2gvnikb4pnzrknacngk"; + rev = "79c5a97c9b7122180b869f90f7f011934f3ae8f5"; + sha256 = "0dqz759aw0zlmgwrkv8ia45sdl27hb63ilawm9awzbl99w02psjf"; }; }; @@ -733,12 +733,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2019-06-04"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "f8d24584b01cc72e1a3bee640099a7d9bae98102"; - sha256 = "112spld65z56zbgd0zm2p1psc8g728pbd8gig0az1lnbxp3pl3jc"; + rev = "3128891191d7e363d39cbe70b96281ec8d897bcb"; + sha256 = "1qapfsk4z637rqi9mppac50gliyi957cvl2dfknq0dy856a11274"; }; }; @@ -843,12 +843,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-12-05"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f9567a0e9a8af56a33961192bbbbe93ada60155d"; - sha256 = "1q20r409cxhywj5yzimirrj2aa1p6s4d1y4y429g8zl2qn9nr2fw"; + rev = "aab3c42c59e6bf6859abe98a5fc8b822b1230901"; + sha256 = "0b850f6alikb4wyq563hi7g4dgifa0iz797952zrd3khkil602fb"; }; }; @@ -911,12 +911,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-12-07"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "331237df98f67a821715aec06cd3ff5784b10220"; - sha256 = "0q0400il4lh39lvnfbshzs7mc4n3fkwgs1m47pglm31305g1mx1b"; + rev = "341d141bb328fb3aaae83be74b802283f984a873"; + sha256 = "1f2fvqdn39gdn0r6qnfdvnfcs6pcrl44ac85d2gsd9knp3bykpgc"; fetchSubmodules = true; }; }; @@ -934,12 +934,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2019-12-03"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "dbac6111ae250e845070075f63a3d81fd6320815"; - sha256 = "1p55jk21l6qd16vh0yh0zilxqz8dpksis1w7ildjwhd5f8b8ach0"; + rev = "a93369059942070687c23da4dac96a718c88a36d"; + sha256 = "0xxj5s7c4f2l57wjcb6py53jb2szl26jccwngfn1j2andkzs9a94"; }; }; @@ -978,23 +978,23 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-12-05"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "e3c1f55b6c9fda704b963558729c716e13d41244"; - sha256 = "061vkq62rn83qwj6v01ahqawv4crscjad2hzmgzkffggjqfy5kzv"; + rev = "e9aad25f28b68581cea2d94400b9fa64b724773b"; + sha256 = "0wy5qapj6hfxj4ir38lb823zsgj6nqhi4r2sv0bm23g25sykg6ry"; }; }; dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2019-12-06"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "13f70cf593193be45486dc502bcff473b8afc11d"; - sha256 = "0qcb6wkdj7yvlq5drral4ik6s3ay5h512yh19789jcjgyv7mw9ak"; + rev = "5be708edaa89c93a585ed0ba04339c4f857dae3a"; + sha256 = "02s2wwd07qr2396hy3j3nw9f39ymahr9gpfsidrx4f1l4yb235in"; }; }; @@ -1022,23 +1022,23 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2019-12-07"; + version = "2019-12-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "7fb542ca1eedc2a214279523aba4b0f095fa5f19"; - sha256 = "1pn18a9jip9qfp1j4kqpy7kkj5xggbiw24nqn5b5gfrha5vw6s3h"; + rev = "e20bff5f3ef4ea29b64f386fa1994281832863d0"; + sha256 = "15xsin3wv7gba0wd7766ylgl9k32xzk0crv3liqmxsn5kgggkcxa"; }; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2019-11-28"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "2ad3d7882d2e9622a7fdc1a5ba1c5d0064d89472"; - sha256 = "00cyvjzn2sr49fvjfsxv0rj7kmdr2m2xlcpqvnfamh6l19nagb35"; + rev = "53c56fcf358ca36b00b9cbf7dd70642c8922fdd0"; + sha256 = "1i0sk2s10ac5lagvn74m21lxsss1h4nfnn51lxnaflqbvlba4rln"; fetchSubmodules = true; }; }; @@ -1090,12 +1090,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-12-07"; + version = "2019-12-08"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "0c50419eb0babd6ad80c75e56b444a397f6c2bd3"; - sha256 = "1x1vd83m9l6sfgz224q53h0x0kv8myp4j5j7a24z4jsj7rv3gm0q"; + rev = "2753e2dae9317c63da3ec3601a7a5bb6f255e41b"; + sha256 = "06y52dh0l82xchjsv3fbch7s2lvqkq16zsi31pizszkqimbc51s2"; }; }; @@ -1212,12 +1212,12 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2019-11-27"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "c7ab3c0f6efbe68e864273ad460ab06905930bd0"; - sha256 = "1h46s31miyd3j8shmrs61phkljj7qp9bkclcx1l0yd4cppm3vi06"; + rev = "7e531d18506ec307e8d5df8229ca10617caa4f5a"; + sha256 = "1ax3sn0j49bkc8zajvn30yqgmlrv6m5bf6jpa7l3r5qps83bcmb1"; }; }; @@ -1311,12 +1311,12 @@ let gv-vim = buildVimPluginFrom2Nix { pname = "gv-vim"; - version = "2019-11-29"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "f12b8b80897c1214327e6075abc007ec6e55a691"; - sha256 = "0fb0zsmpx1vbdfh3d04dpgy2gkd4wkdn05jflcpr5cyf50zr1z9y"; + rev = "a18f4465974dfbd53f1ea33bfbbcc8a32baf1b4b"; + sha256 = "1b4y39zqjggqw6sybmr73di3grhnk19xb5jvyckjb43rp8nxrr00"; }; }; @@ -1465,12 +1465,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-12-05"; + version = "2019-12-08"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "ac6b2f1e3ec091c53d519fce04751fe96fdc2d3f"; - sha256 = "0a7pl1y82yq8gls7yp034gpxchfz3pllkw16kczhgih49w87m00k"; + rev = "c80a08d9835565bb8988d6314dfec616f70c53da"; + sha256 = "0s86i6s0qwghcfb7a3mxy2cbzh001hw860dsaaf2jprnwsvs2p1q"; fetchSubmodules = true; }; }; @@ -1631,12 +1631,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-11-10"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "e6f282f5e9ae931f0b404dd15aab2e5e249ae092"; - sha256 = "0ymb55gln97xzq94slghrmyrvn10jnh6547ci44gw1lq655c7wvb"; + rev = "ef6df46efe5ac5289f084045e57c492205bd08b5"; + sha256 = "01nrkjh18qd65kbnrw9s2kdb2ml5a7648zvqzyjxw1mcqpw57838"; }; }; @@ -1895,12 +1895,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2019-11-07"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "b8350cbbcdc951e1bac962f8339b011e2632d03f"; - sha256 = "11k3a8qgkl5wrk0wxhpnsvpcf5ymbb4kmnlp0k253ga6yhlxspmx"; + rev = "84057dd1dd28e1198d0b2777301ef6cafd8f2cef"; + sha256 = "164077vmqf4kcj0kn5c027faa4fjzfdbl1cz4j45dxpbak36hy6w"; }; }; @@ -1917,12 +1917,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2019-11-11"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "18e7924ac96fb59a2a88c5a5a9ac1a7ec2fda297"; - sha256 = "0cn158gngglll23vfyk2bpcvw606xg0lj39yzn8pnl2gfg3476fs"; + rev = "9f0e71200274fc7906df1284d18d43c127214c2c"; + sha256 = "0shg7a66w8l6g872fgpf59sialc8gs3nx9h1awgngy0kk0m17ilq"; }; }; @@ -1950,12 +1950,12 @@ let neoyank-vim = buildVimPluginFrom2Nix { pname = "neoyank-vim"; - version = "2019-03-27"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoyank.vim"; - rev = "6a41fd651c00b1ff6a6298cb2be088e8d27d3629"; - sha256 = "1p084xbycwkghfih41z1sc6nn2xi7471vj8zgc9jgw0qkxbmbcnn"; + rev = "1829c6e426f829edea46660d0db08d4488010fcd"; + sha256 = "1y6fvxqpj3rwf1fmjib177lqzh3z7syp7bccn79g1j8177m515w6"; }; }; @@ -2236,12 +2236,12 @@ let quickfix-reflector-vim = buildVimPluginFrom2Nix { pname = "quickfix-reflector-vim"; - version = "2018-08-12"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "stefandtw"; repo = "quickfix-reflector.vim"; - rev = "c76b7a1f496864315eea3ff2a9d02a53128bad50"; - sha256 = "02vb7qkdprx3ksj4gwnj3j180kkdal8jky69dcjn8ivr0x8g26s8"; + rev = "8e9c05a110b80ab66fc8bc3d5fe9e6fa168aada6"; + sha256 = "1i8453z3s0xmbmbzk3kpxwvd42ar9v2m2gjqic9k7njpxw87czvs"; }; }; @@ -2412,12 +2412,12 @@ let seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256-vim"; - version = "2017-09-05"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "1475b7610663c68aa90b6e565997c8792ce0d222"; - sha256 = "03gqw14f5cirivcg1p06g500ns066yv5rd0z3zikvn4ql7n278dk"; + rev = "b68f4032c49b64065072b449dc0f0f1f30616d8d"; + sha256 = "0bxw0ks5gndzrgixa6xqhnf78b7n75w2jnc3s6bv75lz0fn0gypx"; }; }; @@ -2632,12 +2632,12 @@ let targets-vim = buildVimPluginFrom2Nix { pname = "targets-vim"; - version = "2019-10-27"; + version = "2019-12-08"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "be309773998ca729213206950109a758be15b556"; - sha256 = "0ravnykqlhw09cz5yyjm6k4kbikx39jagmmpj87q31pgf1rzycmx"; + rev = "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d"; + sha256 = "192wq3x64x11nm2jhs4yrc627b0lh002dfnj72xrc7jak9vbdps9"; }; }; @@ -2776,12 +2776,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2019-11-19"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "c309637e0243b71f7e3265ebe3cffdfe9674cfbc"; - sha256 = "1q2miwd56k2l7lfwmw3khqnfry9izaca91dcf32p0xp06bc3ah28"; + rev = "3a8b0548b3efd01bff0393f8f32228786149806c"; + sha256 = "10mnhlkxrzl008q7cfv3j78p1bd1dqmprpnmcz8nc6mmkldnflri"; }; }; @@ -3095,23 +3095,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-12-02"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "2daef1bcb8b240c303ef34c3348ee1af071963b4"; - sha256 = "1q806acihhv4yshd8pna7gs383yxs7mw2rnqm4c016sqhb20ba1i"; + rev = "9f00b402c56bd511519ef90e689a982898365683"; + sha256 = "125plpda06i2mjp1ivhhln3ss3ij4bhn3pvvv88qb97zhw8xlmdg"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2019-12-02"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "fe89bb50a15492c76a9fc55e0cff410f3d5f8b0f"; - sha256 = "01qplr1md3vzwrd7as2dkm8f4qvx4qcpgaw3q9i7s2i4yv80qnn8"; + rev = "a8947186c095b9a639ef56f10d0ee1ca5893b1db"; + sha256 = "193vq6ybgj58pmbh0gsbsvn8zxb42p8ipms22hj3yb0v4lkg8lws"; }; }; @@ -3634,12 +3634,12 @@ let vim-flagship = buildVimPluginFrom2Nix { pname = "vim-flagship"; - version = "2019-11-13"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-flagship"; - rev = "d3e1b07a426b44cdf068d3fc4b7549cba2eb3358"; - sha256 = "095dz37qspjjg7sx22mmxnda6p592bp3bmnc59n0nan9g3zy8yk2"; + rev = "e522bd0ffb0e329f695ead7d4288a6245ff22410"; + sha256 = "0vqkdzd7b204kbinn12jk306kc9bn2f0yaifj49swd0g8hv6dk4b"; }; }; @@ -3700,12 +3700,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-12-06"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5d37b17e3447edafa418550f2b19e0226b4c7824"; - sha256 = "1nk113y3ilrim94wd33c1jpvysbyxn6w0z8nd420jnsfrk4jfcc4"; + rev = "b68b6d4329d9bee58a521e0ff8c6adbbc53915b4"; + sha256 = "1lrx2vk6bj10sy297mby4fqjrn09s7ghq2xjbp8z2ajww4pcxp05"; }; }; @@ -3777,12 +3777,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-12-05"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "106edc862b923f9fbf046aee74b5fc805cd7d13f"; - sha256 = "1b2iqvilr7j0sx3q6jfpnl37h1h2dqwd8n2d5zcswl1m0fnyi1kr"; + rev = "8e6fcae371918fa8ebae088ce8e71de7df8cdbca"; + sha256 = "04gw6f1gmk916l7m0phh9aj0h8kd2fm156ylbgjkwg46dphs27xa"; }; }; @@ -3799,12 +3799,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-11-19"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "d8fa51d4fa99221511dc8b9e2eb1cba23a9b0c20"; - sha256 = "1wb4g5g1phixqwpj9nd261f690ziimy80w12pjivrik20bj17ipd"; + rev = "dde6a660c7dd4e02b331da238ea477770073aca2"; + sha256 = "0c411yg2s6wb8141lqpgasg7iwgvfwy88z6l0c0gccmk8knypxhm"; }; }; @@ -4141,12 +4141,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-11-19"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "8b96cea873612b35ddfd7aef4b6c21f991103f0f"; - sha256 = "18ilra7s29jl7k3nda2z3r7bvixk5b8bbfn9d3nvfz7l26n8s6i6"; + rev = "0d07dc85ba5a14b7e95f1f36539741d99c632bfb"; + sha256 = "1wxxln76mk5wd73pmaf67kv2q7gj6rb9zdfgx4hqx0jdcywhrjnw"; }; }; @@ -4361,12 +4361,12 @@ let vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2019-12-01"; + version = "2019-12-07"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "92f0206dae54439bec6503c649263e38167011a9"; - sha256 = "1ygsb16ha7kxns1f1km7j3br9c0ylf8pan5z46bnmixcbvia53gb"; + rev = "137b7e5c671b4b376b2df7492c4023ac6e1439da"; + sha256 = "1pv19ylhifd32p8jb8rvbd8l5wik7349q4m4f8a8qycab2ba5xhv"; }; }; @@ -4493,12 +4493,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2019-10-12"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "5099025d0b632a5e56fa457f826153cd37c48d3c"; - sha256 = "145x60yxzxga92ix4pp0rac5r9r61jgqr8s0l991zz30jxcv1qy2"; + rev = "554e3edfe8a1f3d9bdc14e0ea27c6600f9fdc4d5"; + sha256 = "0mg4hvfylk2ygz9fg2h8a44z8vbvi1pvydlafx6mx6n2a19p9ghl"; }; }; @@ -4581,34 +4581,34 @@ let vim-peekaboo = buildVimPluginFrom2Nix { pname = "vim-peekaboo"; - version = "2019-08-11"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-peekaboo"; - rev = "9d3c7f39a6771496fac5f730ae7574bc57da21b4"; - sha256 = "0r61r0s01nn4n153k60dlhr3l0sfj0gcx4y5ry7cvixl85b6y505"; + rev = "cc4469c204099c73dd7534531fa8ba271f704831"; + sha256 = "11lgf60v2kj772d9azkfddypwidcgfps5mvnhmp4gg0fmfx12h99"; }; }; vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2019-11-22"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-pencil"; - rev = "9aead49ecfd0640e07fdf30fb149dc7d072051eb"; - sha256 = "189mqxsawdpb68vs9gpkh6flm00m3zhh744awwjd433dhyhz07fx"; + rev = "09458527601fdb2fbd174317bdddfb34e4c64e79"; + sha256 = "09b30cxlwbr9l07ya05is9q2y9vzbzhcc656nvjjzf968l496xr2"; }; }; vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-12-07"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "897ce5e2fad66bdb39dc94894f16dde89eee87f7"; - sha256 = "1ydfdi6svq91aws9g5frcy5j7cjyxk8sphjzn739z7y5fc6lnbwx"; + rev = "359ce90b9b37442974fd3ccd9279493d85efb3af"; + sha256 = "1dbdnyfzhfgn70jgcd0a079b76s4gdv9ykslmfiaiv7bvlmhs08s"; }; }; @@ -4625,12 +4625,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-11-28"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "15aeea662e0b08088ac7b6e3ee661c834e69106a"; - sha256 = "1x7xx12hdydn37hb2k0awzv4s00sb7zk09jixr9mjfrh2x7ywf1c"; + rev = "cea0d08a062478503814e51aa21c6486a0dd1b21"; + sha256 = "05vhwgq2kj3safjhnv0rl4fhcfszba02mbwnyrlq4ayyiyv3n7cc"; }; }; @@ -4768,12 +4768,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2019-11-06"; + version = "2019-12-08"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "d37f5a52a97239dcd503a3a84bb32dfc3200b5f7"; - sha256 = "158wdfkskxxqzjm0dls3sza4nfrp2dqxwsdiiqfhar4vm2n7x8yp"; + rev = "81f64ec3f33165159017f782bc8a1ce9f97348b4"; + sha256 = "0dja73g2mhbwnb29yqcwamwh77k8l3qqbmn25w9pa2mlnfkp9jy8"; }; }; @@ -4900,12 +4900,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2019-11-01"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "93776ea69b99ad0ecd5291d8a5984386fd8ffa72"; - sha256 = "1izcb2iwlwxhzc048xwi9jxr3gqyy5kqysbd1358p39sfhfcdy4j"; + rev = "53c781b9532da50ab9d6ab1bbe640902b2629a0e"; + sha256 = "1cyi4v3rqf8ln0lz1rgzh1qpxw5mq3ihixx83qnrxn81nd1ivk2i"; }; }; @@ -4944,12 +4944,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-12-01"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "a7a7d4d2dd252b71b904d362ba74572c660da67f"; - sha256 = "0ys0sczmjpc219hv2wwgcrkyiys21vk66i174axm147h33m3cm4f"; + rev = "3ba36bb710988349140138707731baeebd6337e4"; + sha256 = "19831g3b6cd5ws0zp6xp4aj110pzf6za3av9ac1s9dnpi97d37g9"; }; }; @@ -5076,12 +5076,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2019-11-16"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "5ec330d114bdc27d636ce16a6186013f121470df"; - sha256 = "168y5wbvhrislvj04g768mfhklczw7phmgf5am61gh4z2nsyw2lp"; + rev = "5ac34a22dbf70e3c8afd7cc69726cec89655c4ad"; + sha256 = "1rs68islvz2rd3ahgfk06q9ydr3ph25zh4amg8vk1svqhk1vh0mp"; }; }; @@ -5219,23 +5219,23 @@ let vim-tmux-focus-events = buildVimPluginFrom2Nix { pname = "vim-tmux-focus-events"; - version = "2019-04-19"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; - rev = "0f89b1ada151e22882a5a47a1ee2b6d6135bc5c1"; - sha256 = "0rx1615wlsl62y62l217vgjd5vjfzf3zjwq43fflpc6bixikqc6j"; + rev = "e80960715c09aef8ab9204848ed1683805a93a33"; + sha256 = "0ds6qw2i1r67jhxh9ff36al45bafsmbxxdc127l6iy2vl5wj0d3d"; }; }; vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2019-12-02"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "b5ae5805db294a72380f77ee82592cd99246272b"; - sha256 = "0w8fn92k1p99wmhq4dv5w2fb97l0p8ay00qyzydm9lq87w06a939"; + rev = "8fdf78292bb3aed1c9de880be7e03efdbf23d306"; + sha256 = "0y92na4dcfcsj5zbs3m7y6csl3sd46a9968id78cdn9cgg8iwzac"; }; }; @@ -5263,12 +5263,12 @@ let vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2017-09-23"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; - sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; + rev = "6b7cdecff252474fe560d32c6f05641f3c5952c7"; + sha256 = "0arv1hmlw7c1rlkc00hzjyg48pg8g4cc9q9l2hy8kpmsl037akm3"; }; }; @@ -5538,12 +5538,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-12-02"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "02829dee17a3d70889b5a0151a2f747754a0e2c4"; - sha256 = "0kkm18mi1am1ww3lb3xqr9v11s057drkv8wpq0l5vqr550iviail"; + rev = "dd8c1c7f347feeafd1e83a53d7cd35cef7033d59"; + sha256 = "1lj9w2gpi1rxj2vsjwhz6cfxdaz8rph7g7zlnl9xm7pzyy2c2vgb"; }; }; @@ -5738,12 +5738,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-12-06"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "17d4772e984450b7c54e878d466dd2b3e6419831"; - sha256 = "1gbpzcwig0g2045a42l1xi1bzm9apgl95l5ixwh8h7jahmkcdzig"; + rev = "65f71de21c31a0b7f7b09a62f865d1b61f9f71ed"; + sha256 = "0y0rfpsggl1a1h89zjzgpnx3vj244gmr3qwblsclh3hzf0sdav5r"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 2a8d43233a3..08add09fe79 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -115,12 +115,12 @@ self: super: { # NB: Make sure you pick a rev from the release branch! coc-nvim = buildVimPluginFrom2Nix rec { pname = "coc-nvim"; - version = "2019-11-29"; + version = "2019-11-30"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d566fa03807d8d86ce9302680d135198a36c7d4d"; - sha256 = "0m355w837f61jfpjrhi3h47z7vq16g8yai8kd82v1h71ns5fw9gz"; + rev = "42a45c639e2c43f9f1795c3804787c6a686781c0"; + sha256 = "0bny7s7scbls01jkvrwcd516py09lp0vkr65p1ik4282blyxyy6s"; }; }; From 6f66fad9bea2649bd5df2dc486febfcc98a9cf27 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 13 Dec 2019 01:24:16 -0800 Subject: [PATCH 069/113] vimPlugins.quick-scope: init at 2019-04-22 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 88640f3f57f..e1564a56187 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2234,6 +2234,17 @@ let }; }; + quick-scope = buildVimPluginFrom2Nix { + pname = "quick-scope"; + version = "2019-04-22"; + src = fetchFromGitHub { + owner = "unblevable"; + repo = "quick-scope"; + rev = "994576d997a52b4c7828149e9f1325d1c4691ae2"; + sha256 = "0lr27vwv2bzva9s7f9d856vvls10icwli0kwj5v5f1q8y83fa4zd"; + }; + }; + quickfix-reflector-vim = buildVimPluginFrom2Nix { pname = "quickfix-reflector-vim"; version = "2019-12-11"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5beb743b594..719a71cd858 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -465,6 +465,7 @@ tyru/open-browser.vim uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look +unblevable/quick-scope valloric/youcompleteme vhda/verilog_systemverilog.vim vim-airline/vim-airline From 2f79be40d61c93a6a57e5ffb437a0345a219d8cd Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 13 Dec 2019 18:52:56 -0500 Subject: [PATCH 070/113] herwig: 7.1.5 -> 7.1.6 thepeg: 2.1.5 -> 2.1.6 --- pkgs/development/libraries/physics/herwig/default.nix | 4 ++-- pkgs/development/libraries/physics/thepeg/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index d252e62286b..367d0813f4e 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "herwig"; - version = "7.1.5"; + version = "7.1.6"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "0jnrv59zfa41gc37pqr3vaiz5jkh7w0k0alcax37b3mlbsnacr9r"; + sha256 = "0h4gcmwnk4iyd31agzcq3p8bvlrgc8svm4ymzqgvvhizwflqf3yr"; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index fa293eab350..82cf2c3a2e8 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "thepeg"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "1rmmwhk9abn9mc9j3127axjwpvymv21ld4wcivwz01pldkxh06n6"; + sha256 = "0krz6psr69kn48xkgr0mjadmzvq572mzn02inlasiz3bf61izrf1"; }; buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; From 70c5a7806256518c9e63aceacba881da212a9125 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 12 Dec 2019 23:14:04 -0800 Subject: [PATCH 071/113] nixos: compress make-ext4-fs with zstd --- nixos/lib/make-ext4-fs.nix | 44 ++++++++++++--------- nixos/modules/installer/cd-dvd/sd-image.nix | 13 ++++-- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 932adcd9796..f46d3990c06 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -4,8 +4,11 @@ # generated image is sized to only fit its contents, with the expectation # that a script resizes the filesystem at boot time. { pkgs +, lib # List of derivations to be included , storePaths +# Whether or not to compress the resulting image with zstd +, compressImage ? false, zstd # Shell commands to populate the ./files directory. # All files in that directory are copied to the root of the FS. , populateImageCommands ? "" @@ -20,18 +23,20 @@ let sdClosureInfo = pkgs.buildPackages.closureInfo { rootPaths = storePaths; }; in - pkgs.stdenv.mkDerivation { - name = "ext4-fs.img"; + name = "ext4-fs.img${lib.optionalString compressImage ".zst"}"; - nativeBuildInputs = [e2fsprogs.bin libfaketime perl lkl]; + nativeBuildInputs = [ e2fsprogs.bin libfaketime perl lkl ] + ++ lib.optional compressImage zstd; buildCommand = '' + ${if compressImage then "img=temp.img" else "img=$out"} ( mkdir -p ./files ${populateImageCommands} ) + # Add the closures of the top-level store objects. storePaths=$(cat ${sdClosureInfo}/store-paths) @@ -42,28 +47,26 @@ pkgs.stdenv.mkDerivation { bytes=$((2 * 4096 * $numInodes + 4096 * $numDataBlocks)) echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)" - truncate -s $bytes $out - faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out + truncate -s $bytes $img + faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $img # Also include a manifest of the closures in a format suitable for nix-store --load-db. cp ${sdClosureInfo}/registration nix-path-registration - cptofs -t ext4 -i $out nix-path-registration / + cptofs -t ext4 -i $img nix-path-registration / # Create nix/store before copying paths faketime -f "1970-01-01 00:00:01" mkdir -p nix/store - cptofs -t ext4 -i $out nix / + cptofs -t ext4 -i $img nix / echo "copying store paths to image..." - cptofs -t ext4 -i $out $storePaths /nix/store/ + cptofs -t ext4 -i $img $storePaths /nix/store/ - ( echo "copying files to image..." - cd ./files - cptofs -t ext4 -i $out ./* / - ) + cptofs -t ext4 -i $img ./files/* / + # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build. - if ! fsck.ext4 -n -f $out; then + if ! fsck.ext4 -n -f $img; then echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" cat errorlog return 1 @@ -71,9 +74,9 @@ pkgs.stdenv.mkDerivation { ( # Resizes **snugly** to its actual limits (or closer to) - free=$(dumpe2fs $out | grep '^Free blocks:') - blocksize=$(dumpe2fs $out | grep '^Block size:') - blocks=$(dumpe2fs $out | grep '^Block count:') + free=$(dumpe2fs $img | grep '^Free blocks:') + blocksize=$(dumpe2fs $img | grep '^Block size:') + blocks=$(dumpe2fs $img | grep '^Block count:') blocks=$((''${blocks##*:})) # format the number. blocksize=$((''${blocksize##*:})) # format the number. # System can't boot with 0 blocks free. @@ -82,10 +85,15 @@ pkgs.stdenv.mkDerivation { size=$(( blocks - ''${free##*:} + fudge )) echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)" - EXT2FS_NO_MTAB_OK=yes resize2fs $out -f $size + EXT2FS_NO_MTAB_OK=yes resize2fs $img -f $size ) # And a final fsck, because of the previous truncating. - fsck.ext4 -n -f $out + fsck.ext4 -n -f $img + + if [ ${builtins.toString compressImage} ]; then + echo "Compressing image" + zstd -v --no-progress ./$img -o $out + fi ''; } diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 7865b767f0b..901c60befb6 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -18,6 +18,7 @@ with lib; let rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix ({ inherit (config.sdImage) storePaths; + compressImage = true; populateImageCommands = config.sdImage.populateRootCommands; volumeLabel = "NIXOS_SD"; } // optionalAttrs (config.sdImage.rootPartitionUUID != null) { @@ -128,10 +129,11 @@ in sdImage.storePaths = [ config.system.build.toplevel ]; - system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux, bzip2 }: stdenv.mkDerivation { + system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, + mtools, libfaketime, utillinux, bzip2, zstd }: stdenv.mkDerivation { name = config.sdImage.imageName; - nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 ]; + nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 zstd ]; inherit (config.sdImage) compressImage; @@ -146,11 +148,14 @@ in echo "file sd-image $img" >> $out/nix-support/hydra-build-products fi + echo "Decompressing rootfs image" + zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img + # Gap in front of the first partition, in MiB gap=8 # Create the image file sized to fit /boot/firmware and /, plus slack for the gap. - rootSizeBlocks=$(du -B 512 --apparent-size ${rootfsImage} | awk '{ print $1 }') + rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }') firmwareSizeBlocks=$((${toString config.sdImage.firmwareSize} * 1024 * 1024 / 512)) imageSize=$((rootSizeBlocks * 512 + firmwareSizeBlocks * 512 + gap * 1024 * 1024)) truncate -s $imageSize $img @@ -168,7 +173,7 @@ in # Copy the rootfs into the SD image eval $(partx $img -o START,SECTORS --nr 2 --pairs) - dd conv=notrunc if=${rootfsImage} of=$img seek=$START count=$SECTORS + dd conv=notrunc if=./root-fs.img of=$img seek=$START count=$SECTORS # Create a FAT32 /boot/firmware partition of suitable size into firmware_part.img eval $(partx $img -o START,SECTORS --nr 1 --pairs) From 69d31c37bc4150274310c763813481ffb3f328f5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Dec 2019 02:25:41 +0100 Subject: [PATCH 072/113] cargo-make: 0.24.1 -> 0.24.2 https://github.com/sagiegurari/cargo-make/releases/tag/0.24.2 --- pkgs/development/tools/rust/cargo-make/Cargo.lock | 14 +++++++------- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 8d2260374d1..00a2eb721df 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -98,15 +98,15 @@ dependencies = [ [[package]] name = "cargo-make" -version = "0.24.1" +version = "0.24.2" dependencies = [ - "ci_info 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "envmnt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", - "git_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "home 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -143,7 +143,7 @@ dependencies = [ [[package]] name = "ci_info" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "envmnt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -269,7 +269,7 @@ dependencies = [ [[package]] name = "git_info" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -653,7 +653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" -"checksum ci_info 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93b085342b4579e6bd92189bb6b832b2fff5564382e2472be42748b630e8063d" +"checksum ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4e9091c3d285e7046afdb70fc7413d1ac670288705e151443f868f71e66ed2a" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "433e7ac7d511768127ed85b0c4947f47a254131e37864b2dc13f52aa32cd37e5" @@ -667,7 +667,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa" "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" -"checksum git_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4862dc2fabbfe087ec247e8dda2a4c5b70e8506e7f6d5db6234627d6e81f2309" +"checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum home 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a3753954f7bd71f0e671afb8b5a992d1724cf43b7f95a563cd4a0bde94659ca8" "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 6989d005da3..e4cb070464c 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.24.1"; + version = "0.24.2"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0fnp3vv2vncrvc8cp24ijldb8bfb0i8m8cxiqa4vqnix9yi182yd"; + sha256 = "02fc3vf802dzqvyh61cmkjf3vqf5xsl8dhjggns7p5zr2aqh8pfi"; }; in runCommand "cargo-make-src" {} '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1skias0jyridd0dv864m5ls1ifvj1zqnnymrgs6q0169aidwrbdc"; + cargoSha256 = "1x2pkis82hsikjqgma7f6wmkcmviiqwc7pvdpmww61iq2aqfg7ds"; # Some tests fail because they need network access. # However, Travis ensures a proper build. From e533a8c565ef5d52f9d1cec021f0cbdab0cc1d02 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Dec 2019 02:40:13 +0100 Subject: [PATCH 073/113] matrix-synapse.ldap3: 0.1.3 -> 0.1.4 https://github.com/matrix-org/matrix-synapse-ldap3/releases/tag/v0.1.4 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 07087315dc2..4fceb7c22fc 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -7,11 +7,11 @@ with python3.pkgs; let matrix-synapse-ldap3 = buildPythonPackage rec { pname = "matrix-synapse-ldap3"; - version = "0.1.3"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - sha256 = "0a0d1y9yi0abdkv6chbmxr3vk36gynnqzrjhbg26q4zg06lh9kgn"; + sha256 = "01bms89sl16nyh9f141idsz4mnhxvjrc3gj721wxh1fhikps0djx"; }; propagatedBuildInputs = [ service-identity ldap3 twisted ]; From 73322737a36a6f816ad5a224cf1c87ad92c8d099 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Dec 2019 02:40:52 +0100 Subject: [PATCH 074/113] matrix-synapse: 1.6.1 -> 1.7.0 https://github.com/matrix-org/synapse/releases/tag/v1.7.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4fceb7c22fc..72e3b5fc0e8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "184d7qd76bb2714pfkx9p4zzn4akb6xkx2iw86cpn7aqmccxysld"; + sha256 = "1z7q34yazjb3glzhm0si0pzif32gnp03bmd490gckkl30rklyxsp"; }; patches = [ From 047f22fc3ccbbd13e2765aa7e0e431ee0521bc54 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Dec 2019 03:50:36 +0100 Subject: [PATCH 075/113] citrix_workspace: add 19.12.0.19 --- .../remote/citrix-workspace/default.nix | 15 +++++++++++++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index dc6f85f2130..a4deda99f5b 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -24,7 +24,7 @@ , gtk_engines , alsaLib , zlib -, version ? "19.10.0" +, version ? "19.12.0" }: let @@ -71,7 +71,18 @@ let x86hash = "000zjik8wf8b6fadnsai0p77b4n2l95544zx503iyrb9pv53bj3y"; x64suffix = "15"; x86suffix = "15"; - homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest1.html; + homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1910.html; + }; + + "19.12.0" = { + major = "19"; + minor = "12"; + patch = "0"; + x64hash = "1si5mkxbgb8m99bkvgc3l80idjfdp0kby6pv47s07nn43dbr1j7a"; + x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy"; + x64suffix = "19"; + x86suffix = "19"; + homepage = https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d5b6a95349..e0b9ab1d044 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2344,6 +2344,7 @@ in citrix_receiver_13_8_0 = citrix_receiver; citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_19_12_0 = citrix_workspace_unwrapped.override { version = "19.12.0"; }; citrix_workspace_unwrapped_19_10_0 = citrix_workspace_unwrapped.override { version = "19.10.0"; }; citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; }; citrix_workspace_unwrapped_19_6_0 = citrix_workspace_unwrapped.override { version = "19.6.0"; }; @@ -2352,6 +2353,9 @@ in citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped; }; + citrix_workspace_19_12_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_12_0; + }; citrix_workspace_19_10_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped_19_10_0; }; From 1314521936b2ad353acbd0a1a5782bce6c1c09c5 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 14 Dec 2019 03:21:34 +0000 Subject: [PATCH 076/113] pythonPackages.pycdio: fix for Python 3 --- pkgs/development/python-modules/pycdio/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index f7a64b9bde4..5b1d774c169 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -4,20 +4,23 @@ , setuptools , nose , pkgs -, isPy27 }: buildPythonPackage rec { pname = "pycdio"; version = "2.1.0"; - disabled = !isPy27; src = fetchPypi { inherit pname version; sha256 = "01b7vqqfry071p60sabydym7r3m3rxszyqpdbs1qi5rk2sfyblnn"; }; - prePatch = "sed -i -e '/DRIVER_BSDI/d' pycdio.py"; + prePatch = '' + substituteInPlace setup.py \ + --replace 'library_dirs=library_dirs' 'library_dirs=[dir.decode("utf-8") for dir in library_dirs]' \ + --replace 'include_dirs=include_dirs' 'include_dirs=[dir.decode("utf-8") for dir in include_dirs]' \ + --replace 'runtime_library_dirs=runtime_lib_dirs' 'runtime_library_dirs=[dir.decode("utf-8") for dir in runtime_lib_dirs]' + ''; preConfigure = '' patchShebangs . From 85dce63fa96e21d0587e8e6a522573900703f322 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 14 Dec 2019 03:21:44 +0000 Subject: [PATCH 077/113] whipper: 0.7.3 -> 0.9.0 --- pkgs/applications/audio/whipper/default.nix | 26 +++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 79801f2e99f..5e133c60cc5 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchFromGitHub, python2, cdparanoia, cdrdao, flac -, sox, accuraterip-checksum, utillinux, substituteAll }: +{ stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac +, sox, accuraterip-checksum, libsndfile, utillinux, substituteAll }: -python2.pkgs.buildPythonApplication rec { - name = "whipper-${version}"; - version = "0.7.3"; +python3.pkgs.buildPythonApplication rec { + pname = "whipper"; + version = "0.9.0"; src = fetchFromGitHub { owner = "whipper-team"; repo = "whipper"; rev = "v${version}"; - sha256 = "0ypbgc458i7yvbyvg6wg6agz5yzlwm1v6zw7fmyq9h59xsv27mpr"; + sha256 = "0x1qsp021i0l5sdcm2kcv9zfwp696k4izhw898v6marf8phll7xc"; }; - pythonPath = with python2.pkgs; [ + pythonPath = with python3.pkgs; [ pygobject3 musicbrainzngs urllib3 chardet - pycdio setuptools mutagen CDDB + pycdio setuptools setuptools_scm mutagen requests ]; - checkInputs = with python2.pkgs; [ + buildInputs = [ libsndfile ]; + + checkInputs = with python3.pkgs; [ twisted ]; @@ -33,6 +35,10 @@ python2.pkgs.buildPythonApplication rec { "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]) ]; + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}" + ''; + # some tests require internet access # https://github.com/JoeLametta/whipper/issues/291 doCheck = false; @@ -44,7 +50,7 @@ python2.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/whipper-team/whipper; description = "A CD ripper aiming for accuracy over speed"; - maintainers = with maintainers; [ rycee ]; + maintainers = with maintainers; [ rycee emily ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; From 178f870ae70dc2e771b5c73552ba9310533e230f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 Dec 2019 22:22:22 -0500 Subject: [PATCH 078/113] libmad: fix build on darwin --- pkgs/development/libraries/libmad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 40d90f46288..9d935daddad 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.cc.isClang [ (fetchpatch { url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff"; - sha256 = "0ciyaj1acg08g8hpzqx6whayq206fvf4whksz2pjgxlv207lqgjh"; + sha256 = "1wp60ywzk6nmxc3kq3v6i8b7s4cibvf5cjir859zv10y5aa1d0pk"; }) ]; From 9ff834fafcf17664b12ba7f5f4f6344dac10245b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Dec 2019 04:33:28 +0100 Subject: [PATCH 079/113] fixup! Merge pull request #74422 from r-ryantm/auto-update/ibus-typing-booster --- pkgs/development/tools/rust/cargo-xbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 81814300655..a5220775b52 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.18"; + version = "0.5.19"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "1hcsdwwl1xc59f1ppwlxj1zyp1md07z70gfvg4zqvafc6dzx708j"; + sha256 = "0j15d52bpl3k6jw0hzcxdvjayd2azdp5b9s2fq3ywd4zbda8rqp7"; }; cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp"; From d1913d175d4b72f6340a4a213dc72cba0002d07c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 Dec 2019 18:00:00 -0500 Subject: [PATCH 080/113] buildah: 1.11.6 -> 1.12.0 Changelog: https://github.com/containers/buildah/releases/tag/v1.12.0 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 6810a053a80..db01a068c00 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { pname = "buildah"; - version = "1.11.6"; + version = "1.12.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "0slhq11nmqsp2rjfwldvcwlpj823ckfpipggkaxhcb66dv8ymm7n"; + sha256 = "0lsjsfp6ls38vlgibbnsyd1m7jvmjwdmpyrd0qigp4aa2abwi4dg"; }; outputs = [ "bin" "man" "out" ]; From 6d34fb89eb6d3bf34d86fd3837d19be670253c41 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 Dec 2019 19:19:19 -0500 Subject: [PATCH 081/113] fluent-bit: 1.3.2 -> 1.3.4 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index fe68613b542..f3728361720 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "155szha6mx7cvq0bzqb528zg4q1m9gip7f0m1zv9yrz1sr9p1nzv"; + sha256 = "01iy8xgsyc1clhpik4nmkxw6xnblzswvn35qz4h4p5sw97c4iwq8"; }; nativeBuildInputs = [ cmake flex bison ]; From 637f16dc3e40e6b208fc22c442c26aa8ec3fdf9c Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 12 Dec 2019 22:55:19 +0100 Subject: [PATCH 082/113] bingrep: 0.7.0 -> 0.8.1 --- pkgs/development/tools/analysis/bingrep/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index 5fd6b402e0b..2367e197f84 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -2,17 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "m4b"; repo = pname; - # Currently doesn't tag versions so we're using the raw revision - rev = "33d56a4b020c4a3c111294fe41c613d5e8e9c7af"; - sha256 = "0lg92wqknr584b44i5v4f97js56j89z7n8p2zpm8j1pfhjmgcigs"; + rev = "v${version}"; + sha256 = "1xig3lrw0jdaxibzirqnm50l8nj4si9pa9w0jypmyhf1lr6yzd0g"; }; - cargoSha256 = "1yxm7waldhilx7wh1ag79rkp8kypb9k1px4ynmzq11r72yl2p4m7"; + cargoSha256 = "1fsp1ycfswrzldwnjw5cdwi809fd37pwshvrpf7sp0wmzx2bqhgm"; meta = with stdenv.lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; From 88c6f13ef244804576bec411428f3567d2ea16c4 Mon Sep 17 00:00:00 2001 From: Laurens Duijvesteijn Date: Thu, 12 Dec 2019 17:19:03 +0100 Subject: [PATCH 083/113] hivemind: 1.0.4 -> 1.0.6 --- pkgs/applications/misc/hivemind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index 84f5bad24d2..e452ec0511e 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "hivemind"; - version = "1.0.4"; + version = "1.0.6"; goPackagePath = "github.com/DarthSim/hivemind"; src = fetchFromGitHub { owner = "DarthSim"; repo = "hivemind"; rev = "v${version}"; - sha256 = "1z2izvyf0j3gi0cas5v22kkmkls03sg67182k8v3p6kwhzn0jw67"; + sha256 = "0afcnd03wsdphbbpha65rv5pnv0x6ldnnm6rnv1m6xkkywgnzx95"; }; meta = with stdenv.lib; { From c7f85382f823124aa508270cb6735b3c766fc41a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 Dec 2019 22:22:22 -0500 Subject: [PATCH 084/113] mpd: fix-build on darwin --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 2364043c868..d2578b185fc 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -82,7 +82,7 @@ let # Disable platform specific features if needed # using libmad to decode mp3 files on darwin is causing a segfault -- there # is probably a solution, but I'm disabling it for now - platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smb" ] + platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smbclient" ] ++ lib.optionals (!stdenv.isLinux) [ "alsa" "systemd" "syslog" ]; knownFeatures = builtins.attrNames featureDependencies; @@ -113,7 +113,7 @@ let buildInputs = [ glib boost ] ++ (lib.concatLists (lib.attrVals features_ featureDependencies)) - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AudioToolbox; + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioUnit ]; nativeBuildInputs = [ meson ninja pkgconfig ]; From 6498f468afc29293cc602e29fe5448cfd046d657 Mon Sep 17 00:00:00 2001 From: Chuck Date: Fri, 13 Dec 2019 14:08:56 -0800 Subject: [PATCH 085/113] WriteHaskell: Strip binaries This reduces the size of Hello World [1] from 3.06 MiB to 678 KiB. [1] As measured by nix-shell -p 'writers.writeHaskellBin "hello" {} "main = putStrLn \"hello\""' --run 'ls -l `which hello`' --- pkgs/build-support/writers/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 2cd4f1af022..b90c6490e4a 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -148,6 +148,7 @@ rec { cp $contentPath tmp.hs ${ghc.withPackages (_: libraries )}/bin/ghc tmp.hs mv tmp $out + ${pkgs.binutils-unwrapped}/bin/strip --strip-unneeded "$out" ''; } name; From b6d88738254bda84edb10dbdab2a2cdd9aac67a2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 11 Dec 2019 20:04:29 -0500 Subject: [PATCH 086/113] root: 6.12.06 -> 6.18.04 Also switch to python3. --- .../science/misc/root/default.nix | 20 +++-- .../science/misc/root/sw_vers.patch | 81 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 61 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index ada2f0b44ad..7a03369febe 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,27 +1,32 @@ -{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl, xxHash +{ stdenv, fetchurl, cmake, gl2ps, gsl, libX11, libXpm, libXft, libXext +, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash, zlib , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { pname = "root"; - version = "6.12.06"; + version = "6.18.04"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f"; + sha256 = "196ghma6g5a7sqz52wyjkgvmh4hj4vqwppm0zwdypy33hgy8anii"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ] + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ gl2ps pcre python zlib libxml2 lz4 lzma gsl xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; + propagatedBuildInputs = [ python.pkgs.numpy ]; patches = [ ./sw_vers.patch ]; preConfigure = '' + rm -rf builtins/* + substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ + --replace 'set(lcgpackages ' '#set(lcgpackages ' + patchShebangs build/unix/ '' + stdenv.lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" @@ -35,8 +40,10 @@ stdenv.mkDerivation rec { "-Dbonjour=OFF" "-Dcastor=OFF" "-Dchirp=OFF" + "-Dclad=OFF" "-Ddavix=OFF" "-Ddcache=OFF" + "-Dfail-on-missing=ON" "-Dfftw3=OFF" "-Dfitsio=OFF" "-Dfortran=OFF" @@ -57,6 +64,7 @@ stdenv.mkDerivation rec { "-Drfio=OFF" "-Dsqlite=OFF" "-Dssl=OFF" + "-Dvdt=OFF" "-Dxml=ON" "-Dxrootd=OFF" ] diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index df0ef79d0a0..34af132c11f 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -1,54 +1,46 @@ -diff --git a/build/unix/compiledata.sh b/build/unix/compiledata.sh +diff a/build/unix/compiledata.sh b/build/unix/compiledata.sh --- a/build/unix/compiledata.sh +++ b/build/unix/compiledata.sh -@@ -49,7 +49,7 @@ fi +@@ -47,7 +47,7 @@ fi if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \ [ "$ARCH" = "macosxicc" ]; then - macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` -+ macosx_minor=7 ++ macosx_minor=12 SOEXT="so" if [ $macosx_minor -ge 5 ]; then if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then -diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake +diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake --- a/cmake/modules/SetUpMacOS.cmake +++ b/cmake/modules/SetUpMacOS.cmake -@@ -12,25 +12,11 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6) - #--------------------------------------------------------------------------------------------------------- +@@ -2,17 +2,8 @@ set(ROOT_ARCHITECTURE macosx) + set(ROOT_PLATFORM macosx) if (CMAKE_SYSTEM_NAME MATCHES Darwin) - EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" - COMMAND cut -d . -f 1-2 - OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) +- - MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}") -- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" -- COMMAND cut -d . -f 2 -- OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE) - - if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang) set(libcxx ON CACHE BOOL "Build using libc++" FORCE) - endif() -- if(${MACOSX_MINOR} GREATER 4) +- if(MACOSX_VERSION VERSION_GREATER 10.4) #TODO: check haveconfig and rpath -> set rpath true #TODO: check Thread, define link command #TODO: more stuff check configure script -- execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT) -- if(${SYSCTL_OUTPUT} MATCHES 64) -- MESSAGE(STATUS "Found a 64bit system") - set(ROOT_ARCHITECTURE macosx64) - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") - SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64") -@@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -25,23 +16,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64") -- else(${SYSCTL_OUTPUT} MATCHES 64) +- else() - MESSAGE(STATUS "Found a 32bit system") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32") -- endif(${SYSCTL_OUTPUT} MATCHES 64) +- endif() - endif() - - if(MACOSX_VERSION VERSION_GREATER 10.6) @@ -59,32 +51,51 @@ diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake - endif() - if(MACOSX_VERSION VERSION_GREATER 10.8) - set(MACOSX_GLU_DEPRECATED ON) -- set(MACOSX_KRB5_DEPRECATED ON) -- endif() -- if(MACOSX_VERSION VERSION_GREATER 10.9) -- set(MACOSX_LDAP_DEPRECATED ON) - endif() ++ endif() if (CMAKE_COMPILER_IS_GNUCXX) message(STATUS "Found GNU compiler collection") -@@ -135,7 +100,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -104,7 +79,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) endif() #---Set Linker flags---------------------------------------------------------------------- -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION} -Wl,-rpath,@loader_path/../lib") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib") - - +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}") else (CMAKE_SYSTEM_NAME MATCHES Darwin) -diff --git a/config/root-config.in b/config/root-config.in + MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know waht to do. Stop cmake at this point.") + endif (CMAKE_SYSTEM_NAME MATCHES Darwin) +diff a/config/root-config.in b/config/root-config.in --- a/config/root-config.in +++ b/config/root-config.in -@@ -304,7 +304,7 @@ macosxicc) +@@ -306,12 +306,6 @@ macosxicc) + auxlibs="-lm -ldl" ;; macosx64) - # MacOS X with gcc (GNU cc v4.x) in 64 bit mode +- # MacOS X with gcc (GNU cc v4.x) in 64 bit mode - macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` -+ macosx_minor=7 - # cannot find the one linked to libGraf if relocated after built - if [ $macosx_minor -le 4 ]; then - rootlibs="$rootlibs -lfreetype" +- # cannot find the one linked to libGraf if relocated after built +- if [ $macosx_minor -le 4 ]; then +- rootlibs="$rootlibs -lfreetype" +- fi + auxcflags="${cxxversionflag} -m64" + auxldflags="-m64" + auxlibs="-lm -ldl" +@@ -375,18 +369,11 @@ freebsd* | openbsd* | linux*) + macosx*) + for f in $features ; do + if test "x$f" = "xthread" ; then +- if [ $macosx_minor -ge 5 ]; then + auxcflags="-pthread $auxcflags" + auxlibs="-lpthread $auxlibs" +- else +- auxcflags="-D_REENTRANT $auxcflags" +- auxlibs="-lpthread $auxlibs" +- fi + fi + if test "x$f" = "xrpath" ; then +- if [ $macosx_minor -ge 5 ]; then + auxlibs="-Wl,-rpath,$libdir $auxlibs" +- fi + fi + if test "x$f" = "xlibcxx" ; then + auxcflags="-stdlib=libc++ $auxcflags" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d918d27236..466d2a97b20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24228,8 +24228,8 @@ in ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; }; root = callPackage ../applications/science/misc/root { + python = python3; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { From 12cc27b1ef7143840a0695f0652f0d0d679a4865 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 13 Dec 2019 23:23:36 -0800 Subject: [PATCH 087/113] pythonPackages.root_numpy: add setuptools dependency --- pkgs/development/python-modules/root_numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix index dc2c5f790b5..910a37ddd57 100644 --- a/pkgs/development/python-modules/root_numpy/default.nix +++ b/pkgs/development/python-modules/root_numpy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root, nose }: +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root, nose, setuptools }: buildPythonPackage rec { pname = "root_numpy"; @@ -16,7 +16,7 @@ buildPythonPackage rec { nosetests -s -v root_numpy ''; - propagatedBuildInputs = [ numpy root ]; + propagatedBuildInputs = [ numpy root setuptools ]; meta = with lib; { homepage = http://scikit-hep.org/root_numpy; From 4c142b085441b8e0228c528cde11aa9618b771c8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 Dec 2019 18:00:00 -0500 Subject: [PATCH 088/113] flow: 0.113.0 -> 0.114.0 Changelog: https://github.com/facebook/flow/releases/tag/v0.114.0 --- pkgs/development/tools/analysis/flow/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 2150ca004c2..ecd8f3a17ec 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.113.0"; + version = "0.114.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1z7zy2ma1rmx2jjrsrnlrv2j5ff4zlzzlqvlmv7fc7dds3wlz6ia"; + sha256 = "1dkp3v898b5vd0a9fl5xknwbbqv23v0icqml8ypyhzrv6wz5qiy3"; }; installPhase = '' @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A static type checker for JavaScript"; homepage = https://flow.org/; + changelog = "https://github.com/facebook/flow/releases/tag/v${version}"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; maintainers = with maintainers; [ marsam puffnfresh ]; From ccd448b49e29fc304e584a9cbbb738d6ecd8ff04 Mon Sep 17 00:00:00 2001 From: Johannes Rosenberger Date: Sat, 14 Dec 2019 11:54:47 +0100 Subject: [PATCH 089/113] vimPlugins: Update --- pkgs/misc/vim-plugins/generated.nix | 72 ++++++++++++++--------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e1564a56187..9f44ca5fa16 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -843,12 +843,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-12-12"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "aab3c42c59e6bf6859abe98a5fc8b822b1230901"; - sha256 = "0b850f6alikb4wyq563hi7g4dgifa0iz797952zrd3khkil602fb"; + rev = "13c8542818f418d1207c368f0072072c793f58c1"; + sha256 = "1xrpmrr6wmy88s23j4cxcpsj9wlw7ak48sg3hjqpni9w231kp7a9"; }; }; @@ -899,24 +899,24 @@ let deoplete-go = buildVimPluginFrom2Nix { pname = "deoplete-go"; - version = "2019-12-01"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-go"; - rev = "45ab448ad0bdd19a6f13ce691a5ce3c0c381ee9e"; - sha256 = "132wkvh62zhpiv37576k0a8akm90x40dq0sr7rc9q24cq5lym7rx"; + rev = "a3ac3f53f0af482095ebcf09af8ca1d1edce45bc"; + sha256 = "19xgsm5mbfcpdb0csckbwi83gl3b4wqdn8vchbv8j9faf10qnf2b"; fetchSubmodules = true; }; }; deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-12-10"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "341d141bb328fb3aaae83be74b802283f984a873"; - sha256 = "1f2fvqdn39gdn0r6qnfdvnfcs6pcrl44ac85d2gsd9knp3bykpgc"; + rev = "7990447a308c6c5839ada856f31a7dd3e34f20a4"; + sha256 = "1570k79ihz6kif85ichdgdnbipbdkqb5ks8izhqppb68lajyjvd2"; fetchSubmodules = true; }; }; @@ -934,12 +934,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2019-12-11"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "a93369059942070687c23da4dac96a718c88a36d"; - sha256 = "0xxj5s7c4f2l57wjcb6py53jb2szl26jccwngfn1j2andkzs9a94"; + rev = "ca4018c69aca115033f3e3b5408331e76ff64cd0"; + sha256 = "0k3vgikvjapqniz0cmnhjx4ds5dn4kscd443sf2x2nd6ppa6fd6j"; }; }; @@ -1090,12 +1090,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-12-08"; + version = "2019-12-14"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "2753e2dae9317c63da3ec3601a7a5bb6f255e41b"; - sha256 = "06y52dh0l82xchjsv3fbch7s2lvqkq16zsi31pizszkqimbc51s2"; + rev = "55ef64a057025209c48905df06f725430e63542f"; + sha256 = "07qca1xmwaak45ccgv5vg69s3vwl1p5h9r2agh0aw30qw50jvkkw"; }; }; @@ -1216,8 +1216,8 @@ let src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "7e531d18506ec307e8d5df8229ca10617caa4f5a"; - sha256 = "1ax3sn0j49bkc8zajvn30yqgmlrv6m5bf6jpa7l3r5qps83bcmb1"; + rev = "946aac94d5690e9ca1ca2db21a254fea56e45b2b"; + sha256 = "1q1rq1rxxq5hyglz90d7vd1m6az12lr2wz9aafn6zir68n3ak0lj"; }; }; @@ -1609,12 +1609,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-12-05"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "97437f8cf030762b8dcd929575f70cac362a253a"; - sha256 = "13qn9qrc1d9vmndqyi1f8c3fx60p1xzf1m2c9lq9wk5p4hb8pqqw"; + rev = "12388bb5ce5f5a16dc55dc22b80d7a410410b479"; + sha256 = "1k7l8sq6jcl0a6yk68ch72w20rhwi26fhrp0yvvvim0krs0yr068"; }; }; @@ -2313,12 +2313,12 @@ let readline-vim = buildVimPluginFrom2Nix { pname = "readline-vim"; - version = "2019-08-24"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "ryvnf"; repo = "readline.vim"; - rev = "40964933819e2a719e6e34adcf3e8b2210c5c6ce"; - sha256 = "1jc8lzl49nl7r3v1b7fk6zpiba41h51qsi2w4lhf8v6lnzbazii7"; + rev = "9711f3c7c1d295e775750d7421060d74ee1b56e3"; + sha256 = "0zvavhc8033isdn7gdfla5kwif40rkn9p4zmkvwy423dpb3432h2"; }; }; @@ -3110,19 +3110,19 @@ let src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "9f00b402c56bd511519ef90e689a982898365683"; - sha256 = "125plpda06i2mjp1ivhhln3ss3ij4bhn3pvvv88qb97zhw8xlmdg"; + rev = "72286b27cc6e7a1eb2b8e1103f2fa34afa397034"; + sha256 = "19lgsxgnp6aq0nsbg43xn84xxi8hjp1ih6aj842ryhl47ppj76sq"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2019-12-12"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "a8947186c095b9a639ef56f10d0ee1ca5893b1db"; - sha256 = "193vq6ybgj58pmbh0gsbsvn8zxb42p8ipms22hj3yb0v4lkg8lws"; + rev = "67512f5e81b8ad088a8cbfe8b95f9e495bc81cf3"; + sha256 = "049lnixxcvvnkq5bfwpmclw1k73xyf5gqfpw78rkzsbg9milyr74"; }; }; @@ -4508,8 +4508,8 @@ let src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "554e3edfe8a1f3d9bdc14e0ea27c6600f9fdc4d5"; - sha256 = "0mg4hvfylk2ygz9fg2h8a44z8vbvi1pvydlafx6mx6n2a19p9ghl"; + rev = "c6cd668ed13af85d8292b524f827e729bf70ea0f"; + sha256 = "1239c0yc51jyp5shwpx2j7kbsb63qj6zp3k2lirppy8c2lls4nsv"; }; }; @@ -5417,12 +5417,12 @@ let vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2019-03-28"; + version = "2019-12-14"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "3c968fd4fd83d3631dec4c0caf289c85917d8ca9"; - sha256 = "17ncq06al2pzqxpx45bmh4b66d48y3kklxcd1f80jfsp9hh5v0vm"; + rev = "b9839555f70d319b4e21fc7bc9b559d91cf1260a"; + sha256 = "1ql8yv8rxpr9j9phf4jddqs1j81vcb9gpp0p3fmy6f8nf4b26nvw"; }; }; @@ -5549,12 +5549,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-12-10"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "dd8c1c7f347feeafd1e83a53d7cd35cef7033d59"; - sha256 = "1lj9w2gpi1rxj2vsjwhz6cfxdaz8rph7g7zlnl9xm7pzyy2c2vgb"; + rev = "0dd49a005bd7e5df51491d569e99c19a753ab44b"; + sha256 = "15ksb158vjprpgymkn7gkpmnaayzjqlph8wssl6pi6nlmylr40sx"; }; }; From 592ee0c39972cd04a86af67c7298b76de5374972 Mon Sep 17 00:00:00 2001 From: Johannes Rosenberger Date: Sat, 3 Aug 2019 01:20:54 +0200 Subject: [PATCH 090/113] vimPlugins.deoplete-khard: init at 2019-09-02 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/overrides.nix | 14 ++++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 26 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9f44ca5fa16..0c4efd46779 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -932,6 +932,17 @@ let }; }; + deoplete-khard = buildVimPluginFrom2Nix { + pname = "deoplete-khard"; + version = "2019-09-02"; + src = fetchFromGitHub { + owner = "nicoe"; + repo = "deoplete-khard"; + rev = "27221723a3bb8e480ff8cbe7f4be9ff38c076bf7"; + sha256 = "0g7sysm5lb8fpgagfg4565fz4rn16djdc4m2213ryq1s3crx40gw"; + }; + }; + deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; version = "2019-12-13"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 08add09fe79..a885dc163a1 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -14,6 +14,9 @@ # coc-go dependency , go +# deoplete-khard dependency +, khard + # vim-go denpencies , asmfmt, delve, errcheck, godef, golint , gomodifytags, gotags, gotools, go-motion @@ -174,6 +177,17 @@ self: super: { ''; }); + deoplete-khard = super.deoplete-khard.overrideAttrs(old: { + dependencies = [ self.deoplete-nvim ]; + passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ]; + meta = { + description = "Address-completion for khard via deoplete"; + homepage = "https://github.com/nicoe/deoplete-khard"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ jorsn ]; + }; + }); + ensime-vim = super.ensime-vim.overrideAttrs(old: { passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ]; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 719a71cd858..c0abcda9070 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -314,6 +314,7 @@ neovimhaskell/nvim-hs.vim neovim/nvimdev.nvim neutaaaaan/iosvkem nfnty/vim-nftables +nicoe/deoplete-khard nixprime/cpsm NLKNguyen/papercolor-theme noc7c9/vim-iced-coffee-script From 6bb0148cc3eb149320b03e4bfd2cb7b7298ba07e Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Sat, 14 Dec 2019 15:12:58 +0100 Subject: [PATCH 091/113] wtf: 0.24.0 -> 0.25.0 --- pkgs/applications/misc/wtf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index f20c4aff169..3dee9844c0c 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0jz7hjcm0hfxcih2zplp47wx6lyvhhzj9ka4ljqrx0i4l7cm9ahs"; + sha256 = "1g76hzlyi8s8dayd36cs4bhnwgrrr731ybflw3xk5pgkgcbs14sd"; }; - modSha256 = "04d8hvd90f7v853p23xcx38qz3ryv7kz7zjk9b131cjnd4mcv0sm"; + modSha256 = "186m7s20r59dyh5lpby4sd4vw3rvnkfzslylwin0c3r6150yrx8h"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 7358e4f93c49d2a653115b797ec9ab3ce712a5e4 Mon Sep 17 00:00:00 2001 From: mt_caret Date: Sat, 14 Dec 2019 23:29:08 +0900 Subject: [PATCH 092/113] nixos/lxd: add recommendedSysctlSettings * nixos/lxd: add productionSetup option * nixos/lxd: enable some settings by default * nixos/lxd: rename option --- nixos/modules/virtualisation/lxd.nix | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 505c11abd20..b4934a86cf5 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -35,6 +35,18 @@ in with nixos. ''; }; + recommendedSysctlSettings = mkOption { + type = types.bool; + default = false; + description = '' + enables various settings to avoid common pitfalls when + running containers requiring many file operations. + Fixes errors like "Too many open files" or + "neighbour: ndisc_cache: neighbor table overflow!". + See https://lxd.readthedocs.io/en/latest/production-setup/ + for details. + ''; + }; }; }; @@ -69,8 +81,11 @@ in ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --group lxd"; Type = "simple"; KillMode = "process"; # when stopping, leave the containers alone + LimitMEMLOCK = "infinity"; + LimitNOFILE = "1048576"; + LimitNPROC = "infinity"; + TasksMax = "infinity"; }; - }; users.groups.lxd.gid = config.ids.gids.lxd; @@ -79,5 +94,16 @@ in subUidRanges = [ { startUid = 1000000; count = 65536; } ]; subGidRanges = [ { startGid = 1000000; count = 65536; } ]; }; + + boot.kernel.sysctl = mkIf cfg.recommendedSysctlSettings { + "fs.inotify.max_queued_events" = 1048576; + "fs.inotify.max_user_instances" = 1048576; + "fs.inotify.max_user_watches" = 1048576; + "vm.max_map_count" = 262144; + "kernel.dmesg_restrict" = 1; + "net.ipv4.neigh.default.gc_thresh3" = 8192; + "net.ipv6.neigh.default.gc_thresh3" = 8192; + "kernel.keys.maxkeys" = 2000; + }; }; } From dd465ba6b6694897fbcc4e30fd66e850d1df0469 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 14 Dec 2019 15:55:33 +0100 Subject: [PATCH 093/113] wpscan: 3.5.3 -> 3.7.5 (#75580) --- pkgs/tools/security/wpscan/Gemfile.lock | 46 ++++++++------ pkgs/tools/security/wpscan/default.nix | 2 +- pkgs/tools/security/wpscan/gemset.nix | 82 +++++++++++++++++-------- 3 files changed, 85 insertions(+), 45 deletions(-) diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index bf03aba1418..7a29a18b7c3 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,45 +1,53 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.3) + activesupport (6.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - cms_scanner (0.5.1) - nokogiri (~> 1.10.0) - opt_parse_validator (~> 1.7.2) - public_suffix (~> 3.0.0) + zeitwerk (~> 2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + cms_scanner (0.7.1) + get_process_mem (~> 0.2.5) + nokogiri (~> 1.10.4) + opt_parse_validator (~> 1.8.1) + public_suffix (>= 3.0, < 4.1) ruby-progressbar (~> 1.10.0) + sys-proctable (~> 1.2.2) typhoeus (~> 1.3.0) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) concurrent-ruby (1.1.5) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.10.0) - i18n (1.6.0) + ffi (1.11.3) + get_process_mem (0.2.5) + ffi (~> 1.0) + i18n (1.7.0) concurrent-ruby (~> 1.0) mini_portile2 (2.4.0) - minitest (5.11.3) - nokogiri (1.10.3) + minitest (5.13.0) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - opt_parse_validator (1.7.2) - activesupport (>= 4.2, < 5.3.0) - addressable (>= 2.5, < 2.7) - public_suffix (3.0.3) - ruby-progressbar (1.10.0) + opt_parse_validator (1.8.1) + activesupport (> 4.2, < 6.1.0) + addressable (>= 2.5, < 2.8) + public_suffix (4.0.1) + ruby-progressbar (1.10.1) + sys-proctable (1.2.2) + ffi thread_safe (0.3.6) typhoeus (1.3.1) ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - wpscan (3.5.3) - cms_scanner (~> 0.5.0) + wpscan (3.7.5) + cms_scanner (~> 0.7.1) xmlrpc (0.3.0) yajl-ruby (1.4.1) + zeitwerk (2.2.2) PLATFORMS ruby @@ -48,4 +56,4 @@ DEPENDENCIES wpscan BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/pkgs/tools/security/wpscan/default.nix b/pkgs/tools/security/wpscan/default.nix index 85455325f69..e7a784c1a77 100644 --- a/pkgs/tools/security/wpscan/default.nix +++ b/pkgs/tools/security/wpscan/default.nix @@ -13,7 +13,7 @@ bundlerApp { meta = with lib; { description = "Black box WordPress vulnerability scanner"; - homepage = https://wpscan.org/; + homepage = "https://wpscan.org/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ nyanloutre manveru ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix index c0ad80bd99b..5c0691fda1b 100644 --- a/pkgs/tools/security/wpscan/gemset.nix +++ b/pkgs/tools/security/wpscan/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; + sha256 = "190xv21yz03zz8nlfly557ir859jr5zkwi89naziy65hskdnkw1s"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,21 +16,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; cms_scanner = { - dependencies = ["nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "typhoeus" "xmlrpc" "yajl-ruby"]; + dependencies = ["get_process_mem" "nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "sys-proctable" "typhoeus" "xmlrpc" "yajl-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03hvvqq0s35a6l7lx9zpagv0gcdzhw7jvhzssiaiy6y81cx4z9pn"; + sha256 = "14xmsigczibihlziisdgabsaz9lm2v31snlkc8kmza73pv8a61r4"; type = "gem"; }; - version = "0.5.1"; + version = "0.7.1"; }; concurrent-ruby = { groups = ["default"]; @@ -58,10 +58,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.3"; + }; + get_process_mem = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q7pivp9z9pdxc2ha32q7x9zgqy8m9jf87g6n5mvi5l6knxya8sh"; + type = "gem"; + }; + version = "0.2.5"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -69,10 +80,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; + sha256 = "0hmypvx9iyc0b4hski7aic2xzm09cg1c7q1qlpnk3k8s5acxzyhl"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; mini_portile2 = { groups = ["default"]; @@ -89,10 +100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi"; type = "gem"; }; - version = "5.11.3"; + version = "5.13.0"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -100,10 +111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.7"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -111,30 +122,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14zp0260x652pf75maq9ydvqsqgv8ji9w85gjk8f0vwjykf1151n"; + sha256 = "19rm44ww3zfb440kqpdprwb7y2d0gcm4znhv4kfs8dkhz8k1k5vy"; type = "gem"; }; - version = "1.7.2"; + version = "1.8.1"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; type = "gem"; }; - version = "3.0.3"; + version = "4.0.1"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; + sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; + }; + sys-proctable = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ndk34ipd4v96v5cbvj0kbkhnssi4nqrzd7sifyg3bavi1jrw3w8"; + type = "gem"; + }; + version = "1.2.2"; }; thread_safe = { groups = ["default"]; @@ -174,10 +196,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j4v24iwy35q7qy3l8zr5r8mjn7nc7ahdiq13dpgjwrprvrw1jk2"; + sha256 = "0vn6i48msxhj8g769vn2s3siv98cnqchblw69ldk1mr85lw4jci6"; type = "gem"; }; - version = "3.5.3"; + version = "3.7.5"; }; xmlrpc = { groups = ["default"]; @@ -199,4 +221,14 @@ }; version = "1.4.1"; }; -} \ No newline at end of file + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1"; + type = "gem"; + }; + version = "2.2.2"; + }; +} From b5e82ad23967c349f99a222df10040c8f5f8fb64 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 Dec 2019 06:54:43 +0000 Subject: [PATCH 094/113] ocamlPackages.ocaml-version: init at 2.3.0 --- .../ocaml-modules/ocaml-version/default.nix | 22 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocaml-version/default.nix diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix new file mode 100644 index 00000000000..45761e98049 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchurl, buildDunePackage, result }: + +buildDunePackage rec { + + pname = "ocaml-version"; + version = "2.3.0"; + + src = fetchurl { + url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-v${version}.tbz"; + sha256 = "0c711lifl35xila9k0rvhijy9zm3shd37q3jgw7xf01hn1swg0hn"; + }; + + propagatedBuildInputs = [ result ]; + + meta = { + description = "Manipulate, parse and generate OCaml compiler version strings"; + homepage = "https://github.com/ocurrent/ocaml-version"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e583ccb9a82..f3be97c30a7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -585,6 +585,8 @@ let ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; + ocaml-version = callPackage ../development/ocaml-modules/ocaml-version { }; + ocf = callPackage ../development/ocaml-modules/ocf { }; ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; From 089c0efe8c934077bcb7bf8345a2368c101d12c9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 Dec 2019 06:54:48 +0000 Subject: [PATCH 095/113] =?UTF-8?q?ocamlPackages.mdx:=201.4.0=20=E2=86=92?= =?UTF-8?q?=201.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And split to multiple outputs --- .../ocaml-modules/containers/default.nix | 2 +- .../ocaml-modules/iter/default.nix | 2 +- .../development/ocaml-modules/mdx/default.nix | 24 ++++++++++++------- .../ocaml-modules/printbox/default.nix | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 5fd9e9c947a..b12b6e8c265 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { buildInputs = [ iter ]; - checkInputs = lib.optionals doCheck [ gen mdx ounit qcheck uutf ]; + checkInputs = lib.optionals doCheck [ gen mdx.bin ounit qcheck uutf ]; propagatedBuildInputs = [ result uchar ]; diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index eb2ca1409ab..964a7c6f5a3 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh"; }; - buildInputs = lib.optionals doCheck [ mdx qtest ]; + buildInputs = lib.optionals doCheck [ mdx.bin qtest ]; propagatedBuildInputs = [ result ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 0b43cf461e0..43c6c8e41fa 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,24 +1,30 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }: +{ lib, fetchurl, buildDunePackage, opaline, ocaml +, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, ocaml_lwt, pandoc, re }: buildDunePackage rec { pname = "mdx"; - version = "1.4.0"; + version = "1.5.0"; - src = fetchFromGitHub { - owner = "realworldocaml"; - repo = pname; - rev = version; - sha256 = "0ljd00d261s2wf7cab086asqi39icf9zs4nylni6dldaqb027d4w"; + src = fetchurl { + url = "https://github.com/realworldocaml/mdx/releases/download/1.5.0/mdx-1.5.0.tbz"; + sha256 = "0g45plf4z7d178gp0bx7842fwbd3m19679yfph3s95da6mrfm3xn"; }; nativeBuildInputs = [ cppo ]; - buildInputs = [ astring cmdliner fmt logs ocaml-migrate-parsetree re ]; + buildInputs = [ cmdliner ]; + propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version re ]; checkInputs = lib.optionals doCheck [ ocaml_lwt pandoc ]; - doCheck = !lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; dontStrip = lib.versions.majorMinor ocaml.version == "4.04"; + outputs = [ "bin" "lib" "out" ]; + + installPhase = '' + ${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib + ''; + meta = { homepage = https://github.com/realworldocaml/mdx; description = "Executable OCaml code blocks inside markdown files"; diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index 50866e1d969..555ccef3495 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n"; }; - checkInputs = lib.optional doCheck mdx; + checkInputs = lib.optional doCheck mdx.bin; doCheck = !lib.versionAtLeast ocaml.version "4.08"; From d1b80ab31ebfb62c7df9ec20338198b76c34dbae Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Dec 2019 16:03:21 +0100 Subject: [PATCH 096/113] documize-community: 3.5.2 -> 3.6.0 https://github.com/documize/community/releases/tag/v3.6.0 --- pkgs/servers/documize-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 40dc4162161..078936b237f 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "documize-community"; - version = "3.5.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "0wi85ag5n49zqs68gznifza8qv8zkg9l8z1q6ckkvbkl2f3zpdl5"; + sha256 = "0wic4j7spw9ya1m6yz0mkpqi1px6jd2vk60w8ldx0m0k606wy6ir"; }; modSha256 = "1z0v7n8klaxcqv7mvzf3jzgrp78zb4yiibx899ppk6i5qnj4xiv0"; From c593cf54dcd38733195ab522d7554add12c7d194 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 14 Dec 2019 16:28:18 +0100 Subject: [PATCH 097/113] phpPackages.phpstan: 0.12.0 -> 0.12.3 Changelogs: - https://github.com/phpstan/phpstan/releases/tag/0.12.1 - https://github.com/phpstan/phpstan/releases/tag/0.12.2 - https://github.com/phpstan/phpstan/releases/tag/0.12.3 --- pkgs/top-level/php-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9bd304b7d96..7beaa43adad 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -429,12 +429,12 @@ let }; phpstan = mkDerivation rec { - version = "0.12.0"; + version = "0.12.3"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0029727360x0qf6acw4y9yczj59y477i0hx278pb64dvy63fzkmk"; + sha256 = "08ya50qf75nq8ypyhb0vsqnj166kc27rc8iasxr3y7kssbfd95ai"; }; phases = [ "installPhase" ]; @@ -457,7 +457,7 @@ let actual line. ''; license = licenses.mit; - homepage = https://github.com/phpstan/phpstan; + homepage = "https://github.com/phpstan/phpstan"; maintainers = with maintainers; [ etu ]; }; }; From 1896f2b2b05a0165bdae516511e6efee095ba011 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sat, 14 Dec 2019 15:39:08 +0000 Subject: [PATCH 098/113] cargo-outdated: unstable-2019-04-13 -> 0.9.1 --- .../cargo-outdated/cargo-lock.patch | 1283 +++++++++++++++++ .../cargo-outdated/default.nix | 11 +- .../cargo-outdated/update-cargo-lock.sh | 18 + 3 files changed, 1307 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/package-management/cargo-outdated/cargo-lock.patch create mode 100755 pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh diff --git a/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch b/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch new file mode 100644 index 00000000000..7e0528eda2a --- /dev/null +++ b/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch @@ -0,0 +1,1283 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..0f18cc6 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1277 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "adler32" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" ++dependencies = [ ++ "backtrace-sys", ++ "cfg-if", ++ "libc", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" ++dependencies = [ ++ "cc", ++ "libc", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "bstr" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "bytesize" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010" ++ ++[[package]] ++name = "c2-chacha" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" ++dependencies = [ ++ "ppv-lite86", ++] ++ ++[[package]] ++name = "cargo" ++version = "0.40.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03504435a39de1303decb9c9a7416e875f16d4b94769d4d0dd5e1bfb21229640" ++dependencies = [ ++ "atty", ++ "bytesize", ++ "clap", ++ "core-foundation", ++ "crates-io", ++ "crossbeam-utils", ++ "crypto-hash", ++ "curl", ++ "curl-sys", ++ "env_logger 0.6.2", ++ "failure", ++ "filetime", ++ "flate2", ++ "fs2", ++ "fwdansi", ++ "git2", ++ "git2-curl", ++ "glob", ++ "hex 0.4.0", ++ "home", ++ "humantime", ++ "ignore", ++ "im-rc", ++ "jobserver", ++ "lazy_static", ++ "lazycell", ++ "libc", ++ "libgit2-sys", ++ "log", ++ "memchr", ++ "miow", ++ "num_cpus", ++ "opener", ++ "percent-encoding", ++ "remove_dir_all", ++ "rustc-workspace-hack", ++ "rustfix", ++ "same-file", ++ "semver", ++ "serde", ++ "serde_ignored", ++ "serde_json", ++ "shell-escape", ++ "strip-ansi-escapes", ++ "tar", ++ "tempfile", ++ "termcolor", ++ "toml", ++ "unicode-width", ++ "url", ++ "walkdir", ++ "winapi", ++] ++ ++[[package]] ++name = "cargo-outdated" ++version = "0.9.1" ++dependencies = [ ++ "cargo", ++ "docopt", ++ "env_logger 0.7.1", ++ "failure", ++ "semver", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "tabwriter", ++ "tempfile", ++ "termcolor", ++ "toml", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.48" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" ++dependencies = [ ++ "jobserver", ++ "num_cpus", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim 0.8.0", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "commoncrypto" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" ++dependencies = [ ++ "commoncrypto-sys", ++] ++ ++[[package]] ++name = "commoncrypto-sys" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" ++ ++[[package]] ++name = "crates-io" ++version = "0.28.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9dc57b7035c84bcaaa14d89221491b624a32977c230ce6bb77ae191e880c48e1" ++dependencies = [ ++ "curl", ++ "failure", ++ "percent-encoding", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "url", ++] ++ ++[[package]] ++name = "crc32fast" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "crossbeam-channel" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" ++dependencies = [ ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" ++dependencies = [ ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "crypto-hash" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca" ++dependencies = [ ++ "commoncrypto", ++ "hex 0.3.2", ++ "openssl", ++ "winapi", ++] ++ ++[[package]] ++name = "curl" ++version = "0.4.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283" ++dependencies = [ ++ "curl-sys", ++ "libc", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "socket2", ++ "winapi", ++] ++ ++[[package]] ++name = "curl-sys" ++version = "0.4.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f659f3ffac9582d6177bb86d1d2aa649f4eb9d0d4de9d03ccc08b402832ea340" ++dependencies = [ ++ "cc", ++ "libc", ++ "libnghttp2-sys", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++ "vcpkg", ++ "winapi", ++] ++ ++[[package]] ++name = "docopt" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" ++dependencies = [ ++ "lazy_static", ++ "regex", ++ "serde", ++ "strsim 0.9.3", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" ++dependencies = [ ++ "atty", ++ "humantime", ++ "log", ++ "regex", ++ "termcolor", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" ++dependencies = [ ++ "atty", ++ "humantime", ++ "log", ++ "regex", ++ "termcolor", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" ++dependencies = [ ++ "backtrace", ++ "failure_derive", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", ++] ++ ++[[package]] ++name = "filetime" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "redox_syscall", ++ "winapi", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" ++dependencies = [ ++ "cfg-if", ++ "crc32fast", ++ "libc", ++ "libz-sys", ++ "miniz_oxide", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "fs2" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "fwdansi" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" ++dependencies = [ ++ "memchr", ++ "termcolor", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "git2" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26" ++dependencies = [ ++ "bitflags", ++ "libc", ++ "libgit2-sys", ++ "log", ++ "openssl-probe", ++ "openssl-sys", ++ "url", ++] ++ ++[[package]] ++name = "git2-curl" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd6527e480187ce19aaf4fa6acfb7657b25628ce31cb8ffabdfca3bf731524c5" ++dependencies = [ ++ "curl", ++ "git2", ++ "log", ++ "url", ++] ++ ++[[package]] ++name = "glob" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "globset" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" ++dependencies = [ ++ "aho-corasick", ++ "bstr", ++ "fnv", ++ "log", ++ "regex", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" ++ ++[[package]] ++name = "hex" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" ++ ++[[package]] ++name = "home" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3753954f7bd71f0e671afb8b5a992d1724cf43b7f95a563cd4a0bde94659ca8" ++dependencies = [ ++ "scopeguard", ++ "winapi", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" ++dependencies = [ ++ "quick-error", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "ignore" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7" ++dependencies = [ ++ "crossbeam-channel", ++ "globset", ++ "lazy_static", ++ "log", ++ "memchr", ++ "regex", ++ "same-file", ++ "thread_local", ++ "walkdir", ++ "winapi-util", ++] ++ ++[[package]] ++name = "im-rc" ++version = "13.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a0197597d095c0d11107975d3175173f810ee572c2501ff4de64f4f3f119806" ++dependencies = [ ++ "rustc_version", ++ "sized-chunks", ++ "typenum", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" ++ ++[[package]] ++name = "jobserver" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "log", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "lazycell" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" ++ ++[[package]] ++name = "libc" ++version = "0.2.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" ++ ++[[package]] ++name = "libgit2-sys" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16" ++dependencies = [ ++ "cc", ++ "libc", ++ "libssh2-sys", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++] ++ ++[[package]] ++name = "libnghttp2-sys" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02254d44f4435dd79e695f2c2b83cd06a47919adea30216ceaf0c57ca0a72463" ++dependencies = [ ++ "cc", ++ "libc", ++] ++ ++[[package]] ++name = "libssh2-sys" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fcd5a428a31cbbfe059812d74f4b6cd3b9b7426c2bdaec56993c5365da1c328" ++dependencies = [ ++ "cc", ++ "libc", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.0.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++ ++[[package]] ++name = "memchr" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" ++dependencies = [ ++ "adler32", ++] ++ ++[[package]] ++name = "miow" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226" ++dependencies = [ ++ "socket2", ++ "winapi", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "opener" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13117407ca9d0caf3a0e74f97b490a7e64c0ae3aa90a8b7085544d0c37b6f3ae" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "openssl" ++version = "0.10.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" ++dependencies = [ ++ "bitflags", ++ "cfg-if", ++ "foreign-types", ++ "lazy_static", ++ "libc", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.53" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++ ++[[package]] ++name = "quote" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" ++dependencies = [ ++ "c2-chacha", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++ ++[[package]] ++name = "regex" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++ ++[[package]] ++name = "rustc-workspace-hack" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "rustfix" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7150ac777a2931a53489f5a41eb0937b84e3092a20cd0e73ad436b65b507f607" ++dependencies = [ ++ "failure", ++ "log", ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" ++ ++[[package]] ++name = "same-file" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "schannel" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" ++dependencies = [ ++ "lazy_static", ++ "winapi", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser", ++ "serde", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "serde" ++version = "1.0.103" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.103" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_ignored" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7248fdcbd17d3f2604fc2a02d0ecc844d9a7bf52bf95fc196d9f0a38f6da6a0e" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "shell-escape" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "170a13e64f2a51b77a45702ba77287f5c6829375b04a69cf2222acd17d0cfab9" ++ ++[[package]] ++name = "sized-chunks" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f01db57d7ee89c8e053245deb77040a6cc8508311f381c88749c33d4b9b78785" ++dependencies = [ ++ "typenum", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" ++ ++[[package]] ++name = "socket2" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "redox_syscall", ++ "winapi", ++] ++ ++[[package]] ++name = "strip-ansi-escapes" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d63676e2abafa709460982ddc02a3bb586b6d15a49b75c212e06edd3933acee" ++dependencies = [ ++ "vte", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "strsim" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" ++ ++[[package]] ++name = "syn" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "tabwriter" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "tar" ++version = "0.4.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3" ++dependencies = [ ++ "filetime", ++ "libc", ++ "redox_syscall", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" ++dependencies = [ ++ "wincolor", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++dependencies = [ ++ "matches", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf" ++dependencies = [ ++ "smallvec", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++ ++[[package]] ++name = "url" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" ++dependencies = [ ++ "idna", ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "utf8parse" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++ ++[[package]] ++name = "vte" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf" ++dependencies = [ ++ "utf8parse", ++] ++ ++[[package]] ++name = "walkdir" ++version = "2.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" ++dependencies = [ ++ "same-file", ++ "winapi", ++ "winapi-util", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "wincolor" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" ++dependencies = [ ++ "winapi", ++ "winapi-util", ++] diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 71567df9403..7d684d943b9 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "unstable-2019-04-13"; + version = "0.9.1"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; - rev = "ce4b6baddc94b77a155abbb5a4fa4d3b31a45598"; - sha256 = "0x00vn0ldnm2hvndfmq4g4q5w6axyg9vsri3i5zxhmir7423xabp"; + rev = "v${version}"; + sha256 = "02gsarwm4gjkr9m4sfbjwp37xmqhch8qpyy027bxqkg8iyipxm69"; }; - cargoSha256 = "1xqii2z0asgkwn1ny9n19w7d4sjz12a6i55x2pf4cfrciapdpvdl"; + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "1ywmrvkwwwwh99l4j8vc4cyk8qjd0jx8hn68yr2h31ya1bzcqbd1"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] @@ -26,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = https://github.com/kbknapp/cargo-outdated; license = with licenses; [ asl20 /* or */ mit ]; platforms = platforms.all; - maintainers = [ maintainers.sondr3 ]; + maintainers = with maintainers; [ sondr3 ivan ]; }; } diff --git a/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh b/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh new file mode 100755 index 00000000000..21ee27c59b7 --- /dev/null +++ b/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +# This updates cargo-lock.patch for the cargo-outdated version listed in default.nix. + +set -eu -o verbose + +here=$PWD +version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2) +checkout=$(mktemp -d) +git clone -b "v$version" --depth=1 https://github.com/kbknapp/cargo-outdated "$checkout" +cd "$checkout" + +cargo generate-lockfile +git add -f Cargo.lock +git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch + +cd "$here" +rm -rf "$checkout" From e69c094227f15a16d91dc8f2e15b695cb6781a95 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 Dec 2019 16:43:38 +0100 Subject: [PATCH 099/113] html-proofer: 3.14.1 -> 3.15.0 --- pkgs/tools/misc/html-proofer/Gemfile.lock | 12 ++++++---- pkgs/tools/misc/html-proofer/gemset.nix | 29 ++++++++++++++++------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index ac229cf4657..ec69f523f3b 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -5,20 +5,22 @@ GEM public_suffix (>= 2.0.2, < 5.0) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.11.2) - html-proofer (3.14.1) + ffi (1.11.3) + html-proofer (3.15.0) addressable (~> 2.3) mercenary (~> 0.3) - nokogiri (~> 1.10) + nokogumbo (~> 2.0) parallel (~> 1.3) rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) mercenary (0.3.6) mini_portile2 (2.4.0) - nokogiri (1.10.5) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.19.0) + nokogumbo (2.0.2) + nokogiri (~> 1.8, >= 1.8.4) + parallel (1.19.1) public_suffix (4.0.1) rainbow (3.0.0) typhoeus (1.3.1) diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index 8cf066c6c68..1f561f52976 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -26,21 +26,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw"; + sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd"; type = "gem"; }; - version = "1.11.2"; + version = "1.11.3"; }; html-proofer = { - dependencies = ["addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"]; + dependencies = ["addressable" "mercenary" "nokogumbo" "parallel" "rainbow" "typhoeus" "yell"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16i803vhrygcbln077czhv9ngipljsawr338lbvd0zr2473r8qja"; + sha256 = "0nmwxmn0dxgs53g1cqn251dzmjrklw14cpa6z6wz7cdwvjq47500"; type = "gem"; }; - version = "3.14.1"; + version = "3.15.0"; }; mercenary = { groups = ["default"]; @@ -68,20 +68,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; + sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; type = "gem"; }; - version = "1.10.5"; + version = "1.10.7"; + }; + nokogumbo = { + dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sxjnpjvrn10gdmfw2dimhch861lz00f28hvkkz0b1gc2rb65k9s"; + type = "gem"; + }; + version = "2.0.2"; }; parallel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bsg06zklvxv1qkpqhiric2m07108rqlmnl4axv5fzpxx9973pfz"; + sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; type = "gem"; }; - version = "1.19.0"; + version = "1.19.1"; }; public_suffix = { groups = ["default"]; From 0eb53ff3c72dbaa1997f55f28a3fa0730dec6321 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Dec 2019 08:56:49 -0800 Subject: [PATCH 100/113] tcllib: 1.19 -> 1.20 (#75401) --- pkgs/development/libraries/tcllib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 40e137204e2..b1add708902 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcllib"; - version = "1.19"; + version = "1.20"; src = fetchurl { url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; - sha256 = "173abxaazdmf210v651708ab6h7xhskvd52krxk6ifam337qgzh1"; + sha256 = "0wax281h6ksz974a5qpfgf9y34lmlpd8i87lkm1w94ybbd3rgc73"; }; passthru = { From fc21603717d32ff0ed17736c6e184ada9708ec2e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 14 Dec 2019 12:05:18 -0500 Subject: [PATCH 101/113] pythonPackages.root_numpy: remove --- .../python-modules/root_numpy/default.nix | 27 ------------------- .../python-modules/rootpy/default.nix | 4 +-- pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/root_numpy/default.nix diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix deleted file mode 100644 index 910a37ddd57..00000000000 --- a/pkgs/development/python-modules/root_numpy/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root, nose, setuptools }: - -buildPythonPackage rec { - pname = "root_numpy"; - version = "4.8.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "5842bbcde92133f60a61f56e9f0a875a0dbc2a567cc65a9ac141ecd72e416878"; - }; - - disabled = isPy3k; # blocked by #27649 - checkInputs = [ nose ]; - checkPhase = '' - python setup.py install_lib -d . - nosetests -s -v root_numpy - ''; - - propagatedBuildInputs = [ numpy root setuptools ]; - - meta = with lib; { - homepage = http://scikit-hep.org/root_numpy; - license = licenses.bsd3; - description = "The interface between ROOT and NumPy"; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix index 8384510468a..2478f6bfea3 100644 --- a/pkgs/development/python-modules/rootpy/default.nix +++ b/pkgs/development/python-modules/rootpy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables, pytest }: +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, tables, pytest }: buildPythonPackage rec { pname = "rootpy"; @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = isPy3k; - propagatedBuildInputs = [ matplotlib numpy root root_numpy tables ]; + propagatedBuildInputs = [ matplotlib numpy root tables ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e27fe28ea0..4961a1dd782 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5044,8 +5044,6 @@ in { Pyro4 = callPackage ../development/python-modules/pyro4 { }; - root_numpy = callPackage ../development/python-modules/root_numpy { }; - rootpy = callPackage ../development/python-modules/rootpy { }; rope = callPackage ../development/python-modules/rope { }; From a46e3ebae59fe31f0a943566855eeb04d4424e0c Mon Sep 17 00:00:00 2001 From: itsHMR <58695681+itsHMR@users.noreply.github.com> Date: Sat, 14 Dec 2019 18:06:01 +0100 Subject: [PATCH 102/113] tigervnc: add perl to buildInputs (#75367) tigervnc ships vncserver, quote from the documentation: vncserver - a wrapper script which makes starting Xvnc more convenient vncserver requires Perl. --- pkgs/tools/admin/tigervnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 3536e39418e..78fa4359c91 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -5,7 +5,7 @@ , cmake, gettext, libtool , libGLU , gnutls, pam, nettle -, xterm, openssh +, xterm, openssh, perl , makeWrapper}: with stdenv.lib; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { buildInputs = with xorg; [ libjpeg_turbo fltk pixman - gnutls pam nettle + gnutls pam nettle perl xorgproto utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft libxkbfile libXfont2 libpciaccess From ba3cf09788b7e4232929ed7d9976ab5f326117c6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 14 Dec 2019 12:07:29 -0500 Subject: [PATCH 103/113] pythonPackages.rootpy: remove --- .../python-modules/rootpy/default.nix | 30 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/development/python-modules/rootpy/default.nix diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix deleted file mode 100644 index 2478f6bfea3..00000000000 --- a/pkgs/development/python-modules/rootpy/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, tables, pytest }: - -buildPythonPackage rec { - pname = "rootpy"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0zp2bh87l3f0shiqslbvfmavfdj8m80y8fsrz8rsi5pzqj7zr1bx"; - }; - - disabled = isPy3k; - - propagatedBuildInputs = [ matplotlib numpy root tables ]; - - checkInputs = [ pytest ]; - checkPhase = '' - # tests fail with /homeless-shelter - export HOME=$PWD - # skip problematic tests - py.test rootpy -k "not test_stl and not test_cpp and not test_xrootd_glob_single and not test_xrootd_glob_multiple" - ''; - - meta = with lib; { - homepage = http://www.rootpy.org; - license = licenses.bsd3; - description = "Pythonic interface to the ROOT framework"; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4961a1dd782..159b4842f1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5044,8 +5044,6 @@ in { Pyro4 = callPackage ../development/python-modules/pyro4 { }; - rootpy = callPackage ../development/python-modules/rootpy { }; - rope = callPackage ../development/python-modules/rope { }; ropper = callPackage ../development/python-modules/ropper { }; From cc21777500d3ae396568bb1bfa3292df1a17edde Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Dec 2019 09:21:53 -0800 Subject: [PATCH 104/113] qbittorrent: 4.1.9.1 -> 4.2.0 (#75360) --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index aebdeda6108..173b4f02cdf 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.1.9.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "19zgqlby7i1kr20wa4zd99qzd062a879xxxbmlf40rnqiqy4bhyi"; + sha256 = "17vm6aa2k8k1q14z9r2r06c794bcr4m0l0fdsn08wid6mj1zjsbx"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported From 46460d3d7adf2a9a813d03eec26c8dc9149e0909 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 14 Dec 2019 17:49:18 +0000 Subject: [PATCH 105/113] crun: 0.8 -> 0.10.6 (security) (#75304) addressing CVE-2019-18837 --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 7dddc3b533b..9376adf8d6a 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "crun"; - version = "0.8"; + version = "0.10.6"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "1anvlgw373031w0pp0b28l10yrnyhbj192n60bbbjahw487dk2fi"; + sha256 = "0v1hrlpnln0c976fb0k2ig4jv11qbyzf95z0wy92fd8r8in16rc1"; fetchSubmodules = true; }; From eb33f2050a6c3009529a1e7f867121350c9f1afe Mon Sep 17 00:00:00 2001 From: Henrik Jonsson Date: Mon, 12 Aug 2019 02:08:17 +0400 Subject: [PATCH 106/113] python3Packages.ckcc-protocol: init at 0.8.0 The ckcc-protocol package installs https://github.com/Coldcard/ckcc-protocol, which allows communication with the https://coldcardwallet.com/ hardware wallet. --- .../python-modules/ckcc-protocol/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/ckcc-protocol/default.nix diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix new file mode 100644 index 00000000000..599f91f2d07 --- /dev/null +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, click +, ecdsa +, hidapi +, lib +, fetchPypi +, pytest +, pyaes +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ckcc-protocol"; + version = "0.8.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mbs9l8qycy50j5lq6az7l5d8i40nb0vmlyhcyax298qp6c1r1gh"; + }; + + checkInputs = [ + pytest + ]; + + propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; + + meta = with stdenv.lib; { + description = "Communicate with your Coldcard using Python"; + homepage = https://github.com/Coldcard/ckcc-protocol; + license = licenses.gpl3; + maintainers = [ maintainers.hkjn ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 159b4842f1f..f49fb7df459 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6134,6 +6134,8 @@ in { inherit (pkgs) udev libusb1; }; + ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + mnemonic = callPackage ../development/python-modules/mnemonic { }; keepkey = callPackage ../development/python-modules/keepkey { }; From 9ace40c7651dd15694c30a6a234b489d2750f765 Mon Sep 17 00:00:00 2001 From: Henrik Jonsson Date: Mon, 12 Aug 2019 02:09:17 +0400 Subject: [PATCH 107/113] electrum: Add ckcc-protocol Similar to keepkey, trezor and btchip, ckcc-protocol is a plugin, allowing electrum to communicate with the https://coldcardwallet.com/ hardware wallet. --- pkgs/applications/misc/electrum/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 0ebeb1beffa..df95b26b9c5 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -74,6 +74,7 @@ python3Packages.buildPythonApplication { tlslite-ng # plugins + ckcc-protocol keepkey trezor btchip From 9475a7da6cd3f0e4f57608931778286457612ebe Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 14 Dec 2019 00:31:37 -0500 Subject: [PATCH 108/113] pythonPackages.pymavlink: init at 2.4.1 --- .../python-modules/pymavlink/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pymavlink/default.nix diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix new file mode 100644 index 00000000000..2d137ec01aa --- /dev/null +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, future, lxml }: + +buildPythonPackage rec { + pname = "pymavlink"; + version = "2.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0y9rz3piddzdjpp7d5w9xi6lc9v9b4p4375a5hrfiphrmhds85i3"; + }; + + propagatedBuildInputs = [ future lxml ]; + + # No tests included in PyPI tarball + doCheck = false; + + meta = with lib; { + description = "Python MAVLink interface and utilities"; + homepage = "https://github.com/ArduPilot/pymavlink"; + license = licenses.lgpl3; + maintainers = with maintainers; [ lopsided98 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f49fb7df459..8a28f48e015 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1070,6 +1070,8 @@ in { pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; + pymavlink = callPackage ../development/python-modules/pymavlink { }; + pymsgbox = callPackage ../development/python-modules/pymsgbox { }; pynisher = callPackage ../development/python-modules/pynisher { }; From bd9549baa90c9535dc50a0f9bbf9e2ad77841fbc Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 14 Dec 2019 00:32:57 -0500 Subject: [PATCH 109/113] mavproxy: init at 1.8.17 --- .../science/robotics/mavproxy/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/science/robotics/mavproxy/default.nix diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix new file mode 100644 index 00000000000..890e824cf2e --- /dev/null +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial +, setuptools, wxPython_4_0 }: + +buildPythonApplication rec { + pname = "MAVProxy"; + version = "1.8.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "193hjilsmbljbgj7v6icy3b4hzm14l0z6v05v7ycx6larij5xj2r"; + }; + + propagatedBuildInputs = [ + matplotlib + numpy + pymavlink + pyserial + setuptools + wxPython_4_0 + ]; + + # No tests + doCheck = false; + + meta = with lib; { + description = "MAVLink proxy and command line ground station"; + homepage = "https://github.com/ArduPilot/MAVProxy"; + license = licenses.gpl3; + maintainers = with maintainers; [ lopsided98 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2508dc7214..a53ae00ae6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10189,6 +10189,8 @@ in maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; + go-md2man = callPackage ../development/tools/misc/md2man {}; mage = callPackage ../development/tools/build-managers/mage { }; From e6b29634d2536889b3307f2920c53c07c12d9a9b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 Dec 2019 20:16:36 +0100 Subject: [PATCH 110/113] fuse3: 3.8.0 -> 3.9.0 (#75655) Changelog: https://github.com/libfuse/libfuse/blob/fuse-3.9.0/ChangeLog.rst --- pkgs/os-specific/linux/fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index edee6a52ba2..6792e05829d 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.8.0"; - sha256Hash = "0zbj5l2pffs0q38lqfrnkafsgxf50mw5mqmh4m2jmqab1fxg5mip"; + version = "3.9.0"; + sha256Hash = "00yppzmv15jqjy3wq5ki9d49jl6bfxrlwr5sfz50ihr40d6dgx9p"; }; } From ee7ed8da31e2eb3f83ffd63b9338750306c79402 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 14 Dec 2019 20:25:04 +0100 Subject: [PATCH 111/113] procdump: 1.0.1 -> 1.1 (#75658) --- pkgs/os-specific/linux/procdump/default.nix | 31 +++++++++++---------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/os-specific/linux/procdump/default.nix index 0185d3022bc..d24f665cc7c 100644 --- a/pkgs/os-specific/linux/procdump/default.nix +++ b/pkgs/os-specific/linux/procdump/default.nix @@ -1,28 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, bash, coreutils, gdb, zlib }: +{ stdenv, fetchFromGitHub, bash, coreutils, gdb, zlib }: stdenv.mkDerivation rec { pname = "procdump"; - version = "1.0.1"; + version = "1.1"; src = fetchFromGitHub { owner = "Microsoft"; repo = "ProcDump-for-Linux"; rev = version; - sha256 = "1lkm05hq4hl1vadj9ifm18hi7cbf5045xlfxdfbrpsl6kxgfwcc4"; + sha256 = "1pcf6cpslpazla0na0q680dih9wb811q5irr7d2zmw0qmxm33jw2"; }; nativeBuildInputs = [ zlib ]; buildInputs = [ bash coreutils gdb ]; - patches = [ - # Fix name conflict when built with musl - # TODO: check if fixed upstream https://github.com/Microsoft/ProcDump-for-Linux/pull/50 - (fetchpatch { - url = "https://github.com/Microsoft/ProcDump-for-Linux/commit/1b7b50b910f20b463fb628c8213663c8a8d11d0d.patch"; - sha256 = "0h0dj3gi6hw1wdpc0ih9s4kkagv0d9jzrg602cr85r2z19lmb7yk"; - }) - ]; - postPatch = '' substituteInPlace src/CoreDumpWriter.c \ --replace '"gcore ' '"${gdb}/bin/gcore ' \ @@ -31,16 +22,26 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "DESTDIR=$(out)" + "DESTDIR=${placeholder "out"}" "INSTALLDIR=/bin" "MANDIR=/share/man/man1" ]; - doCheck = false; # needs root + doCheck = false; # needs sudo root + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + set +o pipefail + ($out/bin/procdump -h | grep "ProcDump v${version}") || + (echo "ERROR: ProcDump is not the expected version or does not run properly" ; exit 1) + set -o pipefail + runHook postInstallCheck + ''; meta = with stdenv.lib; { description = "A Linux version of the ProcDump Sysinternals tool"; - homepage = https://github.com/Microsoft/ProcDump-for-Linux; + homepage = "https://github.com/Microsoft/ProcDump-for-Linux"; license = licenses.mit; maintainers = with maintainers; [ c0bw3b ]; platforms = platforms.linux; From b916b9e8842904150aea388bdd85d2004f8f2004 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 Dec 2019 20:48:27 +0100 Subject: [PATCH 112/113] androidStudioPackages.{dev,canary}: 4.0.0.5 -> 4.0.0.6 --- 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 6d7048cf539..ee3865590e5 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0qlrdf7a6f5585mrni1aa2chic4n7b9c8lgrj8br6q929hc2f5d9"; }; latestVersion = { # canary & dev - version = "4.0.0.5"; # "Android Studio 4.0 Canary 5" - build = "193.6039983"; - sha256Hash = "19pidwl46z7alc0d7awhvi4aq1r87f99wh5yfi94s1zd2azm9f9z"; + version = "4.0.0.6"; # "Android Studio 4.0 Canary 6" + build = "193.6052267"; + sha256Hash = "1naxyfnrj7milqha7xbwbcvyi81a7fqb7jsm03hhq5xs2sw55m1c"; }; in { # Attributes are named by their corresponding release channels From 7d944554ddf2a8f4c5f47b4a9bb2e1c7a3deac2c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Dec 2019 21:00:05 +0100 Subject: [PATCH 113/113] dlib: 19.18 -> 19.19 https://github.com/davisking/dlib/releases/tag/v19.19 --- pkgs/development/libraries/dlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index aae8989c238..6d6bef21f39 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "dlib"; - version = "19.18"; + version = "19.19"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "1kbrcf35pn2ymyr8q48ls98n2zb7rrz5207kwpisfh6k22g802ic"; + sha256 = "0574p46zf85nx33cam4yqcg20g94kkmrvi5689r1xshprr0szghp"; }; postPatch = ''