From 4ea9d8390b5195dcef5eaf567f73f314952bebc2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 27 Mar 2019 15:08:50 +0800 Subject: [PATCH 001/159] dupd: init at 1.7 --- pkgs/tools/misc/dupd/default.nix | 49 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/tools/misc/dupd/default.nix diff --git a/pkgs/tools/misc/dupd/default.nix b/pkgs/tools/misc/dupd/default.nix new file mode 100644 index 00000000000..06b9f3adac9 --- /dev/null +++ b/pkgs/tools/misc/dupd/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, perl, which +, openssl, sqlite }: + +# Instead of writing directly into $HOME, we change the default db location +# from $HOME/.dupd_sqlite to $HOME/.cache/dupd.sqlite3 + +stdenv.mkDerivation rec { + pname = "dupd"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "jvirkki"; + repo = "dupd"; + rev = version; + sha256 = "0vg4vbiwjc5p22cisj8970mym4y2r29fcm08ibik92786vsbxcqk"; + }; + + postPatch = '' + patchShebangs tests + + # tests need HOME to write the database + export HOME=$TMPDIR + + mkdir -p $HOME/.cache + + for f in man/dupd man/dupd.1 src/main.c tests/test.56 tests/test.57 ; do + substituteInPlace $f --replace .dupd_sqlite .cache/dupd.sqlite3 + done + ''; + + buildInputs = [ openssl sqlite ]; + + nativeBuildInputs = [ perl which ]; + + makeFlags = [ + "INSTALL_PREFIX=$(out)" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with stdenv.lib; { + description = "CLI utility to find duplicate files"; + homepage = http://www.virkki.com/dupd; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1240d373dbb..acdf8eada43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17967,6 +17967,8 @@ in japa = callPackage ../applications/audio/japa { }; + dupd = callPackage ../tools/misc/dupd { }; + jdupes = callPackage ../tools/misc/jdupes { }; jedit = callPackage ../applications/editors/jedit { }; From 49e61479d4a5b7e091f55af9f63ca79ddf9b0227 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 5 Aug 2019 17:39:40 +0800 Subject: [PATCH 002/159] mtr: build a -gui option as well --- pkgs/tools/networking/mtr/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 59242551f92..b83e839d1a7 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig , libcap, ncurses , withGtk ? false, gtk2 ? null }: assert withGtk -> gtk2 != null; stdenv.mkDerivation rec { - pname = "mtr"; + pname = "mtr${lib.optionalString withGtk "-gui"}"; version = "0.93"; src = fetchFromGitHub { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77563721c58..cd704ce8e9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4781,6 +4781,8 @@ in mtr = callPackage ../tools/networking/mtr {}; + mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; }; + mtx = callPackage ../tools/backup/mtx {}; mt-st = callPackage ../tools/backup/mt-st {}; From 968d4643b0380238af6abeac56b794a7f45e7ea7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 5 Aug 2019 17:42:17 +0800 Subject: [PATCH 003/159] nixos/mtr: make the package configurable --- nixos/modules/programs/mtr.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/mtr.nix b/nixos/modules/programs/mtr.nix index 1fdec4c04f6..75b710c1584 100644 --- a/nixos/modules/programs/mtr.nix +++ b/nixos/modules/programs/mtr.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.programs.mtr; + in { options = { programs.mtr = { @@ -15,13 +16,22 @@ in { setcap wrapper for it. ''; }; + + package = mkOption { + type = types.package; + default = pkgs.mtr; + description = '' + The package to use. + ''; + }; }; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ mtr ]; + environment.systemPackages = with pkgs; [ cfg.package ]; + security.wrappers.mtr-packet = { - source = "${pkgs.mtr}/bin/mtr-packet"; + source = "${cfg.package}/bin/mtr-packet"; capabilities = "cap_net_raw+p"; }; }; From 83c1e8c319799c1b95b4979fcd84ebe528a9238f Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Tue, 2 Jul 2019 22:36:31 -0400 Subject: [PATCH 004/159] plan9port: use C compiler from Nix The install script was escaping the Nix environment on Mac OS by using `xcrun -sdk macos clang` as its C compiler. Using the Nix compiler required declaring the necessary frameworks as inputs and patching build scripts to assume MacOS 10.12 (and not try to detect). So cached derivations prior to this would probably not work on all intended target machines. This *might* also fix installCheck on Darwin on Hydra. Other minor fixes: * Disable parallel building due to a race with a missing y.tab.h * Use NIX_CFLAGS_COMPILE/NIX_LDFLAGS instead of trying to synthesize something like them. * X11 dependencies aren't used on Darwin when the windowing system is correctly detected --- pkgs/tools/system/plan9port/builder.sh | 59 ++++++++++++++++--- .../system/plan9port/darwin-cfframework.patch | 24 ++++++++ .../system/plan9port/darwin-sw_vers.patch | 47 +++++++++++++++ pkgs/tools/system/plan9port/default.nix | 40 ++++++------- pkgs/tools/system/plan9port/tmpdir.patch | 41 +++++++++++++ 5 files changed, 181 insertions(+), 30 deletions(-) create mode 100644 pkgs/tools/system/plan9port/darwin-cfframework.patch create mode 100644 pkgs/tools/system/plan9port/darwin-sw_vers.patch create mode 100644 pkgs/tools/system/plan9port/tmpdir.patch diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index c0d7134bcc5..77f6632ff53 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -3,11 +3,40 @@ source $stdenv/setup export PLAN9=$out/plan9 export PLAN9_TARGET=$PLAN9 +plan9portLinkFlags() +{ + local -a linkFlags=() + eval set -- "$NIX_LDFLAGS" + while (( $# > 0 )); do + if [[ $1 = -rpath ]]; then + linkFlags+=( "-Wl,-rpath,$2" ) + shift 2 + else + linkFlags+=( "$1" ) + shift + fi + done + echo "${linkFlags[*]}" +} + configurePhase() { - echo CFLAGS=\"-I${fontconfig_dev}/include -I${xorgproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config - echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xorgproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> LOCAL.config - echo X11=\"${libXt_dev}/include\" >> LOCAL.config + ( + echo CC9=\"$(which $CC)\" + echo CFLAGS=\"$NIX_CFLAGS_COMPILE\" + echo LDFLAGS=\"$(plan9portLinkFlags)\" + echo X11=\"${libXt_dev}/include\" + case "$system" in + x86_64-*) echo OBJTYPE=x86_64;; + i?86-*) echo OBJTYPE=386;; + *power*) echo OBJTYPE=power;; + *sparc*) echo OBJTYPE=sparc;; + *) exit 12 + esac + if [[ $system =~ .*linux.* ]]; then + echo SYSVERSION=2.6.x + fi + ) >config for f in `grep -l -r /usr/local/plan9`; do sed "s,/usr/local/plan9,${PLAN9},g" -i $f @@ -17,15 +46,29 @@ configurePhase() buildPhase() { mkdir -p $PLAN9 - ./INSTALL -b + + # Copy sources, some necessary bin scripts + cp -R * $PLAN9 + + local originalPath="$PATH" + export PATH="$PLAN9/bin:$PATH" + export NPROC=$NIX_BUILD_CORES + pushd src + ../dist/buildmk + mk clean + mk libs-nuke + mk all + mk -k install + if [[ -f $PLAN9/bin/quote1 ]]; then + cp $PLAN9/bin/quote1 $PLAN9/bin/'"' + cp $PLAN9/bin/quote2 $PLAN9/bin/'""' + fi + popd + export PATH="$originalPath" } installPhase() { - ./INSTALL -c - # Copy sources - cp -R * $PLAN9 - # Copy the `9' utility. This way you can use # $ 9 awk # to use the plan 9 awk diff --git a/pkgs/tools/system/plan9port/darwin-cfframework.patch b/pkgs/tools/system/plan9port/darwin-cfframework.patch new file mode 100644 index 00000000000..01541af92e3 --- /dev/null +++ b/pkgs/tools/system/plan9port/darwin-cfframework.patch @@ -0,0 +1,24 @@ +From d1f0bd3de7d3d54523aeefd9731ea850d20eaab4 Mon Sep 17 00:00:00 2001 +From: Jason Felice +Date: Tue, 2 Jul 2019 13:19:23 -0400 +Subject: [PATCH] Need CoreFoundation + +--- + src/cmd/devdraw/cocoa-screen.m | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/cmd/devdraw/cocoa-screen.m b/src/cmd/devdraw/cocoa-screen.m +index 97128da2..0e380dd3 100644 +--- a/src/cmd/devdraw/cocoa-screen.m ++++ b/src/cmd/devdraw/cocoa-screen.m +@@ -56,6 +56,7 @@ + #endif + + AUTOFRAMEWORK(Cocoa) ++AUTOFRAMEWORK(CoreFoundation) + + #define LOG if(0)NSLog + #define panic sysfatal +-- +2.21.0 + diff --git a/pkgs/tools/system/plan9port/darwin-sw_vers.patch b/pkgs/tools/system/plan9port/darwin-sw_vers.patch new file mode 100644 index 00000000000..3e61c83e540 --- /dev/null +++ b/pkgs/tools/system/plan9port/darwin-sw_vers.patch @@ -0,0 +1,47 @@ +From d21d082275f04f88eabcc8ecdb03ee932c71ebf1 Mon Sep 17 00:00:00 2001 +From: Jason Felice +Date: Mon, 1 Jul 2019 15:23:19 -0400 +Subject: [PATCH 2/3] Build for 10.12 + +--- + bin/osxvers | 3 +-- + src/cmd/devdraw/mkwsysrules.sh | 4 ++-- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/bin/osxvers b/bin/osxvers +index 4af44da2..3be7e6e9 100755 +--- a/bin/osxvers ++++ b/bin/osxvers +@@ -2,6 +2,5 @@ + + u=`uname` + case "$u" in +-Darwin) +- sw_vers | awk '$1 == "ProductVersion:" {print $2}' | awk -F. '{printf("CFLAGS=$CFLAGS -DOSX_VERSION=%d%02d%02d\n", $1, $2, $3)}' ++Darwin) printf 'CFLAGS=$CFLAGS -DOSX_VERSION=101200\n';; + esac +diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh +index e94afbd3..40e632db 100644 +--- a/src/cmd/devdraw/mkwsysrules.sh ++++ b/src/cmd/devdraw/mkwsysrules.sh +@@ -22,7 +22,7 @@ fi + + if [ "x$WSYSTYPE" = "x" ]; then + if [ "x`uname`" = "xDarwin" ]; then +- if sw_vers | grep 'ProductVersion: 10\.[0-5]\.' >/dev/null; then ++ if false; then + echo 1>&2 'OS X 10.5 and older are not supported' + exit 1 + else +@@ -54,7 +54,7 @@ if [ $WSYSTYPE = x11 ]; then + XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'` + echo 'WSYSOFILES=$WSYSOFILES '$XO + elif [ $WSYSTYPE = osx-cocoa ]; then +- if sw_vers|awk '/ProductVersion/{split($2,a,".");exit(a[2]<14)}' >/dev/null; then # 0 is true in sh. ++ if false; then + echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' + echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-metal-objc.o cocoa-srv.o cocoa-thread.o' + else +-- +2.21.0 + diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index b3909a79d94..1f5c6814e39 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,7 +1,11 @@ -{ stdenv, fetchFromGitHub, which, libX11, libXt, fontconfig, freetype +{ stdenv, fetchFromGitHub, which +, darwin ? null , xorgproto ? null +, libX11 , libXext ? null -, zlib ? null +, libXt ? null +, fontconfig ? null +, freetype ? null , perl ? null # For building web manuals }: @@ -17,6 +21,12 @@ stdenv.mkDerivation rec { sha256 = "1lp17948q7vpl8rc2bf5a45bc8jqyj0s3zffmks9r25ai42vgb43"; }; + patches = [ + ./tmpdir.patch + ./darwin-sw_vers.patch + ./darwin-cfframework.patch + ]; + postPatch = '' #hardcoded path substituteInPlace src/cmd/acme/acme.c \ @@ -35,30 +45,16 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - which perl libX11 fontconfig xorgproto libXt libXext + which perl + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + xorgproto libX11 libXext libXt fontconfig freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + darwin.cf-private Carbon Cocoa IOKit Metal QuartzCore + ]); builder = ./builder.sh; - - libX11_dev = libX11.dev; libXt_dev = libXt.dev; - libXext_dev = libXext.dev; - fontconfig_dev = fontconfig.dev; - freetype_dev = freetype.dev; - zlib_dev = zlib.dev; - - xorgproto_exp = xorgproto; - libX11_exp = libX11; - libXt_exp = libXt; - libXext_exp = libXext; - freetype_exp = freetype; - zlib_exp = zlib; - - fontconfig_lib = fontconfig.lib; - - NIX_LDFLAGS="-lgcc_s"; - enableParallelBuilding = true; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/system/plan9port/tmpdir.patch b/pkgs/tools/system/plan9port/tmpdir.patch new file mode 100644 index 00000000000..e8200a177a2 --- /dev/null +++ b/pkgs/tools/system/plan9port/tmpdir.patch @@ -0,0 +1,41 @@ +From c762625549ff367b54bcd8281d1ce248a69b4401 Mon Sep 17 00:00:00 2001 +From: Jason Felice +Date: Mon, 1 Jul 2019 15:01:21 -0400 +Subject: [PATCH] Use $TMPDIR if available + +NixOS sandboxed builds (at least on Mac) don't have access to /tmp, +and this should be better POSIX. +--- + bin/9c | 2 +- + bin/9l | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bin/9c b/bin/9c +index 3ffb716c..88c47887 100755 +--- a/bin/9c ++++ b/bin/9c +@@ -133,7 +133,7 @@ case "$tag" in + esac + + # N.B. Must use temp file to avoid pipe; pipe loses status. +-xtmp=/tmp/9c.$$.$USER.out ++xtmp=${TMPDIR-/tmp}/9c.$$.$USER.out + $cc -DPLAN9PORT -I$PLAN9/include $cflags "$@" 2>$xtmp + status=$? + quiet $xtmp +diff --git a/bin/9l b/bin/9l +index 6195815f..717a540a 100755 +--- a/bin/9l ++++ b/bin/9l +@@ -346,7 +346,7 @@ then + echo $ld -L$PLAN9/lib "$@" $libsl $extralibs $frameworks + fi + +-xtmp=/tmp/9l.$$.$USER.out ++xtmp="${TMPDIR-/tmp}/9l.$$.$USER.out" + xxout() { + sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . | + egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub' +-- +2.21.0 + From bdda1e5b66e81002b8d7a9aef73332164def7705 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 12 Aug 2019 02:38:33 +0200 Subject: [PATCH 005/159] warzone: 3.2.3 -> 3.3.0_beta1 --- pkgs/games/warzone2100/default.nix | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 6165cacfdca..b9c310f8296 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchurl, perl, unzip, zip, which, pkgconfig -, qtbase, qtscript, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr +{ stdenv, mkDerivation, fetchurl, autoconf, automake +, perl, unzip, zip, which, pkgconfig, qtbase, qtscript +, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr , withVideos ? false }: @@ -11,17 +12,25 @@ let }; in -stdenv.mkDerivation rec { - version = "3.2.3"; - name = "${pname}-${version}"; +mkDerivation rec { + name = "${pname}-${main}_${sub}"; + main = "3.3.0"; + sub = "beta1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz"; - sha256 = "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw"; + url = "mirror://sourceforge/${pname}/releases/${main}/${name}.tar.xz"; + sha256 = "1jnc334ps88v14cbkp499kk7ini7mbrs1xsz7d04y0w238q407zn"; }; - buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi libXrandr ]; - nativeBuildInputs = [ perl zip unzip pkgconfig ]; + buildInputs = [ + qtbase qtscript SDL2 libtheora openal + glew physfs fribidi libXrandr + ]; + nativeBuildInputs = [ + perl zip unzip pkgconfig autoconf automake + ]; + + preConfigure = "./autogen.sh"; postPatch = '' substituteInPlace lib/exceptionhandler/dumpinfo.cpp \ @@ -36,7 +45,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; + postInstall = stdenv.lib.optionalString withVideos + "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; meta = with stdenv.lib; { description = "A free RTS game, originally developed by Pumpkin Studios"; From e063d084de472cf0f7ab19d6785242970102a653 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 27 Aug 2019 05:28:29 +0000 Subject: [PATCH 006/159] =?UTF-8?q?qarte:=20use=20qt5=E2=80=99s=20mkDeriva?= =?UTF-8?q?tion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See #65399 --- pkgs/applications/video/qarte/default.nix | 23 ++++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index f0c3776a433..bd70c84175c 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchbzr, python3, rtmpdump, makeWrapper }: +{ mkDerivation, lib, fetchbzr, python3, rtmpdump }: let - pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]); -in stdenv.mkDerivation { + pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]); +in mkDerivation { name = "qarte-4.6.0"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4; @@ -10,28 +10,33 @@ in stdenv.mkDerivation { sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn"; }; - buildInputs = [ makeWrapper pythonEnv ]; + buildInputs = [ pythonEnv ]; installPhase = '' + runHook preInstall mkdir -p $out/bin mv qarte $out/bin/ substituteInPlace $out/bin/qarte \ --replace '/usr/share' "$out/share" - wrapProgram $out/bin/qarte \ - --prefix PATH : "${rtmpdump}/bin" mkdir -p $out/share/man/man1/ mv qarte.1 $out/share/man/man1/ mkdir -p $out/share/qarte mv * $out/share/qarte/ + runHook postInstall + ''; + + postFixup = '' + wrapQtApp $out/bin/qarte \ + --prefix PATH : ${rtmpdump}/bin ''; meta = { homepage = https://launchpad.net/qarte; description = "A recorder for Arte TV Guide and Arte Concert"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ vbgl ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbe2e49bc8f..64b03b42315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5689,7 +5689,7 @@ in openmodelica = callPackage ../applications/science/misc/openmodelica { }; - qarte = callPackage ../applications/video/qarte { }; + qarte = libsForQt5.callPackage ../applications/video/qarte { }; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; From ef15478313dccf73684d46816d20752ba5b18cf4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 27 Aug 2019 05:39:43 +0000 Subject: [PATCH 007/159] qarte: use pyqt5_with_qtmultimedia Otherwise, qarte fails at run-time with: > from PyQt5.QtMultimedia import QMediaPlayer > ModuleNotFoundError: No module named 'PyQt5.QtMultimedia' --- pkgs/applications/video/qarte/default.nix | 2 +- pkgs/development/python-modules/pyqt/5.x.nix | 3 +++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index bd70c84175c..cd6416032da 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchbzr, python3, rtmpdump }: let - pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]); + pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]); in mkDerivation { name = "qarte-4.6.0"; src = fetchbzr { diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 5791299bdc1..f3578459b9d 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -6,6 +6,7 @@ , qtdeclarative , qtwebchannel , withConnectivity ? false, qtconnectivity +, withMultimedia ? false, qtmultimedia , withWebKit ? false, qtwebkit , withWebSockets ? false, qtwebsockets }: @@ -50,6 +51,7 @@ in buildPythonPackage rec { qtwebchannel ] ++ lib.optional withConnectivity qtconnectivity + ++ lib.optional withMultimedia qtmultimedia ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets ; @@ -121,6 +123,7 @@ in buildPythonPackage rec { ] ++ lib.optional withWebSockets "PyQt5.QtWebSockets" ++ lib.optional withWebKit "PyQt5.QtWebKit" + ++ lib.optional withMultimedia "PyQt5.QtMultimedia" ++ lib.optional withConnectivity "PyQt5.QtConnectivity" ; imports = lib.concatMapStrings (module: "import ${module};") modules; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 008c624c94a..79d4ee0a562 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -984,6 +984,8 @@ in { */ pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; From c055ac14a507fed407eb0361e13e0cc332d80ebe Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Sun, 1 Sep 2019 02:53:52 +0200 Subject: [PATCH 008/159] fcitx: use enchant2 --- .../inputmethods/fcitx/find-enchant-lib.patch | 42 +++++++++++++++++++ pkgs/tools/inputmethods/fcitx/unwrapped.nix | 6 ++- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch diff --git a/pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch b/pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch new file mode 100644 index 00000000000..90c9c79aa73 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch @@ -0,0 +1,42 @@ +diff --git a/cmake/FindEnchant.cmake b/cmake/FindEnchant.cmake +index 7c182e6a..5537595e 100644 +--- a/cmake/FindEnchant.cmake ++++ b/cmake/FindEnchant.cmake +@@ -16,7 +16,7 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) + endif(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) + + find_package(PkgConfig) +-pkg_check_modules(PC_ENCHANT enchant) ++pkg_check_modules(PC_ENCHANT enchant-2) + + find_path(ENCHANT_INCLUDE_DIR + NAMES enchant.h +@@ -24,7 +24,7 @@ find_path(ENCHANT_INCLUDE_DIR + PATH_SUFFIXES "enchant") + + find_library(ENCHANT_LIBRARIES +- NAMES enchant ++ NAMES enchant-2 + HINTS ${PC_ENCHANT_LIBRARY_DIRS}) + + if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) +@@ -39,7 +39,7 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) + #include + #include + #include +- #include ++ #include + + EnchantBroker *enchant_broker_init(); + char **enchant_dict_suggest(EnchantDict *dict, const char *str, +@@ -78,6 +78,10 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}") + endif() + ++if(ENCHANT_API_COMPATIBLE) ++ set(ENCHANT_LIBRARY_FILENAME ${ENCHANT_LIBRARIES}) ++endif(ENCHANT_API_COMPATIBLE) ++ + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Enchant DEFAULT_MSG ENCHANT_LIBRARIES + ENCHANT_INCLUDE_DIR ENCHANT_API_COMPATIBLE) diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 34dd3ac3509..636cb518fd2 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext -, libxml2, enchant1, isocodes, icu, libpthreadstubs +, libxml2, enchant2, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules , xkeyboard_config, pcre, libuuid @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { '' ; + patches = [ ./find-enchant-lib.patch ]; + postPatch = '' substituteInPlace src/frontend/qt/CMakeLists.txt \ --replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins @@ -69,7 +71,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ]; buildInputs = [ - xkeyboard_config enchant1 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile + xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid ]; From 5d08759f97bdc4aebeac7f163cc45be5eb1dff17 Mon Sep 17 00:00:00 2001 From: SRGOM Date: Tue, 3 Sep 2019 00:41:20 -0600 Subject: [PATCH 009/159] nixos.manual.installation.installing: nixos-hw Add a brief note about nixos-hardware repo because it is in the official nixos organization. (and seemingly useful...) --- nixos/doc/manual/installation/installing.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 9cea2db610e..c8576972256 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -392,7 +392,11 @@ hardware-configuration.nix is included from configuration.nix and will be overwritten by future invocations of nixos-generate-config; thus, you - generally should not modify it.) + generally should not modify it.) Additionally, you may want to look at + Hardware + configuration for known-hardware at this point or after + installation. + From 3f0f7d505469576d03bcf1800d98138b00811410 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Wed, 4 Sep 2019 08:07:12 +0300 Subject: [PATCH 010/159] ktorrent: 5.1.0 -> 5.1.2 Update ktorrent from 5.1.0 to 5.1.2 and libktorrent from 2.1 to 2.1.1, remove already included patches --- .../networking/p2p/ktorrent/default.nix | 22 ++----------------- .../libraries/libktorrent/default.nix | 9 ++++---- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 6dd2fc34355..535991312f1 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "ktorrent"; - version = "${libktorrent.mainVersion}.0"; + version = "${libktorrent.mainVersion}"; src = fetchurl { url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "18w6qh09k84qpzaxxb76a4g59k4mx5wk897vqp1wwv80g0pqhmrw"; + sha256 = "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534"; }; nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; @@ -22,24 +22,6 @@ stdenv.mkDerivation rec { libktorrent taglib libgcrypt kplotting ]; - patches = [ - # Fix build with CMake 3.11 - (fetchpatch { - url = "https://cgit.kde.org/ktorrent.git/patch/?id=672c5076de7e3a526d9bdbb484a69e9386bc49f8"; - sha256 = "1cn4rnbhadrsxqx50fawpd747azskavbjraygr6s11rh1wbfrxid"; - }) - - # Fix build against Qt 5.11 - (fetchpatch { - url = "https://cgit.kde.org/ktorrent.git/patch/?id=7876857d204188016a135a25938d9f8530fba4e8"; - sha256 = "1wnmfzkhf6y7fd0z2djwphs6i9lsg7fcrj8fqmbyi0j57dvl9gxl"; - }) - (fetchpatch { - url = "https://cgit.kde.org/ktorrent.git/patch/?id=36d112e56e56541d439326a267eb906da8b3ee60"; - sha256 = "1d41pqniljhwqs6awa644s6ks0zwm9sr0hpfygc63wyxnpcrsw2y"; - }) - ]; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 8b5f189a9e1..04dabf14100 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -4,14 +4,15 @@ }: let - mainVersion = "5.1"; + mainVersion = "5.1.2"; in stdenv.mkDerivation rec { - name = "libktorrent-2.1"; + pname = "libktorrent"; + version = "2.1.1"; src = fetchurl { - url = "mirror://kde/stable/ktorrent/${mainVersion}/${name}.tar.xz"; - sha256 = "0vz2dwc4xd80q56g6r5bx5wqdl9fxcibxmw2irahqhbkxk7drvry"; + url = "mirror://kde/stable/ktorrent/${mainVersion}/${pname}-${version}.tar.xz"; + sha256 = "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w"; }; outputs = [ "out" "dev" ]; From cd9aec6114950f66050341cd18f2183068385013 Mon Sep 17 00:00:00 2001 From: Eamonn Coughlan Date: Thu, 5 Sep 2019 17:31:22 +0200 Subject: [PATCH 011/159] rstudio: fix build with new hunspell-dicts --- pkgs/applications/editors/rstudio/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 74e5460f529..933644cc471 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -4,6 +4,7 @@ , llvmPackages }: +with stdenv.lib; let verMajor = "1"; verMinor = "2"; @@ -47,7 +48,13 @@ stdenv.mkDerivation rec { sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb"; }; - hunspellDictionaries = with stdenv.lib; filter isDerivation (unique (attrValues hunspellDicts)); + hunspellDictionaries = filter isDerivation (unique (attrValues hunspellDicts)); + # These dicts contain identically-named dict files, so we only keep the + # -large versions in case of clashes + largeDicts = filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries; + otherDicts = filter (d: !(hasAttr "dictFileName" d && + elem d.dictFileName (map (d: d.dictFileName) largeDicts))) hunspellDictionaries; + dictionaries = largeDicts ++ otherDicts; mathJaxSrc = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; @@ -77,7 +84,7 @@ stdenv.mkDerivation rec { mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer} mkdir dependencies/common/dictionaries - for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do + for dict in ${builtins.concatStringsSep " " dictionaries}; do for i in "$dict/share/hunspell/"*; do ln -sv $i dependencies/common/dictionaries/ done From 283358ea42e72e86b1f73824d89cde5aebc7a02b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 7 Sep 2019 21:09:13 -0400 Subject: [PATCH 012/159] v8: add pkgconfig file This is not provided by the v8 team, we need to provide a custom one. https://bugs.chromium.org/p/v8/issues/detail?id=2184 --- pkgs/development/libraries/v8/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index f7c4f34e8e6..cf0aa1d3b40 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -104,6 +104,17 @@ stdenv.mkDerivation rec { install -D d8 $out/bin/d8 install -D obj/libv8_monolith.a $out/lib/libv8.a cp -r ../../include $out + + mkdir -p $out/lib/pkgconfig + cat > $out/lib/pkgconfig/v8.pc << EOF + Name: v8 + Description: V8 JavaScript Engine + Version: ${version} + Libs: -L$out/lib -lv8 -pthread + Cflags: -I$out/include + Libs: -L$out/lib -lpulse + Cflags: -I$out/include + EOF ''; meta = with lib; { From 3516b1ddc58a7c22f48d8a5136e6ea9030fde746 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 2 Sep 2019 13:42:47 +0200 Subject: [PATCH 013/159] warzone: 3.3.0_beta1 -> 3.3.0 --- pkgs/games/warzone2100/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index b9c310f8296..d99a7c44240 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -13,13 +13,12 @@ let in mkDerivation rec { - name = "${pname}-${main}_${sub}"; - main = "3.3.0"; - sub = "beta1"; + inherit pname; + version = "3.3.0"; src = fetchurl { - url = "mirror://sourceforge/${pname}/releases/${main}/${name}.tar.xz"; - sha256 = "1jnc334ps88v14cbkp499kk7ini7mbrs1xsz7d04y0w238q407zn"; + url = "mirror://sourceforge/${pname}/releases/${version}/${pname}-${version}_src.tar.xz"; + sha256 = "1s0n67rh32g0bgq72p4qzkcqjlw58gc70r4r6gl9k90pil9chj6c"; }; buildInputs = [ From 85c6d720117f8207ba561804980b2452755170b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 8 Sep 2019 08:18:09 +0200 Subject: [PATCH 014/159] buildRustCrate: add support for renaming crates Before this change, buildRustCrate always called rustc with --extern libName=[...]libName[...] However, Cargo permits using a different name under which a dependency is known to a crate. For example, rand 0.7.0 uses: [dependencies] getrandom_package = { version = "0.1.1", package = "getrandom", optional = true } Which introduces the getrandom dependency such that it is known as getrandom_package to the rand crate. In this case, the correct extern flag is of the form --extern getrandom_package=[...]getrandom[...] which is currently not supported. In order to support such cases, this change introduces a crateRenames argument to buildRustCrate. This argument is an attribute set of dependencies that should be renamed. In this case, crateRenames would be: { "getrandom" = "getrandom_package"; } The extern options are then built such that if the libName occurs as an attribute in this set, it value will be used as the local name. Otherwise libName will be used as before. --- .../rust/build-rust-crate/build-crate.nix | 4 +-- .../rust/build-rust-crate/configure-crate.nix | 3 ++- .../rust/build-rust-crate/default.nix | 24 ++++++++++------- .../rust/build-rust-crate/test/default.nix | 26 ++++++++++++++----- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 2999c3d4c1d..e0a52e62561 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,13 +1,13 @@ { lib, stdenv, echo_build_heading, noisily, makeDeps }: { crateName, dependencies, - crateFeatures, libName, release, libPath, + crateFeatures, crateRenames, libName, release, libPath, crateType, metadata, crateBin, hasCrateBin, extraRustcOpts, verbose, colors }: let - deps = makeDeps dependencies; + deps = makeDeps dependencies crateRenames; rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 169adcf2d43..2a40240671c 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -9,6 +9,7 @@ , crateHomepage , crateFeatures , crateName +, crateRenames , crateVersion , extraLinkFlags , extraRustcOpts @@ -24,7 +25,7 @@ let version_ = lib.splitString "-" crateVersion; rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); - buildDeps = makeDeps buildDependencies; + buildDeps = makeDeps buildDependencies crateRenames; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; completeDepsDir = lib.concatStringsSep " " completeDeps; diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index acb2ee63cce..6534e21c0f0 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -13,13 +13,18 @@ let then "macos" else stdenv.hostPlatform.parsed.kernel.name; - makeDeps = dependencies: + makeDeps = dependencies: crateRenames: (lib.concatMapStringsSep " " (dep: - let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in - (if lib.lists.any (x: x == "lib") dep.crateType then - " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib" + let + extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; + name = if builtins.hasAttr dep.crateName crateRenames then + lib.strings.replaceStrings ["-"] ["_"] crateRenames.${dep.crateName} + else + extern; + in (if lib.lists.any (x: x == "lib") dep.crateType then + " --extern ${name}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib" else - " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") + " --extern ${name}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") ) dependencies); echo_build_heading = colors: '' @@ -60,7 +65,7 @@ let in crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides, - dependencies, buildDependencies, + dependencies, buildDependencies, crateRenames, extraRustcOpts, preUnpack, postUnpack, prePatch, patches, postPatch, preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }: @@ -70,7 +75,7 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr buildDependencies_ = buildDependencies; processedAttrs = [ "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath" - "buildDependencies" "dependencies" "features" + "buildDependencies" "dependencies" "features" "crateRenames" "crateName" "version" "build" "authors" "colors" "edition" ]; extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate; @@ -143,13 +148,13 @@ stdenv.mkDerivation (rec { configurePhase = configureCrate { inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription - crateFeatures libName build workspace_member release libPath crateVersion + crateFeatures crateRenames libName build workspace_member release libPath crateVersion extraLinkFlags extraRustcOpts crateAuthors crateHomepage verbose colors target_os; }; buildPhase = buildCrate { inherit crateName dependencies - crateFeatures libName release libPath crateType + crateFeatures crateRenames libName release libPath crateType metadata crateBin hasCrateBin verbose colors extraRustcOpts; }; @@ -177,4 +182,5 @@ stdenv.mkDerivation (rec { postInstall = crate_.postInstall or ""; dependencies = crate_.dependencies or []; buildDependencies = crate_.buildDependencies or []; + crateRenames = crate_.crateRenames or {}; } diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index f3f9ef377c8..4a90cf442a4 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -22,6 +22,13 @@ let } ''; + mkBinExtern = name: extern: mkFile name '' + extern crate ${extern}; + fn main() { + assert_eq!(${extern}::test(), 23); + } + ''; + mkLib = name: mkFile name "pub fn test() -> i32 { return 23; }"; mkTest = crateArgs: let @@ -34,12 +41,7 @@ let libTestBinary = if !isLib then null else mkCrate { crateName = "run-test-${crateName}"; dependencies = [ crate ]; - src = mkFile "src/main.rs" '' - extern crate ${libName}; - fn main() { - assert_eq!(${libName}::test(), 23); - } - ''; + src = mkBinExtern "src/main.rs" libName; }; in runCommand "run-buildRustCrate-${crateName}-test" { @@ -71,6 +73,18 @@ let }; crateBinNoPath3 = { crateBin = [{ name = "my-binary5"; }]; src = mkBin "src/bin/main.rs"; }; crateBinNoPath4 = { crateBin = [{ name = "my-binary6"; }]; src = mkBin "src/main.rs";}; + crateBinRename1 = { + crateBin = [{ name = "my-binary-rename1"; }]; + src = mkBinExtern "src/main.rs" "foo_renamed"; + dependencies = [ (mkCrate { crateName = "foo"; src = mkLib "src/lib.rs"; }) ]; + crateRenames = { "foo" = "foo_renamed"; }; + }; + crateBinRename2 = { + crateBin = [{ name = "my-binary-rename2"; }]; + src = mkBinExtern "src/main.rs" "foo_renamed"; + dependencies = [ (mkCrate { crateName = "foo"; libName = "foolib"; src = mkLib "src/lib.rs"; }) ]; + crateRenames = { "foo" = "foo_renamed"; }; + }; }; brotliCrates = (callPackage ./brotli-crates.nix {}); in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // { From 3518248b49b7869b2707c365816302f2e20d6d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 8 Sep 2019 17:22:41 -0300 Subject: [PATCH 015/159] matcha: 2019-06-22 -> 2019-07 --- pkgs/data/themes/matcha/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index db0b4ec6610..bfbf98b508e 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "matcha"; - version = "2019-06-22"; + version = "2019-07"; src = fetchFromGitHub { owner = "vinceliuice"; - repo = "matcha"; - rev = "f42df7a3219d7fbacb7be1b2e0e416d74339865e"; - sha256 = "1x954rmxv14xndn4ybhbr4pmzccnwqp462bpvzd2hak5wsqs4wxc"; + repo = pname; + rev = "v${version}"; + sha256 = "1jv7qq4lsjpz40wchrqlzc8w4ggrmwjavy4ipzz11jal99skpv7i"; }; buildInputs = [ gdk-pixbuf librsvg ]; From a0edbc5b4dfe8b447144c1b8803827f880f4b86b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 9 Sep 2019 12:24:20 -0400 Subject: [PATCH 016/159] nixos/zabbixWeb: fix a string reference as well as the phpfpm socket path --- nixos/modules/services/web-apps/zabbix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix index dac243b20e9..09538726b7c 100644 --- a/nixos/modules/services/web-apps/zabbix.nix +++ b/nixos/modules/services/web-apps/zabbix.nix @@ -179,7 +179,7 @@ in '' + optionalString (cfg.database.type == "oracle") '' extension=${pkgs.phpPackages.oci8}/lib/php/extensions/oci8.so ''; - phpEnv.ZABBIX_CONFIG = zabbixConfig; + phpEnv.ZABBIX_CONFIG = "${zabbixConfig}"; settings = { "listen.owner" = config.services.httpd.user; "listen.group" = config.services.httpd.group; @@ -197,7 +197,7 @@ in - SetHandler "proxy:unix:${fpm.listen}|fcgi://localhost/" + SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/" AllowOverride all From 51faa42af6e95d468a63c2d043055efa7678cd79 Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Mon, 9 Sep 2019 12:31:09 -0400 Subject: [PATCH 017/159] plan9port: avoid needing to propagate "which" --- pkgs/tools/system/plan9port/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 1f5c6814e39..c62bb8eca30 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -31,10 +31,14 @@ stdenv.mkDerivation rec { #hardcoded path substituteInPlace src/cmd/acme/acme.c \ --replace /lib/font/bit $out/plan9/font + #deprecated flags find . -type f \ -exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \ -exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \; + + substituteInPlace bin/9c \ + --replace 'which uniq' '${which}/bin/which uniq' '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' #add missing ctrl+c\z\x\v keybind for non-Darwin substituteInPlace src/cmd/acme/text.c \ @@ -45,7 +49,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - which perl + perl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ xorgproto libX11 libXext libXt fontconfig freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. From ddbf8bd82efda41fee313c4293ccaa14ebaf0af1 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 5 Sep 2019 19:40:13 +0200 Subject: [PATCH 018/159] ghq: Migrate to buildGoModule, ensure go 1.13 compatibility --- .../git-and-tools/ghq/default.nix | 18 ++- .../git-and-tools/ghq/deps.nix | 138 ------------------ 2 files changed, 12 insertions(+), 144 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/ghq/deps.nix diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index b73825737df..477b628c4d7 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,11 +1,9 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "ghq"; version = "0.12.6"; - goPackagePath = "github.com/motemen/ghq"; - src = fetchFromGitHub { owner = "motemen"; repo = "ghq"; @@ -13,7 +11,7 @@ buildGoPackage rec { sha256 = "14rm7fvphr7r9x0ys10vhzjwhfhhscgr574n1i1z4lzw551lrnp4"; }; - goDeps = ./deps.nix; + modSha256 = "1y2v8ir7kc2avgri06nagfyaxqr3xrg4g5pxl9rwzq9dyzm6ci5z"; buildFlagsArray = '' -ldflags= @@ -21,9 +19,17 @@ buildGoPackage rec { ''; postInstall = '' - install -m 444 -D ${src}/zsh/_ghq $bin/share/zsh/site-functions/_ghq + install -m 444 -D ${src}/zsh/_ghq $out/share/zsh/site-functions/_ghq ''; + patches = [ + (fetchpatch { + # remove once the commit lands in a release. + url = "https://github.com/motemen/ghq/commit/38ac89e60e60182b5870108f9753c9fe8d00e4a6.patch"; + sha256 = "1z8yvzmka3sh44my6jnwc39p8zs7mczxgvwc9z0pkqk4vgvaj8gj"; + }) + ]; + meta = { description = "Remote repository management made easy"; homepage = https://github.com/motemen/ghq; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix deleted file mode 100644 index dde1b19b4c3..00000000000 --- a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix +++ /dev/null @@ -1,138 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/Songmu/gitconfig"; - fetch = { - type = "git"; - url = "https://github.com/Songmu/gitconfig"; - rev = "v0.0.2"; - sha256 = "0w1xd1mzxzwh755l6lgpn6psjp959kvx89l39zhc8lag9jh7rc44"; - }; - } - { - goPackagePath = "github.com/daviddengcn/go-colortext"; - fetch = { - type = "git"; - url = "https://github.com/daviddengcn/go-colortext"; - rev = "186a3d44e920"; - sha256 = "18piv4zzcb8abbc7fllz9p6rd4zhsy1gc6iygym381caggmmgxgk"; - }; - } - { - goPackagePath = "github.com/golangplus/bytes"; - fetch = { - type = "git"; - url = "https://github.com/golangplus/bytes"; - rev = "45c989fe5450"; - sha256 = "1fpwg1idakpbvkmk8j8yyhv9g7mhr9c922kvff6kj4br4k05zyzr"; - }; - } - { - goPackagePath = "github.com/golangplus/fmt"; - fetch = { - type = "git"; - url = "https://github.com/golangplus/fmt"; - rev = "2a5d6d7d2995"; - sha256 = "1242q05qnawhv0klzy1pbq63q8jxkms5hc7421992hzq2m40k5yn"; - }; - } - { - goPackagePath = "github.com/golangplus/testing"; - fetch = { - type = "git"; - url = "https://github.com/golangplus/testing"; - rev = "af21d9c3145e"; - sha256 = "1g83sjvcavqbh92vyirc48mrqd18yfci08zya0hrgk840cr94czc"; - }; - } - { - goPackagePath = "github.com/motemen/go-colorine"; - fetch = { - type = "git"; - url = "https://github.com/motemen/go-colorine"; - rev = "45d19169413a"; - sha256 = "1mdy6q0926s1frj027nlzlvm2qssmkpjis7ic3l2smajkzh07118"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "3ec191127204"; - sha256 = "0zzhbkw3065dp1jscp7q8dxw3mkwj95ixnrr8j7c47skis0m11i3"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "3ee3066db522"; - sha256 = "12xyaa116bq9zy25fwk7zzi83v8aab9lm91pqg0c3jrfkjdbr255"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] From 3817b06fb6644714f98dcb21a2df90a52af7d321 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 5 Sep 2019 19:41:04 +0200 Subject: [PATCH 019/159] all-packages: Ensure git-and-tools inheritance consistency --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e7d7639ec1..31b3be94cdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18410,8 +18410,6 @@ in getxbook = callPackage ../applications/misc/getxbook { }; - ghq = gitAndTools.ghq; - gimp = callPackage ../applications/graphics/gimp { gegl = gegl_0_4; lcms = lcms2; @@ -18430,7 +18428,7 @@ in gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq; gitMinimal = git.override { withManual = false; From 5c64adbabb57f2b78673105a53412824b7ba82d3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 9 Sep 2019 13:32:48 -0700 Subject: [PATCH 020/159] rappel: unstable-2019-07-08 -> unstable-2019-09-09 --- pkgs/development/misc/rappel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/misc/rappel/default.nix b/pkgs/development/misc/rappel/default.nix index 02c31fd4d69..761d2ea98ba 100644 --- a/pkgs/development/misc/rappel/default.nix +++ b/pkgs/development/misc/rappel/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rappel"; - version = "unstable-2019-07-08"; + version = "unstable-2019-09-09"; src = fetchFromGitHub { owner = "yrp604"; repo = "rappel"; - rev = "95a776f850cf6a7c21923a2100b605408ef038de"; - sha256 = "0fmd15xa6hswh3x48av4g1sf6rncbiinbj7gbw1ffvqsbcfnsgcr"; + rev = "31a06762d34880ff2ed7176ca71bd8a6b91b10d5"; + sha256 = "0wj3hypqfrjra8mwmn32hs5qs6ic81cq3gn1v0b2fba6vkqcsqfy"; }; buildInputs = [ libedit ]; From 552f56650c33bf85beb760ff4a60578e4542b9a2 Mon Sep 17 00:00:00 2001 From: Justin Lovinger Date: Mon, 9 Sep 2019 19:17:22 -0400 Subject: [PATCH 021/159] vimPlugins: Update --- pkgs/misc/vim-plugins/generated.nix | 268 ++++++++++++++-------------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index cf1ea84a9c5..618d67037ea 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-08-18"; + version = "2019-09-01"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "73812c3e41c1c7fcf1705811f35ac4c9ccec003e"; - sha256 = "166hgzyx1j1n717icj0mq2n8jkg4kpi1iy5gk3q0l28nd88w5hlb"; + rev = "6e18c03d80c323e740f87103fc05955b5c61b54e"; + sha256 = "0jgqmliy48fqdhc1lnsbvkgg24z85n7dv8z6k6xxnilcsrhfzds2"; }; }; @@ -303,23 +303,23 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-08-20"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "d778033c08580768d2a48b78f4c1b7ab63af12bd"; - sha256 = "1bxx8y5yp9v95clp8dic8q8zr85dl7i2qq4iibmazg9hzcigc3s6"; + rev = "67d6df228ffca7e6247139184fcb53003ccf7810"; + sha256 = "1xmm07k9c3kzyx4wrkamdpfh1pykihlrs35qcgy8wgqr9msqj9bq"; }; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-08-23"; + version = "2019-09-07"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "27ef3358055b68c5b592c920c9d0e8aa1522c71e"; - sha256 = "1v1lwkxzwi1l20561m1nxbmgmjgzn83lvx0mb2c4z3p7brbjmv0y"; + rev = "16005f9249196c54cd85f0407152d04a4c487b30"; + sha256 = "06jky64f2l4j5sn4v8ij5594afc85d4gk2mxd315j5b16sy661l3"; }; }; @@ -413,12 +413,12 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2019-08-07"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "51e404a60fa0461ebfaea4ba1311357b8825e73f"; - sha256 = "0sz45z7i7fqnvl4968dalksz9qk0al6a57wyyhyl7rx1wv67vaya"; + rev = "318e8123b11d231ceb48c0e7dd9864881115d873"; + sha256 = "0r9cnqn6mr6b9g7ahjhfxr7s82a6wcwxhwm22s6vparaa45k4mk0"; }; }; @@ -479,12 +479,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-08-17"; + version = "2019-09-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "ffd2b091e5bb5995aac95d1ebe98f87f3df763b1"; - sha256 = "1n23nvfh99jvnmf901g5zck8hyx3qq5cr4vz119a7ra5dj4bka95"; + rev = "9a8da3f5548e1f894fdd3b9600e17007f7ad9b26"; + sha256 = "14vk80bg0cgs14n3kfpg6rkgxvvrnyz4s4wms0iqi9hq622i0znz"; }; }; @@ -545,12 +545,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-08-27"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "c80ae7b19b038f380639e1c5b5e3c3a0b9252f6c"; - sha256 = "06pd5k72sa3d6psdkcdar70b456p2dqzbbk2x166gkxavjqjkyid"; + rev = "30cf468536a47c994133bb0b5614f305dd6441fe"; + sha256 = "1nkx1wmhmic4xavb5pnssv14cb6k3znc2jlfcc3ipanm0a6bwkpx"; }; }; @@ -788,34 +788,34 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2019-07-08"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-git"; - rev = "b3b3742f263475cc0e16c1c03845e46d0c0faa16"; - sha256 = "15m7y4mzzysfhmmzwj7q6y8d2rcczn6fvicw77j7njssf9fmwc10"; + rev = "db4ad6c3717272fc347a46466e4337bba6b4c4cc"; + sha256 = "0rlv9q7fzgiapann3r83szr87mfpxcvhmrsjzrxrimqk3m992wa2"; }; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-08-29"; + version = "2019-09-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "161d4a7cd490dad3a708e8461e11f3bf2af2c0ea"; - sha256 = "026lkyd768v4a0pyfzrlsqyln4bvmhp99p4vjhmmi079vjs7z7b1"; + rev = "dedeed5cb3fab46465a1f30efa4875c4937ed2f7"; + sha256 = "1c65mhc4dw0zf1azqfnjf7l5gp2pxayq8qv0j1lvlqpn6q6gg1di"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-07-18"; + version = "2019-09-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "53ff81bd27dc86dafe209687df9ed8f3c205601c"; - sha256 = "1dq3457rd6jda4w4ajlq2gdiaz5nhcnfg4b4v47xzdcd63bcssir"; + rev = "474b72a8541e529a1628084c277e6e0aa7f80fda"; + sha256 = "00kwij67csk9yp64r8lfrc9m0jm5mqckf4c9a3489azfjn8da097"; }; }; @@ -879,12 +879,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2019-07-15"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "c0172e8d458054b8dea037bbcfef523cde7add93"; - sha256 = "1j6904wk4qr4i4h8qn2rikzw1kp6r5dc4475x38i8xngx1ap4x24"; + rev = "9e5ab5d5ea955711bce2a64535ec42d9e76aa3fe"; + sha256 = "1552fr18drc8q7qha8gbfckp906fihx8xdpj7z7y0yiw20bc4kk3"; }; }; @@ -912,12 +912,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-08-31"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "93722cc5d0a1877fdad0845330b3a41c5e392a34"; - sha256 = "0ay5j8drbd0m8hn9zpxsd56z2y07imm8lmkvfamja353mwb8nlh9"; + rev = "48b1643509e4ef3a4af6cf57df35e6c6ac1275ce"; + sha256 = "192lph0kbs4mmbsz1jsjmrmy3an53bkd4lzyvn615r24qfbpcz14"; }; }; @@ -1024,12 +1024,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-08-29"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "f5ec61dade10692257e5f45609bb42f8fbf07c23"; - sha256 = "08j1rhah96k7w4x569w84qxgn4ishia0xxy102z8v5zgxjpcyhld"; + rev = "96eace33dd16d553a9318f08209f108ec69c5cd7"; + sha256 = "09q9rk69xrj30knfdq5s4xxmiwnazs1l7lrsqwxpn0ggq8ryk5qd"; }; }; @@ -1046,12 +1046,12 @@ let fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2019-03-28"; + version = "2019-09-03"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "69d455dcf1ee40bf050a0d1e94f49f02bb2f4832"; - sha256 = "1hk9ir47c7rds3fya9vd2rsvc2mfj602fhqvz1h0acvxkqy34lsk"; + rev = "cf38299fee6f6a9b0bc5874545ed3a2415b6b3c5"; + sha256 = "1x2ab1fjiqwmaph2r5dga4bv128ppzb8kpr3bjh6hvmcfabsh1f6"; }; }; @@ -1135,12 +1135,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2019-08-21"; + version = "2019-09-08"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "12cbd4cf3109459a1577be30da82cffe22bdf4b6"; - sha256 = "0wzcpk9wsdhmz888g2x9b1ljf437agq536bd2d801dzv3ynqf4jl"; + rev = "586dd9652f9fa76d342557029abd4bbcb744f2f4"; + sha256 = "115zw4b8jxyalm0qhqjzzakaqc2bzy6bf0jm7kkfhyv3lfqwf19p"; }; }; @@ -1333,12 +1333,12 @@ let iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; - version = "2019-08-20"; + version = "2019-09-04"; src = fetchFromGitHub { owner = "neutaaaaan"; repo = "iosvkem"; - rev = "9c5d1e70f5335cc995e61ceba870818a946f26c3"; - sha256 = "0ppd8x9rh2mqd743zsvxakzha878lg7c7a3as5nlfjpb89g5dmn6"; + rev = "f9e6b5e8a72c4b3c542074d881e694daa60c79df"; + sha256 = "1l9p8hxrv3rybbv9w3f74l4wngjyjw7jzylw38jbmsn7bgr1m336"; }; }; @@ -1400,12 +1400,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2019-06-26"; + version = "2019-09-03"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "072e4861412e841d308aabc928112ccaedf07135"; - sha256 = "1250a011mib5na5c769x2djjyz3rwhcdw80rmkvzv1xy7crxf5xn"; + rev = "995eae2c333ac9a2ca1d31c8d7845680f4ac28b0"; + sha256 = "14d3r06nffxpbvffnh2b4i0q187cv5wsvq62mh2h1ifq95bj07s5"; }; }; @@ -1466,12 +1466,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-07-16"; + version = "2019-09-02"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "0add378423b813b15ff281a1b8176e95f444f301"; - sha256 = "1fjlp7h0fd6dbw32m056sy9z7745py9f091jmcspfvqj5mfpkg8f"; + rev = "8adf0b269a1732b43644e2f6083113a4d5704a8b"; + sha256 = "0na11kdp2nksyg1whf89sa4ss909srdqp94i28m5fdngv3z46wqs"; }; }; @@ -1488,12 +1488,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-08-20"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "8b3aa1632c08784928458b2b85faf5c89feefccf"; - sha256 = "0bxvxkk0zps2qxnzp8dip7ngpv9b1a74y2wjzjqqvxzljk81a714"; + rev = "c9ab296e856bed4e694180efb6ffb692cf18ed8f"; + sha256 = "1sw71fyihcyjb6vlwzw5wah6q1dz2mfcswm594wrdkjxm71i0c0d"; }; }; @@ -1708,12 +1708,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-08-22"; + version = "2019-09-03"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "723336c47844d7f58b7c37a6c3e62ddabcdf392b"; - sha256 = "0psiadnx4qzqzn6p2yc7az5l624xb5mczn3y39irbdrl6l2rcd81"; + rev = "776a6f6e27330e38324b7ad4873329760adf72e3"; + sha256 = "0lxqqknp1xmaa8ys5ck5m9pyxv0hbpaba1bsv6fx6j6jb71nz590"; }; }; @@ -1763,12 +1763,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2019-08-20"; + version = "2019-09-01"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "c96ff95c9a41d716bbdca41b4cc2dc62e4b188a1"; - sha256 = "0jbrgsdljh9n1cr3dpgq83gpd3hx7ss4hbc0i0hls15laczlzipc"; + rev = "f53fa5177c01180ea538290657721e1accbb02fe"; + sha256 = "0v162hpl881dhb61vkyi4bvny5zn74pknlyh1liyhw6jy5hgc9b8"; }; }; @@ -1807,11 +1807,11 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-08-28"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "3d508aedce35e1d952d3ce92378ad27ea5960fa6"; + rev = "51fc75efdb8ac58c853492c3f61d854f65ed78ec"; sha256 = "098g4qq3h8nklynj4qnj02f6ivw10q07c69ssdrhgjwilpgv4nrk"; }; }; @@ -1895,12 +1895,12 @@ let nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev-nvim"; - version = "2019-08-21"; + version = "2019-09-03"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "d27d00b3c529adc13c9882e7a3cb5c63df038dcc"; - sha256 = "1z6i891h574yg3s1y96vwik1pxhy707rn5rsqqb7yxnfw6xy57cq"; + rev = "83c2a2aab7f2f7ae8c004c52aaddc8b15065ba90"; + sha256 = "0i0ds5mfx2k03ivncw795xr3p9iig1b4pqj4mbr7b7hs3984jh08"; }; }; @@ -2819,12 +2819,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-08-26"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "6409c7b317a283333a720f48cca5f259c1ea29ef"; - sha256 = "1wr7202idpyydnjbkc7sk8wr02ipdq40x4rwhi955yx76gwl111a"; + rev = "63d8764f9d19def6d279b91e690ac2aa5662828d"; + sha256 = "0sxjw1dmidw242m1ma607g957hz2w080ln4m4ac90wi1qssp8132"; }; }; @@ -2874,12 +2874,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2019-08-19"; + version = "2019-09-02"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "69f7f2d80d3722f62847a58443da1d6cdf81b292"; - sha256 = "0vxblych7afny8i8kyk2f85xc9k2y4sv7i9jf3mkpykimsq2w4hm"; + rev = "2842eb24dc9d3b9a6585a9f744fc0d62f692dabc"; + sha256 = "1n0l1n5ymr9fgmf4cq42hdnnb4lxdkh9yaxv18gadncchwzp7cvj"; }; }; @@ -3215,12 +3215,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-08-22"; + version = "2019-09-06"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "e9d495bb85981467105c375f665b10249b7bcc53"; - sha256 = "1lm2lhj9sqijc5b7yqa0vs56n2jg0q0xlxs4mf1pjwhdi0wmqd5y"; + rev = "e8d59d115c8153a7de9872b3c4419f2354c0f14b"; + sha256 = "1q6bk8rqsdwgbyckwdnq4kv6gy5wjqrhdm06sip5x53mnkhmpf5p"; }; }; @@ -3259,12 +3259,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-08-19"; + version = "2019-09-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "0b46f733955c63a73dc49c316f8bc97a4119fddc"; - sha256 = "1q8mnd6sd0nl8i13jvzkl79sbz0ncvx015bihymglj8wcpzrrwni"; + rev = "ea9fa306a731a105511cc5faecbaf7d58c94dfcf"; + sha256 = "1l1wzgr4ly25yablz299pfrgl47ys51hljhhzcfdivvkrrzjpdd5"; }; }; @@ -3325,12 +3325,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-08-23"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "b97a9abe29c39c4e1a45ae199dbb470df362f538"; - sha256 = "0lf5r91ba9xzzy1vs6g81mdgghcyica6xiir1xpg2aqksk0aidri"; + rev = "35f1095f9b3ce70768bdd75dae76437cfa69dd02"; + sha256 = "0d806k1prgsa0mgc779p3ngqjyd8shrf2i18xi58vsndrvsgn96v"; }; }; @@ -3369,12 +3369,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-08-28"; + version = "2019-09-05"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "88d396f1b49747fadbbde5c038a85067d94954e5"; - sha256 = "02blbk7vq5p25713ys30djkivks4ywg69drh9apyb3g5mjwi60m6"; + rev = "b71ab64dc16a4665c3214f109000a11d30708079"; + sha256 = "1pqd9zf311s0in5x3njzcxkw6zyqa2vpznl5ahd4b9hk4qvcm2v8"; }; }; @@ -3402,12 +3402,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-08-23"; + version = "2019-09-08"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "635b9e7f27905070788cef60c0ba520209bf4f09"; - sha256 = "0zmymzafryi7mchv8wz3ynxi8a597c69zvx2s57xyhhczpcah4ms"; + rev = "925d29a73db14133d11361792a2e0393e1e2b457"; + sha256 = "167s9dadk1nl0kw14p0mq7pkwhxg9xb5gkmhqh96rpz1z2730jw7"; }; }; @@ -3424,12 +3424,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-08-30"; + version = "2019-09-04"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "1b9cec58509ba2bc212ad21e4a58eb3acf501b9f"; - sha256 = "1rhp1rb97v9fv7w4qs350k5gqslbmkjn3lrq2a5bgnhar5xybs4k"; + rev = "ebe6d1ffd1fb2faada867c56a55f44cbaa0248e3"; + sha256 = "0axgpc72q4zn3l9b23v03akz1p1y5vy3gkzma4qw9avgbwhq5870"; }; }; @@ -3733,12 +3733,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-08-26"; + version = "2019-09-07"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "9a0f7e8072f4e7e80c74b1e24fa82e359046b25a"; - sha256 = "1l5cwlbmihzxldpxlvn5gc47s0awqs908skzq43cy44iql829hir"; + rev = "6871eb1696478a8e295bab3e5ae7aae05faa2605"; + sha256 = "0i80d5vdd5ycx0g0h00raa3g48xhgw3wf3blp1m3hwap6cxy9p8h"; }; }; @@ -3854,12 +3854,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-08-22"; + version = "2019-09-05"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "c2a8fad6bc39a8a90fccee32a34861969f55ad5a"; - sha256 = "16hb0lan77ics7192cpnw2i2aigbab5g63pq0j992vja7pmh6hab"; + rev = "ff86c97cb41c1e415dfd1a3c42dfd817ff541f6d"; + sha256 = "1lr72qxzpq4i748sb4q52ln18awxpxqqcsf13wr95d4wvrn50y61"; }; }; @@ -4118,12 +4118,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-08-17"; + version = "2019-09-03"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "ebd534c88bfd49f8d3c758d96ad04ce3f77ee6f8"; - sha256 = "1r3ic5mii9q4kqpwyq37cjbrrzj93fhj9b46zqkb5i1nw2vydl6l"; + rev = "46f843aafe6a284765c484397fdc5ad9bb77147a"; + sha256 = "1c9xnjfzr0s6vp6yb7j3sqclj7kazwcmsqvm0whzx1yx5dbisnv7"; }; }; @@ -4140,12 +4140,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-07-01"; + version = "2019-09-06"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "3ddca5da461ebfaa82104f82e3cbf19d1c326ade"; - sha256 = "0f3l0sknj4zbgmk7yx028f2qz72gdh1lnqra96c2n3xszpdvim22"; + rev = "fbc2af9e820d85e17cd08023f4dcc66545735d58"; + sha256 = "03lrnrhhhxmz5dbbsxhnnrff8myc21qrxsskfd2k6yh1hr9wwa5p"; }; }; @@ -4239,12 +4239,12 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2019-08-19"; + version = "2019-09-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "9edacf9d5b4d6e0570af33f88500f51ec4288c2e"; - sha256 = "0m91nvxjkgmbgaib3q27rk2nzkpxx18pa8nrv143r2k8na9bry0p"; + rev = "75ad917e4978b4620c3b0eff1722880d2d53a9f4"; + sha256 = "1qxlaqbfliv2w4r7bw04h3m19g8f89v9070f59k9zbz3gv8g3hzv"; }; }; @@ -4261,12 +4261,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2019-07-13"; + version = "2019-09-05"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "1aa8f0cd0411c093d81f4139d151f93808e53966"; - sha256 = "04ng7mjjdacajkmx20pfwlfh1h43sh6sx58id830q9jjl7kvyhhp"; + rev = "1c70532339889b7794a52b956f389b4f9ab9b3eb"; + sha256 = "1rj06j71f08b1may9pm27xf6k19bcw3jq3jbwndd975qram7zcr0"; }; }; @@ -4316,12 +4316,12 @@ let vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-08-22"; + version = "2019-09-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "b9febff7aac028a851d2568d3dcef91d9b6971bc"; - sha256 = "00852qj3v3py63k23rrxmx8w5yrin3q21vz9css0xg12l5r1j1wv"; + rev = "5dc6eb2d8026b4ce812a5a9c966d232b1f50c9c7"; + sha256 = "05mig86l1hi0q1y5sj7bp09i1lwbyn7v9xp3hd853fv7z026fza0"; }; }; @@ -4404,12 +4404,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-08-11"; + version = "2019-09-03"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "5dc42dbc6c4d9b5068ddde901b79c5e483c42114"; - sha256 = "00kf6a5k0gkync0pgw3d3b7gdm6ykb14lvybiaprvbsnxnflgw95"; + rev = "55b29ff83e9f5b43a138fb42100be6d7b5777d0d"; + sha256 = "0zkxmj3l1jj1q9qigm13xksc7f3a7n7ik5yxgn4gxdpi9z79as4d"; }; }; @@ -4514,12 +4514,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2019-04-25"; + version = "2019-09-05"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "865563f78506b8090d3839644bc667493b4b68f4"; - sha256 = "0544dlnqpm3r6amlww9pa5991js1rs5qblhqqfagwdaxaxpzxa64"; + rev = "934778947e28fc8e570e34efdb5f90d5c99fdac7"; + sha256 = "1klvr8xal8iyv6wga324xhq26a31dxp2qlsz0qyri8y4hkrappkf"; }; }; @@ -4558,12 +4558,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-08-29"; + version = "2019-09-01"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "1b82c6929e9d87ca756569c1640320d027498364"; - sha256 = "0hf76jlv916jpdncfgh2wyczpj4c7rzak3m1j3vnysav000p3vhd"; + rev = "5aaa872eb7519909b87abb2b0f13600aa2210771"; + sha256 = "0wvjf3fhhj9qm5p7azk2dgi3aa1qw16pzm5nkl2jr5gn2cmlphd8"; }; }; @@ -4712,12 +4712,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-08-23"; + version = "2019-09-01"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "473427fc6e5aabdf69ad0ca28808de841d70bdb8"; - sha256 = "0cnj7z3r9cws283wrpg1a40ykpk0lwjkb44gp77996cggr9nqbjz"; + rev = "d55e496786f064c022861c944cf38562006a4e9a"; + sha256 = "1c049z9qgbc0g80zvixz0cqglq2qcg2pfmzjvp4gg5yq4k27r25y"; }; }; @@ -4866,12 +4866,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-08-27"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "23a3b356ba1e90d4a9dbb085712376cab83ab19e"; - sha256 = "1rp3jfsx991k2jl7wr8b32la5b881pn17k6dy27lwpw0sd0x3ha4"; + rev = "cb90d583b7d584d87d306b2b99abdbb097588196"; + sha256 = "06308ji2r3733w9rgwphqdqkharf7hc3xliylzbl9hh6fmk3hj55"; }; }; @@ -5009,24 +5009,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-08-23"; + version = "2019-09-05"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "24fa9013a5a5d053262830553e81f84d9bf7552f"; - sha256 = "17mjrlzb60vkgvyiag11xmrf8a5sp94z1rx1mzcc4ys6j1if9136"; + rev = "d9af5fc9fd7f11fa1219a9acb6f4243105e60b38"; + sha256 = "1wlrxibj8q2l0lfzkg3wvzivkgz67xvi7vgrih4dgrs7a639dyl0"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-08-10"; + version = "2019-08-31"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "afd69b382844315812fd48912eaa9fa47cba3a8d"; - sha256 = "1x4q1l7dw0axm3hywj5p77057jh0qac7khk2clpdilfwhak0jp07"; + rev = "5274b73fc26deb5704733e0efbb4b2d53dc6dc9c"; + sha256 = "03kpq7mw4dimaahf9q6qm6nblzw7hr0p7i6m6x3b9ilkka5q13rz"; fetchSubmodules = true; }; }; @@ -5066,12 +5066,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-08-14"; + version = "2019-09-05"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "defc660d235152e82271a48bd89bfcc9fa58b432"; - sha256 = "0x6yaiwc3nnyxcrjfdllhx3s7kfspy5ggm3crhd2s81gq9lrxc3q"; + rev = "06e918ba082bbe41544208430d6946b547ce3530"; + sha256 = "1sfh1xmsf8smgr7vpj6r11gp3wmw5zzf095w2li9rw8l2g54cwql"; }; }; From bfb2389a84b44de0057ebffef723c5ac180a6893 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 9 Sep 2019 19:28:59 -0400 Subject: [PATCH 022/159] nixos/gnome3: add gnome-shell xdg portal --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 71df4e8f0a4..30c5250221c 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -240,6 +240,8 @@ in services.avahi.enable = mkDefault true; + xdg.portal.extraPortals = [ pkgs.gnome3.gnome-shell ]; + services.geoclue2.enable = mkDefault true; services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent From 636e15507be87648eb49aed5347e5bfe23a46ffa Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Mon, 9 Sep 2019 14:30:34 +0200 Subject: [PATCH 023/159] skydive: remove it from nixpkgs The current Skydive version can not be build with a recent Go version and the maintainer (lewo) is no longer interested in maintaining it. --- pkgs/tools/networking/skydive/default.nix | 45 - pkgs/tools/networking/skydive/deps.nix | 1335 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 - 4 files changed, 1 insertion(+), 1386 deletions(-) delete mode 100644 pkgs/tools/networking/skydive/default.nix delete mode 100644 pkgs/tools/networking/skydive/deps.nix diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix deleted file mode 100644 index 722deaff655..00000000000 --- a/pkgs/tools/networking/skydive/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, perl -, go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }: - -buildGoPackage rec { - pname = "skydive"; - version = "0.17.0"; - goPackagePath = "github.com/skydive-project/skydive"; - - src = fetchFromGitHub { - owner = "skydive-project"; - repo = "skydive"; - rev = "v${version}"; - sha256 = "03y26imiib2v9icrgwlamzsrx3ph6vn582051vdk1x9ar80xp4dv"; - }; - - patchPhase = '' - substituteInPlace Makefile \ - --replace ".proto: builddep" ".proto: " \ - --replace ".bindata: builddep" ".bindata: " - ''; - - buildInputs = [ perl go-bindata go-protobuf libxml2 protobuf3_1 libpcap pkgconfig ]; - goDeps = ./deps.nix; - - preBuild = '' - make -C go/src/github.com/skydive-project/skydive genlocalfiles VERSION=${version} - ''; - - preInstall = '' - mkdir -p $out/share/skydive - cp go/src/github.com/skydive-project/skydive/etc/skydive.yml.default $out/share/skydive/ - ''; - - postInstall = '' - rm $bin/bin/snort - ''; - - meta = { - homepage = http://skydive.network; - description = "A real-time network analyzer"; - license = lib.licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.lewo ]; - }; -} diff --git a/pkgs/tools/networking/skydive/deps.nix b/pkgs/tools/networking/skydive/deps.nix deleted file mode 100644 index c573a7231bb..00000000000 --- a/pkgs/tools/networking/skydive/deps.nix +++ /dev/null @@ -1,1335 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -[ - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "fff283ad5116362ca252298cfc9b95828956d85d"; - sha256 = "0kfd6477rndcdl5c4dg9k64kxxp2667qqlbp4ccl7xk4qg9jckg9"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "fd18e053af8a4ff11039269006e8037ff374ce0e"; - sha256 = "1v62jhcq1zvnsj83z3dyqr7msndnp85rlm53l6iq78yryd54i115"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "de5bf2ad457846296e2031421a34e2568e304e35"; - sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; - }; - } - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "4b6ea7319e214d98c938f12692336f7ca9348d6b"; - sha256 = "06wnl1dkkib2zpm31aavk5c4290s64h2ss68nl1vgcbxzsfbxjaq"; - }; - } - { - goPackagePath = "github.com/StackExchange/wmi"; - fetch = { - type = "git"; - url = "https://github.com/StackExchange/wmi"; - rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; - sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; - }; - } - { - goPackagePath = "github.com/abbot/go-http-auth"; - fetch = { - type = "git"; - url = "https://github.com/abbot/go-http-auth"; - rev = "ca62df34b58d26b6a064246c21c0a18f97813173"; - sha256 = "169i8549ai9ljjpvfgqjx4azclps7zjvislfszw5fndkw0qx7v1n"; - }; - } - { - goPackagePath = "github.com/araddon/gou"; - fetch = { - type = "git"; - url = "https://github.com/araddon/gou"; - rev = "0c2ab7394d785afff14c983fedce4be70ccc431f"; - sha256 = "0pppl3hm6r7mf7nnncjsfjfb8l020chzzl6n3c9g3qi02fkp3b1d"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c"; - sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/bitly/go-hostpool"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-hostpool"; - rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; - sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; - }; - } - { - goPackagePath = "github.com/c-bata/go-prompt"; - fetch = { - type = "git"; - url = "https://github.com/c-bata/go-prompt"; - rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0"; - sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj"; - }; - } - { - goPackagePath = "github.com/cenk/hub"; - fetch = { - type = "git"; - url = "https://github.com/cenk/hub"; - rev = "11382a9960d39b0ecda16fd01c424c11ff765a34"; - sha256 = "02f0l563niy2i5zq5cq7mqab775zzywp062pl0r12ny3gs0l8ssm"; - }; - } - { - goPackagePath = "github.com/cenk/rpc2"; - fetch = { - type = "git"; - url = "https://github.com/cenk/rpc2"; - rev = "7ab76d2e88c77ca1a715756036d8264b2886acd2"; - sha256 = "1yazkf6g370zy13fxnwjvn1n37zf7m7mcfws0jrrjflfw49fbpv8"; - }; - } - { - goPackagePath = "github.com/cnf/structhash"; - fetch = { - type = "git"; - url = "https://github.com/cnf/structhash"; - rev = "7710f1f78fb9c581deeeab57ecfb7978901b36bc"; - sha256 = "07dlpnwmqdmhj9s7w558lc0wnzvngz3i7d42a5y9rfg9k079l3fp"; - }; - } - { - goPackagePath = "github.com/cockroachdb/cmux"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/cmux"; - rev = "30d10be492927e2dcae0089c374c455d42414fcb"; - sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx"; - }; - } - { - goPackagePath = "github.com/coreos/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/coreos/bbolt"; - rev = "32c383e75ce054674c53b5a07e55de85332aee14"; - sha256 = "0qa4434g081ksil9g479v9yk3ylhl48c9k95zki5kjq49cb0c589"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "b5abfe1858ddde05b83b96a810dc2b50cc5fcd94"; - sha256 = "0lkhc45irh2pvlnqs60s06q74q5mlym9wl8h7rk8kk4zcfxqaa8i"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "7b2428fec40033549c68f54e26e89e7ca9a9ce31"; - sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd"; - }; - } - { - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "66fe44ad037ccb80329115cb4db0dbe8e9beb03a"; - sha256 = "1pxcwx0c6aazqdypcjvibam6zw88v1gsfhnsn5bscy33yzqmjrd4"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "d2709f9f1f31ebcda9651b03077758c1f3a0018c"; - sha256 = "02zhyimshzfzp3by2lggm2z382j4pvbrbcxx9p1wqmmmwy5yz182"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "325b0804fef3a66309d962357aac3c2ce3f4d329"; - sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "c6d412e329c85f32a4b2269b49aaa0794affcf88"; - sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"; - sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; - sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40"; - sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful-swagger12"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful-swagger12"; - rev = "7524189396c68dc4b04d53852f9edc00f816b123"; - sha256 = "1rqmrxpx55kin0059k7svmcbqx2jgybc200cjdc9ysaif3rhkd73"; - }; - } - { - goPackagePath = "github.com/fatih/structs"; - fetch = { - type = "git"; - url = "https://github.com/fatih/structs"; - rev = "f5faa72e73092639913f5833b75e1ac1d6bc7a63"; - sha256 = "1kdwvygp2g9jc9ygkr7snmk6zk6wmy7xywrf1p6q6iiwwil4xghz"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; - sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/gima/govalid"; - fetch = { - type = "git"; - url = "https://github.com/gima/govalid"; - rev = "7b486932bea218beb6e85f7ed28650d283dd6ce6"; - sha256 = "1w3gbfjl283qdfk3xj9mavhwx5wyh1v4w26d85plcdx4kcjmn6hy"; - }; - } - { - goPackagePath = "github.com/go-ole/go-ole"; - fetch = { - type = "git"; - url = "https://github.com/go-ole/go-ole"; - rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; - sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "779f45308c19820f1a69e9a4cd965f496e0da10f"; - sha256 = "10vv0xsabkvv81xpqqq95fvxnlpf07x9zwzl41g8x2lx05ibxsnc"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonreference"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "36d33bfe519efae5632669801b180bf1a245da3b"; - sha256 = "0d163wv3mj9cbhdqc9jqzw2kwi961lg4p30d8gcd6ddz0q752ykh"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "7abd5745472fff5eb3685386d5fb8bf38683154d"; - sha256 = "1z9hwfzxgwr59r1syy0s4hgybs27q87n9mm1bbxl0yl5yvzw67rl"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"; - sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy"; - }; - } - { - goPackagePath = "github.com/gobwas/httphead"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/httphead"; - rev = "01c9b01b368a438f615030bbbd5e4f9e0023e15c"; - sha256 = "0g1fig36plp3668wc3hm6w4sb7ki0ss24c311a59jpdgy9awfp56"; - }; - } - { - goPackagePath = "github.com/gobwas/pool"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/pool"; - rev = "32dbaa12caca20fad12253c30591227e04f62cdd"; - sha256 = "0iqqfi7zf6jrx1857xxk17hy4j1ln90j5w4jzyxd5x72v5jnmhxm"; - }; - } - { - goPackagePath = "github.com/gobwas/ws"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/ws"; - rev = "915eed3240022c5265584c55032ef1b8c8f84168"; - sha256 = "10r08qrssbmqkxhh26h1s7vvf1lpp7j5b5a4rn0cbr38gv4zwmx9"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "2adc21fd136931e0388e278825291678e1d98309"; - sha256 = "0z6lxahhq3d16w4ff3swrggly08yavzrjsjmmchfq7wcxxdrc9s6"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "925541529c1fa6821df4e44ce2723319eb2be768"; - sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "cc6329d4279e3f025a53a83c397d2339b5705c45"; - sha256 = "1aqvcqr0c7z3sgj272n5f9g8g6cy4361697a0f240amqdvj0ax9v"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/google/gopacket"; - fetch = { - type = "git"; - url = "https://github.com/google/gopacket"; - rev = "67a21c4470a0598531a769727aef40b870ffa128"; - sha256 = "1clxrcabrdrkrgwbal852w3cynvzdwbpl4gc0f5yyzncmaazxmhq"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "41d03372f44f2bc18a72c97615a669fb60e7452a"; - sha256 = "04l6384y7riya4wrc7s7ry7c8dil4sdyks1psqavw85bgy9q1iql"; - }; - } - { - goPackagePath = "github.com/gophercloud/gophercloud"; - fetch = { - type = "git"; - url = "https://github.com/gophercloud/gophercloud"; - rev = "849a2e71dd64dbfa2bd4be110ace68881802414b"; - sha256 = "12xn9gph7hg6sfyqd5z9advsx1s776pm5ji9qnarnq1781k7gzh2"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/handlers"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/handlers"; - rev = "90663712d74cb411cbef281bc1e08c19d1a76145"; - sha256 = "03h5ygjcwama9kr9k7nbg0spv5c7hdlw2ydaclj969i820aq3dpz"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "5ab525f4fb1678e197ae59401e9050fa0b6cb5fd"; - sha256 = "0d8rbiz2ykn43knf75arnm545jfxgw0zf5yx8ncjmfm9iimzj20i"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "cdedf21e585dae942951e34d6defc3215b4280fa"; - sha256 = "1kb7phyvvyl67pdsnd80sgpq3a6gv8lkr8ylppb1i6xwi25yppiv"; - }; - } - { - goPackagePath = "github.com/gosuri/uitable"; - fetch = { - type = "git"; - url = "https://github.com/gosuri/uitable"; - rev = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42"; - sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229"; - sha256 = "1qx04bqbd4cwkakzq8ahz1jq6pq8435h5zcapwn8k8a0f1bgfrnz"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "6b7015e65d366bf3f19b2b2a000a831940f0f7e0"; - sha256 = "039l2c5jsqrhm0g9bngrd3kry89kkai9v97kbd4mayqb619jcdxs"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/grpc-gateway"; - rev = "8cc3a55af3bcf171a1c23a90c4df9cf591706104"; - sha256 = "1pfxxskhihz7ijdfj2vinadx05iljqim9h7g19jzgvrl34p8bhix"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; - sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; - sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; - }; - } - { - goPackagePath = "github.com/howeyc/gopass"; - fetch = { - type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; - sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; - }; - } - { - goPackagePath = "github.com/hydrogen18/stoppableListener"; - fetch = { - type = "git"; - url = "https://github.com/hydrogen18/stoppableListener"; - rev = "dadc9ccc400c712e5a316107a5c462863919e579"; - sha256 = "0yf2a9641v5zscw8sj52aky21nm35cj5d946sbvhrjsr4vzzbbm7"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "e3000cb3d28c72b837601cac94debd91032d19fe"; - sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/intel-go/yanff"; - fetch = { - type = "git"; - url = "https://github.com/intel-go/yanff"; - rev = "35804adce65005f76409327527e4e256569cacc6"; - sha256 = "0rank8ij0ky9ryfw23aqk4mk72lznycqqbs5wr7y71d0pl9ljrgh"; - }; - } - { - goPackagePath = "github.com/iovisor/gobpf"; - fetch = { - type = "git"; - url = "https://github.com/iovisor/gobpf"; - rev = "dd767a9fd5f868874ed117811461410100cea403"; - sha256 = "0kj7g5iz81j9qmz57m5b2a9mfpapmwpp3ad9h5rz58r6wzm5anc3"; - }; - } - { - goPackagePath = "github.com/jbowtie/gokogiri"; - fetch = { - type = "git"; - url = "https://github.com/jbowtie/gokogiri"; - rev = "e2644e49d5b4a4d2382d1a4b28dfbb313a4ffb0c"; - sha256 = "1skbfr0w438xip7p58dkv6806yvm22f1wixqppb2yszgxril0j29"; - }; - } - { - goPackagePath = "github.com/jonboulle/clockwork"; - fetch = { - type = "git"; - url = "https://github.com/jonboulle/clockwork"; - rev = "ed104f61ea4877bea08af6f759805674861e968d"; - sha256 = "04ari17wr4pabjf607jcr7cf13r83dlxlspy8yvfh7hlr0xb16z2"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "ff2b70c1dbffdd98567bd8c2f9449d97c0d04c88"; - sha256 = "1flbh2qg16445md5vcsqvbq538icj5l25k5ygyjf86lxdfkh5kr0"; - }; - } - { - goPackagePath = "github.com/juju/loggo"; - fetch = { - type = "git"; - url = "https://github.com/juju/loggo"; - rev = "8232ab8918d91c72af1a9fb94d3edbe31d88b790"; - sha256 = "11y5gk41g1i5q6aqn6jpgm06nsq2mf7fdmkzwqrqagnajgb0h1s1"; - }; - } - { - goPackagePath = "github.com/juju/ratelimit"; - fetch = { - type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "5b9ff866471762aa2ab2dced63c9fb6f53921342"; - sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k"; - }; - } - { - goPackagePath = "github.com/juju/webbrowser"; - fetch = { - type = "git"; - url = "https://github.com/juju/webbrowser"; - rev = "54b8c57083b4afb7dc75da7f13e2967b2606a507"; - sha256 = "0ngj27f0kgpc4m6jr2hz04kigv6p9z8hviddijgpb9srjzkl7dhz"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "d1898390779332322e6b5ca5011da4bf249bb056"; - sha256 = "19r684s93b7pxqkpxa7p3pba9dw3xf547z05biykil39xk7rgyfa"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "c2c54e542fb797ad986b31721e1baedf214ca413"; - sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h"; - }; - } - { - goPackagePath = "github.com/kr/fs"; - fetch = { - type = "git"; - url = "https://github.com/kr/fs"; - rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; - sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "95d05c1eef33a45bd58676b6ce28d105839b8d0b"; - sha256 = "0lyvs0g2pq0hdblfnpcgvp399j13xy4fzbr24l9zh5vbiw7d1lwc"; - }; - } - { - goPackagePath = "github.com/lxc/lxd"; - fetch = { - type = "git"; - url = "https://github.com/lxc/lxd"; - rev = "9907f3a64b6b8ec9144e8be02d633b951439c0f6"; - sha256 = "0qn0v2facxvg0w5vnasa28nxhvfdy817vkmvsnfqzgcnh60k3z20"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c81f9d71af8f8cba1466501d30326b99a4e56c19"; - sha256 = "1000zi161vzrk2fskjna31j9r9hd6m82i7r7wz76f88421i1xlx5"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "2a92e673c9a6302dd05c3a691ae1f24aef46457d"; - sha256 = "1k0c952c60zcbly9gzi48jyzwphgawnq9f70bgniciyp4jb8hfv3"; - }; - } - { - goPackagePath = "github.com/mattbaird/elastigo"; - fetch = { - type = "git"; - url = "https://github.com/safchain/elastigo"; - rev = "441c1531dca50a19990385930149f6785f78fe59"; - sha256 = "0dmsswm5zkr0054zrvq8h3naddnx4mygsd76fnjqxs25zf88v7ir"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; - }; - } - { - goPackagePath = "github.com/mattn/go-tty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-tty"; - rev = "931426f7535ac39720c8909d70ece5a41a2502a6"; - sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453"; - sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "756f7b183b7ab78acdbbee5c7f392838ed459dda"; - sha256 = "0yd3682x22lqrfq4h0q16c4swcfn3lmds05ijynm2fk1gcbnwiqn"; - }; - } - { - goPackagePath = "github.com/mitchellh/hashstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/hashstructure"; - rev = "ab25296c0f51f1022f01cd99dfb45f1775de8799"; - sha256 = "1k21xr0x7k03hbkh72xbdi8gz8fk3wdlcbfpy7l90rxvi21jzz0f"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "281073eb9eb092240d33ef253c404f1cca550309"; - sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; - }; - } - { - goPackagePath = "github.com/nlewo/contrail-introspect-cli"; - fetch = { - type = "git"; - url = "https://github.com/nlewo/contrail-introspect-cli"; - rev = "e4df28ccf9801abbe32edd5ddaba31a7a62b61b6"; - sha256 = "0wf3s9gqy8pvv5gzngz30j9p7fa4mv5qyr9gnlf5ps85xpnlngbq"; - }; - } - { - goPackagePath = "github.com/nu7hatch/gouuid"; - fetch = { - type = "git"; - url = "https://github.com/nu7hatch/gouuid"; - rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; - sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; - }; - } - { - goPackagePath = "github.com/op/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/op/go-logging"; - rev = "970db520ece77730c7e4724c61121037378659d9"; - sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; - }; - } - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "8fa5343b0058459296399a89bc532aa5508de28d"; - sha256 = "15wbnj19fbprgsrf0k7hpmpxrkh2vzrm71qn3gya05p908k81v03"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "05bcc0fb0d3e60da4b8dd5bd7e0ea563eb4ca943"; - sha256 = "0ma7fwsyl0qflvhbb6qfc5h3yi81iy5lpc6wkdyd1sdafvrzpbb8"; - }; - } - { - goPackagePath = "github.com/petar/GoLLRB"; - fetch = { - type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; - }; - } - { - goPackagePath = "github.com/peterbourgon/diskv"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/diskv"; - rev = "2973218375c3d13162e1d3afe1708aaee318ef3f"; - sha256 = "10jbkxyxilv5hixm4dww4qfn01cnb5fr8mgxvwigq5jcb85mrxig"; - }; - } - { - goPackagePath = "github.com/peterh/liner"; - fetch = { - type = "git"; - url = "https://github.com/peterh/liner"; - rev = "8975875355a81d612fafb9f5a6037bdcc2d9b073"; - sha256 = "17l7p6lxhlnna1w1drgh7g8afxcxxd5j472givm2g7l9v8yg4f17"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "ff09b135c25aae272398c51a07235b90a75aa4f0"; - sha256 = "0pwl6v3hmc22zp32gkyqykl4kg69xk1mlp0vmhgd1f44difd5fvz"; - }; - } - { - goPackagePath = "github.com/pkg/sftp"; - fetch = { - type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5"; - sha256 = "1gkmk60lskyrn5751rgb9pxn41wi7y29wsn8psrfb16bg4flcvrq"; - }; - } - { - goPackagePath = "github.com/pkg/term"; - fetch = { - type = "git"; - url = "https://github.com/pkg/term"; - rev = "cda20d4ac917ad418d86e151eff439648b06185b"; - sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp"; - }; - } - { - goPackagePath = "github.com/pmylund/go-cache"; - fetch = { - type = "git"; - url = "https://github.com/pmylund/go-cache"; - rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; - sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "5cec1d0429b02e4323e042eb04dafdb079ddf568"; - sha256 = "1cgd5pcxf4zgcafq284yf2i711m3kddpb05prxy51li5p1l5cbq0"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "23070236b1ebff452f494ae831569545c2b61d26"; - sha256 = "111vqp3lqsdli7z5rnkrpcfv6yri0qjikyl70whwxzcvkqp9k42s"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8"; - sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"; - }; - } - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011"; - sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17"; - }; - } - { - goPackagePath = "github.com/rogpeppe/fastuuid"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/fastuuid"; - rev = "6724a57986aff9bff1a1770e9347036def7c89f6"; - sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz"; - }; - } - { - goPackagePath = "github.com/safchain/ethtool"; - fetch = { - type = "git"; - url = "https://github.com/safchain/ethtool"; - rev = "e01512671ed4c2248daf0c5e974ecf88a4947335"; - sha256 = "11wk834aas1jj3bag3rwr0sb5alhd40si3fcqkvs0fsg6wjmwxyc"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "6a368fb7cd1221fa6ea90facc9447c9a2234c255"; - sha256 = "0vjf2jwkpb1fls997w3pvw5sg25yjygx0nv1i5pwcfrnpvnw9zxk"; - }; - } - { - goPackagePath = "github.com/skydive-project/dede"; - fetch = { - type = "git"; - url = "https://github.com/skydive-project/dede"; - rev = "d95b69cd1f75137aab3bcc01d6facf2aa7a43b80"; - sha256 = "16qgpxb24zq2js7ril8xf71yz927ly7fsadys23is8jzkgsx56mf"; - }; - } - { - goPackagePath = "github.com/socketplane/libovsdb"; - fetch = { - type = "git"; - url = "https://github.com/socketplane/libovsdb"; - rev = "5113f8fb4d9d374417ab4ce35424fbea1aad7272"; - sha256 = "1b4yz6jvsi2gz8ha9y42hy105q6ylf7516pd59wgg42r6n627w4g"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "a80ea588265c05730645be8342eeafeaa72b2923"; - sha256 = "1i2z4l3a335jz0jg8xzwfdcp0dlf77h8rb6nd88mnd1nbmbd58w4"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "8965335b8c7107321228e3e3702cab9832751bac"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; - sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "d00654080cddbd2b082acaa74007cb94a2b40866"; - sha256 = "06zv87v7m0zgx9zy3w283008fmlx0v41xyldkql7qmp7l5l4vcpw"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; - sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/lebauce/viper"; - rev = "54676d0dbb12f9b6febb2f8210e9590d81d4b5e3"; - sha256 = "1dm01151hn6mywv6hm0nbqsr8qgwp393l4xz9p9jrd8asynpdpsb"; - }; - } - { - goPackagePath = "github.com/tchap/zapext"; - fetch = { - type = "git"; - url = "https://github.com/tchap/zapext"; - rev = "e61c0c8823393722ae09ce0faee42fa177088a4b"; - sha256 = "16xw01phxkndhsn8l9n587vdpmr0kh9xg0vxlk0l6ywkp31583cr"; - }; - } - { - goPackagePath = "github.com/tebeka/selenium"; - fetch = { - type = "git"; - url = "https://github.com/tebeka/selenium"; - rev = "657e45ec600f26e76da253936c1f2adb6978ff72"; - sha256 = "1gqhmlqcq4y5pxw7inqd987xwyrnd5zsmj8blmb5vizhan7liw99"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"; - sha256 = "04iwqjj049q4dldf1wpqymf1y9kdppxp3y0ywsqzaw21bi8b3zcc"; - }; - } - { - goPackagePath = "github.com/vishvananda/netlink"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netlink"; - rev = "016ba6f67a12c03708643150afcfb1509be7747a"; - sha256 = "08z5g217nynq6nrdls8hj1761wwl9skhwfz2fad9di8ziy8mk7w4"; - }; - } - { - goPackagePath = "github.com/vishvananda/netns"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netns"; - rev = "604eaf189ee867d8c147fafc28def2394e878d25"; - sha256 = "0zii8dyy6qb2dh649syz3ablabw78k038w8a7fwnsk3x482p59s7"; - }; - } - { - goPackagePath = "github.com/weaveworks/tcptracer-bpf"; - fetch = { - type = "git"; - url = "https://github.com/weaveworks/tcptracer-bpf"; - rev = "e080bd747dc6b62d4ed3ed2b7f0be4801bef8faf"; - sha256 = "1ijqpzj4nmymi8gh3pl9rnwjzm5q89d1585iwj1s190cxcp1ix81"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonpointer"; - rev = "6fe8760cad3569743d51ddbb243b26f8456742dc"; - sha256 = "1b1flqamhzfi5lc4lbh8iw4s3lix0vxyrq0adpx0znx7lkkxhjvz"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonreference"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonreference"; - rev = "e02fc20de94c78484cd5ffb007f8af96be030a45"; - sha256 = "195in5zr3bhb3r1iins2h610kz339naj284b3839xmrhc15wqxzq"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonschema"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonschema"; - rev = "702b404897d4364af44dc8dcabc9815947942325"; - sha256 = "1lby7iar87q2kjqvcbx2jql4p2ggjq9ml114x7hlb3966447ayfr"; - }; - } - { - goPackagePath = "github.com/xiang90/probing"; - fetch = { - type = "git"; - url = "https://github.com/xiang90/probing"; - rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"; - sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a775f18c7cfe02273500ae307b61218"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "0506d69f5564c56e25797bf7183c28921d4c6360"; - sha256 = "0b1b0iz6jwk5f77mwsggsvkywmxwwn1b4a6n63xd5czl23vi7a6q"; - }; - } - { - goPackagePath = "go.uber.org/multierr"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/multierr"; - rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a"; - sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; - }; - } - { - goPackagePath = "go.uber.org/zap"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/zap"; - rev = "35aad584952c3e7020db7b839f6b102de6271f89"; - sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "1f22c0103821b9390939b6776727195525381532"; - sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "a6577fac2d73be281a500b310739095313165611"; - sha256 = "00wks377dp0ws47dvc9f6y4sin1mwdk649v5jfz047ik1jh1nq5h"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "810d7000345868fc619eb81f46307107118f4ae1"; - sha256 = "07lm9h86l29dd45ca3vjsi06xpwg36899hf1ns7qwabflzgm0nxy"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a"; - sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "2b5a72b8730b0b16380010cfe5286c42108d88e7"; - sha256 = "0i69x08kg5yqwaz5grxbfhg2hjdkdhaqbc1v4x4l91232kw5nd38"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e"; - sha256 = "1sf3fvphz16pf7jbm86n07rip9m5fh40wjcc2j2d5zpka36xvjw4"; - }; - } - { - goPackagePath = "gopkg.in/errgo.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/errgo.v1"; - rev = "442357a80af5c6bf9b6d51ae791a39c3421004f3"; - sha256 = "0gg7vqkfh2bpn2z9xfdahrxdkvn365mdb63zs8s5v5cbm2glfq56"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify/fsnotify.v1"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/httprequest.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/httprequest.v1"; - rev = "93f8fee4081f01ea23d258bdbbcdd319f668d718"; - sha256 = "1lgicrb355m2vb31ly4ly997ral1zvqk9fy89x4qkxals1zfqi3q"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/inf.v0"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "gopkg.in/macaroon-bakery.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/macaroon-bakery.v2"; - rev = "22c04a94d902625448265ef041bb53e715452a40"; - sha256 = "1iaisvljir95m7jh02k98jv2j68bs38fdlis4pnjbpj8mbarllw4"; - }; - } - { - goPackagePath = "gopkg.in/macaroon.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/macaroon.v2"; - rev = "bed2a428da6e56d950bed5b41fcbae3141e5b0d0"; - sha256 = "199dcdl38vjj078aq56kpfzni0sm7j3062nxd8yyj1bd67x0xmsi"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "eef8f47ab679652a7d3a4ee34c34314d255d2536"; - sha256 = "0ahmw49lswks636vz49vb33r4rq0g3rrkqwsh8fn0kmhp94c9w40"; - }; - } - { - goPackagePath = "gopkg.in/urfave/cli.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/urfave/cli.v2"; - rev = "b2bf3c5abeb90da407891aecd1df2c5a1f6170c1"; - sha256 = "1x90qcnjcicq1d933bd9mdyjkwd0h9hdxgva45z85gqr7lavs5h3"; - }; - } - { - goPackagePath = "gopkg.in/validator.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/validator.v2"; - rev = "3e4f037f12a1221a0864cf0dd2e81c452ab22448"; - sha256 = "1294nz3wi4avn1nwyr8cdcx8jqjvlzadlnswarpwrq41mhlmhjfs"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "bef53efd0c76e49e6de55ead051f886bea7e9420"; - sha256 = "0df5gr2qyflh1vmb1i2jbkc46dc3mqmdbc53vbyrzw0ilzhzh0si"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "4df58c811fe2e65feb879227b2b245e4dc26e7ad"; - sha256 = "14pxzm1gqh4pa1179c8hfcbi5rqy9fx2cvpns8pwlyqz807rg2vl"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "019ae5ada31de202164b118aee88ee2d14075c31"; - sha256 = "1l1przxkbid3sfn80n60w2z883yad99cl89k4zwb9i7wcydk85w1"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "35ccd4336052e7d73018b1382413534936f34eee"; - sha256 = "1sp0v60xpy6lsdzsqq7lzcqkmqds100ziqzj2fip68svcysgqg9g"; - }; - } - { - goPackagePath = "k8s.io/kube-openapi"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kube-openapi"; - rev = "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"; - sha256 = "08b5yx07saj5vzzic50hlzw68p2fd7xc118x1liq4wqrikxmv8wa"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 046c6bc9acc..033ed842085 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -325,6 +325,7 @@ mapAliases ({ shared_mime_info = shared-mime-info; # added 2018-02-25 skrooge2 = skrooge; # added 2017-02-18 skype = skypeforlinux; # added 2017-07-27 + skydive = throw "skydive has been removed from nixpkgs (2019-09-10)"; slic3r-prusa3d = prusa-slicer; # added 2019-05-21 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4ae7430e0f..b64b2c01ce9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13562,12 +13562,6 @@ in sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; }; - skydive = callPackage ../tools/networking/skydive { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; - slang = callPackage ../development/libraries/slang { }; slibGuile = callPackage ../development/libraries/slib { From 300464ec67f3b00110675a563581de33af988ccc Mon Sep 17 00:00:00 2001 From: Vasiliy Yorkin Date: Mon, 9 Sep 2019 12:07:43 +0300 Subject: [PATCH 024/159] ocamlPackages.rpclib: init at 5.9.0 --- .../ocaml-modules/rpclib/default.nix | 27 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/ocaml-modules/rpclib/default.nix diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix new file mode 100644 index 00000000000..2b4ab181859 --- /dev/null +++ b/pkgs/development/ocaml-modules/rpclib/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, buildDunePackage, alcotest, cmdliner, rresult, result, xmlm, yojson }: + +buildDunePackage rec { + pname = "rpclib"; + version = "5.9.0"; + + minimumOCamlVersion = "4.04"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-rpc"; + rev = "v${version}"; + sha256 = "1swnnmmnkn53mxqpckdnd1j8bz0wksqznjbv0zamspxyqybmancq"; + }; + + buildInputs = [ alcotest cmdliner yojson ]; + propagatedBuildInputs = [ rresult result xmlm ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/mirage/ocaml-rpc"; + description = "Light library to deal with RPCs in OCaml"; + license = licenses.isc; + maintainers = [ maintainers.vyorkin ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index af3f446cb25..11279f507d8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -731,6 +731,8 @@ let rope = callPackage ../development/ocaml-modules/rope { }; + rpclib = callPackage ../development/ocaml-modules/rpclib { }; + rresult = callPackage ../development/ocaml-modules/rresult { }; safepass = callPackage ../development/ocaml-modules/safepass { }; From 6468d465ed67e09fa4da92c579a2e1c32fd4af44 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Tue, 27 Aug 2019 16:56:39 +0200 Subject: [PATCH 025/159] pythonPackages.fire: 0.1.3 -> 0.2.1 --- pkgs/development/python-modules/fire/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index c44083e4c29..7af8d29fce7 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -1,18 +1,18 @@ { stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock -, python-Levenshtein, pytest }: +, python-Levenshtein, pytest, termcolor, isPy27, enum34 }: buildPythonPackage rec { pname = "fire"; - version = "0.1.3"; + version = "0.2.1"; src = fetchFromGitHub { owner = "google"; repo = "python-fire"; rev = "v${version}"; - sha256 = "0kdcmzr3sgzjsw5fmvdylgrn8akqjbs433jbgqzp498njl9cc6qx"; + sha256 = "1r6cmihafd7mb6j3mvgk251my6ckb0sqqj1l2ny2azklv175b38a"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34; checkInputs = [ hypothesis mock python-Levenshtein pytest ]; @@ -20,14 +20,6 @@ buildPythonPackage rec { py.test ''; - patches = [ - # Add Python 3.7 support. Remove with the next release - (fetchpatch { - url = "https://github.com/google/python-fire/commit/668007ae41391f5964870b4597e41493a936a11e.patch"; - sha256 = "0rf7yzv9qx66zfmdggfz478z37fi4rwx4hlh3dk1065sx5rfksi0"; - }) - ]; - meta = with stdenv.lib; { description = "A library for automatically generating command line interfaces"; longDescription = '' From a91fe3d575060d3b4e8f5d614d27707aaa8975e8 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Tue, 10 Sep 2019 10:19:28 +0200 Subject: [PATCH 026/159] getdns: 1.5.1 -> 1.5.2 --- pkgs/development/libraries/getdns/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 3a6c4ee1dbd..721245ceb6d 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -3,11 +3,12 @@ stdenv.mkDerivation rec { pname = "getdns"; - version = "1.5.1"; + version = "1.5.2"; + versionRewrite = builtins.splitVersion version; src = fetchurl { - url = "https://getdnsapi.net/releases/${pname}-1-5-1/${pname}-${version}.tar.gz"; - sha256 = "5686e61100599c309ce03535f9899a5a3d94a82cc08d10718e2cd73ad3dc28af"; + url = "https://getdnsapi.net/releases/${pname}-${builtins.concatStringsSep "-" versionRewrite}/${pname}-${version}.tar.gz"; + sha256 = "1h4l0sbkpiahpx2pd5lby10yi22mdxgx5xf1y80r77pa46iac9hq"; }; nativeBuildInputs = [ libtool m4 autoreconfHook automake file ]; From 8668af2b14761c4ece2742c7946f8197fb32064f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 10 Sep 2019 13:59:08 +0200 Subject: [PATCH 027/159] gns3Packages.{server,gui}Preview: 2.2.0rc4 -> 2.2.0rc5 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index c5cf7a7c2ee..1d2756de7e6 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.21"; - previewVersion = "2.2.0rc4"; + previewVersion = "2.2.0rc5"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "14fzjaanaxya97wrya2lybxz6qv72fk4ws8i92zvjz4jkvjdk9n3"; + sha256Hash = "0x4sp6yjnvzpk8cxdqlf51njckmvvkijdb7rvcb4hvqq1ab6gb2x"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "03s2kq5f8whk14rhprg9yp3918641b1cwj6djcbjw8xpz0n3w022"; + sha256Hash = "0inj6fac0683s1sxaba3ljia90cfach0y42xylzgzza36wpyqpqg"; }; } From dac340737ab78863b4ee5034d8263a29e634c8ec Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 10 Sep 2019 21:13:06 +0900 Subject: [PATCH 028/159] flashplayer: 32.0.0.238 -> 32.0.0.255 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index a0ea67133c6..b356f809f03 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -100,11 +100,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.238"; + version = "32.0.0.255"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0jqx68lfqjpy6wbxdi0giclvh9mc9rha92hqdj1nx42v95k3gc65"; + sha256 = "1rqb54kqxq66vvqk5yrr3rsy3wcj9r9wnkngk27c7jayzm6bwgvv"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 772ca926cd7..2f90736a8d7 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.238"; + version = "32.0.0.255"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1f5i64nzkvxy20vi7kldaamwp6pi2zgmjiw061cgqrwf7hj45wkg" + "1hd5z8qmki36k2wdwgg3v4sj32g8590r5563gdrjrk7bmrqfjnji" else - "09jvxqp83hpk89ak8flq14s3s3nhy3ary91jc6k47v325axh1cl9" + "0y13bxdgkxaqsyab09skiqj8dfjw76n2lr7p525ba8lbfbc8xj52" else if arch == "x86_64" then - "05gvssjdz43pvgivdngrf8qr5b30p45hr2sr97cyl6b87581qw9s" + "0qkslkaiw3c9xk1rjcl4x9d0fi6i91k7g01mf0gq28wgzcyz4cw7" else - "06l7zhgh5rfxxw46b500zdgcqsk2h7kivng5b0b74s3vy7f0g270"; + "0qblmaa3nq1g7825yhvz98pvd1591q3q7bsrhv5bbhdbmb9c1qd5"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index c603dc6cf9f..527eb261006 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.238"; + version = "32.0.0.255"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1vhfjpwsmg96irfvz81ldzn2m4qcjnql5psg4cifjay423yxabvy" + "1igc23mljmw1bw6fwx3rwpz7kxiy8n5znkng20w3yin2zh8qw8sy" else - "0am95xi2jasvxj5b2i12wzpvl3bvxli537k1i04698cg0na6x0y0"; + "0rfvgx1g0s8wswwpmfjx6p59yh1cxya3x3bczbissrq4rcb1v315"; }; nativeBuildInputs = [ unzip ]; From 64bd7a34f996e0f7661f230e5906d04a5c1a7741 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 10 Sep 2019 08:20:22 -0400 Subject: [PATCH 029/159] linux: 4.14.142 -> 4.14.143 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ae39047a9d3..0a0ccaffa7d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.142"; + version = "4.14.143"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "1wwhnm1n1b6yzsd2zzzf9i3n4hlvgnph70p67cwahw0ik4ssayz6"; + sha256 = "14rxck0dd0rirj09aj4xsbylcvvfrgqxr1fx0c570dxr7kqg4d15"; }; } // (args.argsOverride or {})) From feb7dc93b90509e0c3b1f1ef58473899ffe0f810 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 10 Sep 2019 08:20:29 -0400 Subject: [PATCH 030/159] linux: 4.19.71 -> 4.19.72 --- 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 56d254c1ecb..16277e6c85f 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.71"; + version = "4.19.72"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "1bjwkb7k82l646ryyy0jbwsnygm2qsxgcwli8bdrj844skzynlqz"; + sha256 = "0v8zypwyc9bcmm16hbvk092h9qnwqc0f6m61bz2ml499pnrvdz7r"; }; } // (args.argsOverride or {})) From 3e828aa8c4d1412e6f60a66bc4b6c010f9d7ba64 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 10 Sep 2019 08:20:34 -0400 Subject: [PATCH 031/159] linux: 4.4.191 -> 4.4.192 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 2889dc34aba..9f03e200f1b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.191"; + version = "4.4.192"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0x3lnq4xyj5v6r1cz4jizm4vdspws1nb806f5qczwi3yil5nm6bh"; + sha256 = "0fwak1hrahcky1hdk4h8693rjpx65c2sqzfm1x71nhhysa6r3fig"; }; } // (args.argsOverride or {})) From 9c148f8c118f29f0e08caf4b0b803d809ed4de70 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 10 Sep 2019 08:20:40 -0400 Subject: [PATCH 032/159] linux: 4.9.191 -> 4.9.192 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d494c7bb623..9b91ced27d0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.191"; + version = "4.9.192"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1g5p736p8zx5rmxaj56yw93jp768npl868jsn8973dny0rsbim6y"; + sha256 = "0m4d6b5sfcx3iv0agia080fbcn9icyqzgzxp946zv93hrq6306ks"; }; } // (args.argsOverride or {})) From 91451235083d27b7ef68d7acf0c8214cdd110996 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 10 Sep 2019 08:20:44 -0400 Subject: [PATCH 033/159] linux: 5.2.13 -> 5.2.14 --- pkgs/os-specific/linux/kernel/linux-5.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index dfce0f30398..47e57b8bb0a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.13"; + version = "5.2.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "12hpph3iynr22mfwz7745lp01waf2kg579hr56d4pvhx4iahzdhp"; + sha256 = "136fs0pn5acg40rlq51zl5001rk8fx01gi2ffd58cspfgx3kckf6"; }; } // (args.argsOverride or {})) From 1d483896b1b4cf173dcebe3c9818e781f634f155 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 10 Sep 2019 08:23:12 -0400 Subject: [PATCH 034/159] zoom-us: 3.0.287250.0828 -> 3.0.291715.0908 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b9791cbfbac..933badccf63 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.0.287250.0828"; + version = "3.0.291715.0908"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0k4h43wydbcyx7b7gwxkmvbph8qc6kjpcypd7vwz8rph1l7kl1y1"; + sha256 = "1f2fcwf0p86bxcnfdhij6hvgizd7n7gjcccwzdm2jv0dbqskad2f"; }; }; From cb7deb3deba5c3195ed55f540f2e9895faf1a049 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 10 Sep 2019 08:55:28 -0400 Subject: [PATCH 035/159] moodle: 3.7.1 -> 3.7.2 --- pkgs/servers/web-apps/moodle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 4f47890cc87..77822365f9c 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, writeText }: let - version = "3.7.1"; + version = "3.7.2"; stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version); in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "0xfriw0nfaf9hlcjviwg2acwpd192jf2ahw8sw3s6bj3pr1isxmd"; + sha256 = "1mvrmpqkcz7m7yplqi0lwgnal79n747f7nwcgd2nfrvz7jv3s8ir"; }; phpConfig = writeText "config.php" '' From 17877eaa682407e613429e97cbf28f0297fb2e7d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 9 Sep 2019 22:13:06 -0400 Subject: [PATCH 036/159] nixosTests.xfce4-14: fix test by enabling sound Same issue as f59b4cb8d545d3bb1bd954f9e3267cb7ebec3557 --- nixos/tests/xfce4-14.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/xfce4-14.nix b/nixos/tests/xfce4-14.nix index d9b10aabaa1..9dfedc6fbb9 100644 --- a/nixos/tests/xfce4-14.nix +++ b/nixos/tests/xfce4-14.nix @@ -12,6 +12,8 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.displayManager.auto.user = "alice"; services.xserver.desktopManager.xfce4-14.enable = true; + + hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then }; testScript = From 0eb814ea883843f53eb2bd1451596231420bf10c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 9 Sep 2019 22:14:03 -0400 Subject: [PATCH 037/159] nixosTests.xfce: fix test by enabling sound Same issue as f59b4cb8d545d3bb1bd954f9e3267cb7ebec3557 --- nixos/tests/xfce.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 12d8a050d47..6e003d51460 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -17,6 +17,8 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.desktopManager.xfce.enable = true; environment.systemPackages = [ pkgs.xorg.xmessage ]; + + hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then }; testScript = From bbcc947c46f88d419f6563d646bc7dd805b3f14c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 9 Sep 2019 22:17:18 -0400 Subject: [PATCH 038/159] nixosTests.plasma5: fix test by enabling sound Same issue as f59b4cb8d545d3bb1bd954f9e3267cb7ebec3557 --- nixos/tests/plasma5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 788c8719c8d..88d4ff33436 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -30,6 +30,7 @@ import ./make-test.nix ({ pkgs, ...} : enable = true; user = "alice"; }; + hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then virtualisation.memorySize = 1024; environment.systemPackages = [ sddm_theme ]; }; From baf36d9afa08c7ba4187fc4507786fd372b7a781 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 9 Sep 2019 22:17:45 -0400 Subject: [PATCH 039/159] nixosTests.xfce: bump memorySize --- nixos/tests/xfce.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 6e003d51460..6cb4fae2021 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -19,6 +19,8 @@ import ./make-test.nix ({ pkgs, ...} : { environment.systemPackages = [ pkgs.xorg.xmessage ]; hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then + + virtualisation.memorySize = 1024; }; testScript = From 20f8c3b984dbd5b12c17e3f97a9bab5340092102 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 9 Sep 2019 22:18:08 -0400 Subject: [PATCH 040/159] nixosTests.xfce4-14: bump memorySize --- nixos/tests/xfce4-14.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/xfce4-14.nix b/nixos/tests/xfce4-14.nix index 9dfedc6fbb9..94378f0c8d3 100644 --- a/nixos/tests/xfce4-14.nix +++ b/nixos/tests/xfce4-14.nix @@ -14,6 +14,8 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.desktopManager.xfce4-14.enable = true; hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then + + virtualisation.memorySize = 1024; }; testScript = From 35f849ab4466541a45f5633176e1ac85979e900e Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 10 Sep 2019 14:05:19 +0200 Subject: [PATCH 041/159] gem-config: fix gpgme --- pkgs/development/ruby-modules/gem-config/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 4e910ae9a24..aa1d0a9755d 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -198,6 +198,7 @@ in gpgme = attrs: { buildInputs = [ gpgme ]; + buildFlags = [ "--use-system-libraries" ]; }; gio2 = attrs: { From da7886c94054af70c222b5c277da1f7d9393f79a Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 10 Sep 2019 14:32:55 +0200 Subject: [PATCH 042/159] sup: remove --- .../networking/mailreaders/sup/.bundix/cache | 4 - .../networking/mailreaders/sup/Gemfile | 9 - .../networking/mailreaders/sup/Gemfile.lock | 41 ----- .../networking/mailreaders/sup/default.nix | 28 ---- .../networking/mailreaders/sup/gemset.nix | 155 ------------------ pkgs/development/libraries/xapian/default.nix | 2 - .../ruby-modules/gem-config/default.nix | 13 -- .../gem-config/mkrf_conf_xapian.rb | 14 -- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 8 +- 10 files changed, 2 insertions(+), 273 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/sup/.bundix/cache delete mode 100644 pkgs/applications/networking/mailreaders/sup/Gemfile delete mode 100644 pkgs/applications/networking/mailreaders/sup/Gemfile.lock delete mode 100644 pkgs/applications/networking/mailreaders/sup/default.nix delete mode 100644 pkgs/applications/networking/mailreaders/sup/gemset.nix delete mode 100644 pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb diff --git a/pkgs/applications/networking/mailreaders/sup/.bundix/cache b/pkgs/applications/networking/mailreaders/sup/.bundix/cache deleted file mode 100644 index 5894e96022c..00000000000 --- a/pkgs/applications/networking/mailreaders/sup/.bundix/cache +++ /dev/null @@ -1,4 +0,0 @@ ---- -gem: - https://rubygems.org/downloads/mini_portile-0.6.0.gem: 09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn - https://rubygems.org/downloads/gpgme-2.0.7.gem: 1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile b/pkgs/applications/networking/mailreaders/sup/Gemfile deleted file mode 100644 index bc37456ae58..00000000000 --- a/pkgs/applications/networking/mailreaders/sup/Gemfile +++ /dev/null @@ -1,9 +0,0 @@ -source "https://rubygems.org" - -gem 'rake' -gem 'sup' -gem 'gpgme' - -# Sup tries to `xapian-ruby` in its extconf instead of listing it as a -# dependency. -gem 'xapian-ruby', "~> 1.2.22" diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock deleted file mode 100644 index bd0f051c104..00000000000 --- a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock +++ /dev/null @@ -1,41 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - chronic (0.9.1) - gpgme (2.0.18) - mini_portile2 (~> 2.3) - highline (2.0.2) - locale (2.1.2) - lockfile (2.1.3) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) - mini_portile2 (2.4.0) - ncursesw (1.4.10) - rake (12.3.2) - rmail-sup (1.0.1) - sup (0.22.1) - chronic (~> 0.9.1) - highline - locale (~> 2.0) - lockfile - mime-types (> 2.0) - ncursesw (~> 1.4.0) - rmail-sup (~> 1.0.1) - trollop (>= 1.12) - unicode (~> 0.4.4) - trollop (2.9.9) - unicode (0.4.4.4) - xapian-ruby (1.2.22) - -PLATFORMS - ruby - -DEPENDENCIES - gpgme - rake - sup - xapian-ruby (~> 1.2.22) - -BUNDLED WITH - 1.17.2 diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix deleted file mode 100644 index ccd092ba63c..00000000000 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, bundlerApp, bundlerUpdateScript }: - -bundlerApp { - pname = "sup"; - gemdir = ./.; - exes = [ - "sup" - "sup-add" - "sup-config" - "sup-dump" - "sup-import-dump" - "sup-psych-ify-config-files" - "sup-recover-sources" - "sup-sync" - "sup-sync-back-maildir" - "sup-tweak-labels" - ]; - - passthru.updateScript = bundlerUpdateScript "sup"; - - meta = with lib; { - description = "A curses threads-with-tags style email client"; - homepage = http://sup-heliotrope.github.io; - license = licenses.gpl2; - maintainers = with maintainers; [ cstrahan lovek323 manveru nicknovitski ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/mailreaders/sup/gemset.nix b/pkgs/applications/networking/mailreaders/sup/gemset.nix deleted file mode 100644 index 023374932cb..00000000000 --- a/pkgs/applications/networking/mailreaders/sup/gemset.nix +++ /dev/null @@ -1,155 +0,0 @@ -{ - chronic = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk"; - type = "gem"; - }; - version = "0.9.1"; - }; - gpgme = { - dependencies = ["mini_portile2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m"; - type = "gem"; - }; - version = "2.0.18"; - }; - highline = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g0zpalfj8wvca86hcnirir5py2zyqrhkgdgv9f87fxkjaw815wr"; - type = "gem"; - }; - version = "2.0.2"; - }; - locale = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; - type = "gem"; - }; - version = "2.1.2"; - }; - lockfile = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr"; - type = "gem"; - }; - version = "2.1.3"; - }; - mime-types = { - dependencies = ["mime-types-data"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; - type = "gem"; - }; - version = "3.2.2"; - }; - mime-types-data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; - type = "gem"; - }; - version = "3.2019.0331"; - }; - mini_portile2 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; - type = "gem"; - }; - version = "2.4.0"; - }; - ncursesw = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nc14wls1yiigz593vw7580hb99lf4n485axapiz6sqpg1jnlhcr"; - type = "gem"; - }; - version = "1.4.10"; - }; - rake = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; - type = "gem"; - }; - version = "12.3.2"; - }; - rmail-sup = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g"; - type = "gem"; - }; - version = "1.0.1"; - }; - sup = { - dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi"; - type = "gem"; - }; - version = "0.22.1"; - }; - trollop = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "074h7lns72kg1dl5gvz5apl3xz1i0axbnbc01pf2kbw4q0lkpnp4"; - type = "gem"; - }; - version = "2.9.9"; - }; - unicode = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v8kxmq9i85agjpl7pnl72688901xhs8wxhmj6lpy16a8xz3nzxk"; - type = "gem"; - }; - version = "0.4.4.4"; - }; - xapian-ruby = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15"; - type = "gem"; - }; - version = "1.2.22"; - }; -} \ No newline at end of file diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 9d317fe00d2..bb14f3437ba 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -37,7 +37,5 @@ let }; }; in { - # xapian-ruby needs 1.2.22 as of 2017-05-06 - xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg"; } diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 4e910ae9a24..421bb0ef04b 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -535,19 +535,6 @@ in ]; }; - sup = attrs: { - dontBuild = false; - # prevent sup from trying to dynamically install `xapian-ruby`. - nativeBuildInputs = [ bundler rake ]; - postPatch = '' - cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb - - substituteInPlace lib/sup/crypto.rb \ - --replace 'which gpg2' \ - '${which}/bin/which gpg' - ''; - }; - rb-readline = attrs: { dontBuild = false; postPatch = '' diff --git a/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb b/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb deleted file mode 100644 index e19f06e23ac..00000000000 --- a/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'rubygems' -require 'rubygems/command.rb' -require 'rubygems/dependency_installer.rb' -require 'rbconfig' - -begin - Gem::Command.build_args = ARGV -rescue NoMethodError -end - -# create dummy rakefile to indicate success -f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w") -f.write("task :default\n") -f.close diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b243fabb3a..891c66a8335 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -342,6 +342,7 @@ mapAliases ({ sshfsFuse = sshfs-fuse; # added 2016-09 suil-qt5 = suil; # added 2018-05-01 surf-webkit2 = surf; # added 2017-04-02 + sup = throw "deprecated in 2019-09-10: abandoned by upstream"; system_config_printer = system-config-printer; # added 2016-01-03 systool = sysfsutils; # added 2018-04-25 tahoelafs = tahoe-lafs; # added 2018-03-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1232de16e9..1f2698f084b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14123,7 +14123,7 @@ in x265 = callPackage ../development/libraries/x265 { }; inherit (callPackages ../development/libraries/xapian { }) - xapian_1_2_22 xapian_1_4; + xapian_1_4; xapian = xapian_1_4; xapian-omega = callPackage ../development/libraries/xapian/tools/omega { @@ -19643,12 +19643,6 @@ in speedread = callPackage ../applications/misc/speedread { }; - sup = callPackage ../applications/networking/mailreaders/sup { - bundlerApp = bundlerApp.override{ - ruby = ruby.override { cursesSupport = true; }; - }; - }; - synapse = callPackage ../applications/misc/synapse { }; synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { From e63312ea120e6892626ee380fdee8c1373d41016 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 28 Apr 2019 19:03:54 +0200 Subject: [PATCH 043/159] echoip: Migrate to buildGoModule --- pkgs/servers/echoip/default.nix | 10 ++--- pkgs/servers/echoip/deps.nix | 74 --------------------------------- 2 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 pkgs/servers/echoip/deps.nix diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index d55eb1d0bbd..83f3945fc9c 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -1,11 +1,9 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { +buildGoModule { pname = "echoip"; version = "unstable-2018-11-20"; - goPackagePath = "github.com/mpolden/echoip"; - src = fetchFromGitHub { owner = "mpolden"; repo = "echoip"; @@ -13,9 +11,7 @@ buildGoPackage { sha256 = "0n5d9i8cc5lqgy5apqd3zhyl3h1xjacf612z8xpvbm75jnllcvxy"; }; - goDeps = ./deps.nix; - - outputs = [ "bin" "out" ]; + modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly"; postInstall = '' mkdir -p $out diff --git a/pkgs/servers/echoip/deps.nix b/pkgs/servers/echoip/deps.nix deleted file mode 100644 index 4e4f0799bda..00000000000 --- a/pkgs/servers/echoip/deps.nix +++ /dev/null @@ -1,74 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "v1.4.0"; - sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a"; - }; - } - - { - goPackagePath = "github.com/oschwald/geoip2-golang"; - fetch = { - type = "FromGitHub"; - owner = "oschwald"; - repo = "geoip2-golang"; - rev = "v1.2.1"; - sha256 = "0zpgpz577rghvgis6ji9l99pq87z5izbgzmnbyn3dy533bayrgpw"; - }; - } - - { - goPackagePath = "github.com/oschwald/maxminddb-golang"; - fetch = { - type = "git"; - url = "https://github.com/oschwald/maxminddb-golang"; - rev = "v1.2.1"; - sha256 = "0nlip5a2yiig0sv9y3ky4kn8730236wal3zjcs4yfgnw6nxl3rjr"; - }; - } - - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "37707fdb30a5"; - sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; - }; - } -] From 6fe75ffd9f3956ea8f76f295351a747cbb5daeaf Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 28 Apr 2019 18:23:19 +0200 Subject: [PATCH 044/159] echoip: 2018-11-20 -> 2019-07-12 --- pkgs/servers/echoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index 83f3945fc9c..48f6755bf61 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -2,13 +2,13 @@ buildGoModule { pname = "echoip"; - version = "unstable-2018-11-20"; + version = "unstable-2019-07-12"; src = fetchFromGitHub { owner = "mpolden"; repo = "echoip"; - rev = "4bfaf671b9f75a7b2b37543b2991401cbf57f1f0"; - sha256 = "0n5d9i8cc5lqgy5apqd3zhyl3h1xjacf612z8xpvbm75jnllcvxy"; + rev = "fb5fac92d2173c2a5b07ed4ecc7b5fefe8484ed2"; + sha256 = "17gkh1qfxasvxy25lmjdwk5fsjkcp7lmw9si3xzf01m7qnj5zi4b"; }; modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly"; From 463faedb4d6bc892f84d173d37e0ab51f8069f2f Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 5 Sep 2019 21:00:44 +0200 Subject: [PATCH 045/159] echoip: Use `index` output for index.html --- pkgs/servers/echoip/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index 48f6755bf61..b3402933f9f 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -13,9 +13,11 @@ buildGoModule { modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly"; + outputs = [ "out" "index" ]; + postInstall = '' - mkdir -p $out - cp $src/index.html $out/index.html + mkdir -p $index + cp $src/index.html $index/index.html ''; meta = with lib; { From 764724a631f59522b01132d9a251d27a9c72c839 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 3 Sep 2019 19:35:40 +0000 Subject: [PATCH 046/159] ocamlPackages.nocrypto: add explicit dependency to ppx_deriving --- pkgs/development/ocaml-modules/nocrypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index 9108fd248c0..06a87c072b4 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg , cpuid, ocb-stubblr, sexplib -, cstruct, zarith, ppx_sexp_conv +, cstruct, zarith, ppx_sexp_conv, ppx_deriving , cstruct-lwt ? null }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ]; - propagatedBuildInputs = [ cstruct ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; + propagatedBuildInputs = [ cstruct ppx_deriving ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; From 748046d594052506f6e80d0f6478f828df49dfc4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 3 Sep 2019 19:35:45 +0000 Subject: [PATCH 047/159] =?UTF-8?q?ocamlPackages.janeStreet:=20init=20at?= =?UTF-8?q?=200.12=20(for=20OCaml=20=E2=89=A5=204.07)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also add a few legacy packages at version 0.11 for OCaml ≥ 4.07: configurator, ppx_core, ppx_driver, ppx_type_conv ocamlPackages.bap: disable for OCaml ≥ 4.07 ocamlPackages.bistro: 0.4.0 -> 0.5.0 --- .../development/ocaml-modules/bap/default.nix | 4 + .../ocaml-modules/bistro/default.nix | 10 +- .../ocaml-modules/janestreet/0.12.nix | 466 ++++++++++++++++++ .../janestreet/janePackage_0_12.nix | 19 + pkgs/top-level/ocaml-packages.nix | 9 +- 5 files changed, 502 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/0.12.nix create mode 100644 pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 5ddb9a46224..0766e6e8a8c 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -6,6 +6,10 @@ which, makeWrapper, writeText }: +if stdenv.lib.versionAtLeast core_kernel.version "0.12" +then throw "BAP needs core_kernel-0.11 (hence OCaml ≤ 4.06)" +else + stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-bap-${version}"; version = "1.6.0"; diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index b3dddec511c..d6a1cac1719 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -1,22 +1,22 @@ { lib, fetchFromGitHub, buildDunePackage -, core, lwt ? ocaml_lwt, ocaml_lwt, ocamlgraph, rresult, tyxml +, base64, bos, core, lwt_react, ocamlgraph, rresult, tyxml }: buildDunePackage rec { pname = "bistro"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "pveber"; repo = pname; rev = "v${version}"; - sha256 = "0bxnggm4nkyl2iqwj4f5afw8lj5miq2rqsc9qfrlmg4g4rr3zh1c"; + sha256 = "114gq48cpj2mvycypa9lfyqqb26wa2gkdfwkcqhnx7m6sdwv9a38"; }; - buildInputs = [ lwt ocamlgraph rresult tyxml ]; + buildInputs = [ base64 bos lwt_react ocamlgraph rresult tyxml ]; propagatedBuildInputs = [ core ]; - minimumOCamlVersion = "4.04"; + minimumOCamlVersion = "4.07"; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix new file mode 100644 index 00000000000..4089b24ca22 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix @@ -0,0 +1,466 @@ +{ janePackage +, ctypes +, num +, octavius +, ppxlib +, re +, openssl +}: + +rec { + + ocaml-compiler-libs = janePackage { + pname = "ocaml-compiler-libs"; + hash = "0g9y1ljjsj1nw0lz460ivb6qmz9vhcmfl8krlmqfrni6pc7b0r6f"; + meta.description = "OCaml compiler libraries repackaged"; + }; + + sexplib0 = janePackage { + pname = "sexplib0"; + hash = "13xdd0pvypxqn0ldwdgikmlinrp3yfh8ixknv1xrpxbx3np4qp0g"; + meta.description = "Library containing the definition of S-expressions and some base converters"; + }; + + base = janePackage { + pname = "base"; + version = "0.12.2"; + hash = "0gl89zpgsf3n30nb6v5cns27g2bfg4rf3s2427gqvwbkr5gcf7ri"; + meta.description = "Full standard library replacement for OCaml"; + propagatedBuildInputs = [ sexplib0 ]; + }; + + stdio = janePackage { + pname = "stdio"; + hash = "1pn8jjcb79n6crpw7dkp68s4lz2mw103lwmfslil66f05jsxhjhg"; + meta.description = "Standard IO library for OCaml"; + propagatedBuildInputs = [ base ]; + }; + + ppx_sexp_conv = janePackage { + pname = "ppx_sexp_conv"; + hash = "0idzp1kzds0gnilschzs9ydi54if8y5xpn6ajn710vkipq26qcld"; + meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_here = janePackage { + pname = "ppx_here"; + hash = "07qbchwif1i9ii8z7v1bib57d3mjv0b27i8iixw78i83wnsycmdx"; + meta.description = "Expands [%here] into its location"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_compare = janePackage { + pname = "ppx_compare"; + hash = "0n1ax4k2smhps9hc2v58lc06a0fgimwvbi1aj4x78vwh5j492bys"; + meta.description = "Generation of comparison functions from types"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_assert = janePackage { + pname = "ppx_assert"; + hash = "0as6mzr6ki2a9d4k6132p9dskn0qssla1s7j5rkzp75bfikd0ip8"; + meta.description = "Assert-like extension nodes that raise useful errors on failure"; + propagatedBuildInputs = [ ppx_compare ppx_here ppx_sexp_conv ]; + }; + + ppx_inline_test = janePackage { + pname = "ppx_inline_test"; + hash = "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50"; + meta.description = "Syntax extension for writing in-line tests in ocaml code"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_custom_printf = janePackage { + pname = "ppx_custom_printf"; + version = "0.12.1"; + hash = "0q7591agvd3qy9ihhbyk4db48r0ng7yxspfj8afxxiawl7k5bas6"; + meta.description = "Printf-style format-strings for user-defined string conversion"; + propagatedBuildInputs = [ ppx_sexp_conv ]; + }; + + fieldslib = janePackage { + pname = "fieldslib"; + hash = "0dlgr7cimqmjlcymk3bdcyzqzvdy12q5lqa844nqix0k2ymhyphf"; + meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + propagatedBuildInputs = [ base ]; + }; + + ppx_fields_conv = janePackage { + pname = "ppx_fields_conv"; + hash = "0flrdyxdfcqcmdrbipxdjq0s3djdgs7z5pvjdycsvs6czbixz70v"; + meta.description = "Generation of accessor and iteration functions for ocaml records"; + propagatedBuildInputs = [ fieldslib ppxlib ]; + }; + + variantslib = janePackage { + pname = "variantslib"; + hash = "1cclb5magk63gyqmkci8abhs05g2pyhyr60a2c1bvmig0faqcnsf"; + meta.description = "Part of Jane Street's Core library"; + propagatedBuildInputs = [ base ]; + }; + + ppx_variants_conv = janePackage { + pname = "ppx_variants_conv"; + hash = "05j9bgra8xq6fcp12ch3z9vjrk139p2wrcjjcs4h52n5hhc8vzbz"; + meta.description = "Generation of accessor and iteration functions for ocaml variant types"; + propagatedBuildInputs = [ variantslib ppxlib ]; + }; + + ppx_expect = janePackage { + pname = "ppx_expect"; + hash = "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q"; + meta.description = "Cram like framework for OCaml"; + propagatedBuildInputs = [ ppx_assert ppx_custom_printf ppx_fields_conv ppx_inline_test ppx_variants_conv re ]; + }; + + ppx_enumerate = janePackage { + pname = "ppx_enumerate"; + hash = "08zfpq6bdm5lh7xj9k72iz9f2ihv3aznl3nypw3x78vz1chj8dqa"; + meta.description = "Generate a list containing all values of a finite type"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_hash = janePackage { + pname = "ppx_hash"; + hash = "1dfsfvhiyp1mnf24mr93svpdn432kla0y7x631lssacxxp2sadbg"; + meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; + propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; + }; + + ppx_js_style = janePackage { + pname = "ppx_js_style"; + hash = "1lz931m3qdv3yzqy6dnb8fq1d99r61w0n7cwf3b9fl9rhk0pggwh"; + meta.description = "Code style checker for Jane Street Packages"; + propagatedBuildInputs = [ octavius ppxlib ]; + }; + + ppx_base = janePackage { + pname = "ppx_base"; + hash = "0vd96rp2l084iamkwmvizzhl9625cagjb6gzzbir06czii5mlq2p"; + meta.description = "Base set of ppx rewriters"; + propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ]; + }; + + ppx_bench = janePackage { + pname = "ppx_bench"; + hash = "1ib81irawxzq091bmpi50z0kmpx6z2drg14k2xcgmwbb1d4063xn"; + meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; + propagatedBuildInputs = [ ppx_inline_test ]; + }; + + ppx_sexp_message = janePackage { + pname = "ppx_sexp_message"; + hash = "0yskd6v48jc6wa0nhg685kylh1n9qb6b7d1wglr9wnhl9sw990mc"; + meta.description = "A ppx rewriter for easy construction of s-expressions"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + splittable_random = janePackage { + pname = "splittable_random"; + hash = "1wpyz7807cgj8b50gdx4rw6f1zsznp4ni5lzjbnqdwa66na6ynr4"; + meta.description = "PRNG that can be split into independent streams"; + propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ]; + }; + + ppx_let = janePackage { + pname = "ppx_let"; + hash = "146dmyzkbmafa3giz69gpxccvdihg19cvk4xsg8krbbmlkvdda22"; + meta.description = "Monadic let-bindings"; + propagatedBuildInputs = [ ppxlib ]; + }; + + base_quickcheck = janePackage { + pname = "base_quickcheck"; + hash = "1la6qgq1zwmfyq1hqy6i337w435ym5yqgx2ygk86qip6nws0s6r3"; + meta.description = "Randomized testing framework, designed for compatibility with Base"; + propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let splittable_random ]; + }; + + ppx_stable = janePackage { + pname = "ppx_stable"; + hash = "15zvf66wlkvz0yd4bkvndkpq74dj20jv1qkljp9n52hh7d0f9ykh"; + meta.description = "Stable types conversions generator"; + propagatedBuildInputs = [ ppxlib ]; + }; + + bin_prot = janePackage { + pname = "bin_prot"; + hash = "0hh6s7g9s004z35hsr8z6nw5phlcvcd6g2q3bj4f0s1s0anlsswm"; + meta.description = "A binary protocol generator"; + propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ]; + }; + + ppx_bin_prot = janePackage { + pname = "ppx_bin_prot"; + version = "0.12.1"; + hash = "1j0kjgmv58dmg3x5dj5zrfbm920rwq21lvkkaqq493y76cd0x8xg"; + meta.description = "Generation of bin_prot readers and writers from types"; + propagatedBuildInputs = [ bin_prot ppx_here ]; + }; + + ppx_fail = janePackage { + pname = "ppx_fail"; + hash = "0krsv6z9gi0ifxmw5ss6gwn108qhywyhbs41an10x9d5zpgf4l1n"; + meta.description = "Add location to calls to failwiths"; + propagatedBuildInputs = [ ppx_here ]; + }; + + jst-config = janePackage { + pname = "jst-config"; + hash = "0yxcz13vda1mdh9ah7qqxwfxpcqang5sgdssd8721rszbwqqaw93"; + meta.description = "Compile-time configuration for Jane Street libraries"; + buildInputs = [ ppx_assert ]; + }; + + ppx_optcomp = janePackage { + pname = "ppx_optcomp"; + hash = "0bdbx01kz0174g1szdhv3mcfqxqqf2frxq7hk13xaf6fsz04kwmj"; + meta.description = "Optional compilation for OCaml"; + propagatedBuildInputs = [ ppxlib ]; + }; + + jane-street-headers = janePackage { + pname = "jane-street-headers"; + hash = "0qa4llf812rjqa8nb63snmy8d8ny91p3anwhb50afb7vjaby8m34"; + meta.description = "Jane Street C header files"; + }; + + time_now = janePackage { + pname = "time_now"; + hash = "169mgsb3rja4j1j9nj5xa7bbkd21p9kfpskqz0wjf9x2fpxqsniq"; + meta.description = "Reports the current time"; + buildInputs = [ jst-config ppx_optcomp ]; + propagatedBuildInputs = [ jane-street-headers base ppx_base ]; + }; + + ppx_module_timer = janePackage { + pname = "ppx_module_timer"; + hash = "0yziakm7f4c894na76k1z4bp7azy82xc33mh36fj761w1j9zy3wm"; + meta.description = "Ppx rewriter that records top-level module startup times"; + propagatedBuildInputs = [ time_now ]; + }; + + ppx_optional = janePackage { + pname = "ppx_optional"; + hash = "07i0iipbd5xw2bc604qkwlcxmhncfpm3xmrr6svyj2ij86pyssh8"; + meta.description = "Pattern matching on flat options"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_pipebang = janePackage { + pname = "ppx_pipebang"; + hash = "1p4pdpl8h2bblbhpn5nk17ri4rxpz0aih0gffg3cl1186irkj0xj"; + meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_sexp_value = janePackage { + pname = "ppx_sexp_value"; + hash = "1mg81834a6dx1x7x9zb9wc58438cabjjw08yhkx6i386hxfy891p"; + meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + typerep = janePackage { + pname = "typerep"; + hash = "1psl6gsk06a62szh60y5sc1s92xpmrl1wpw3rhha09v884b7arbc"; + meta.description = "Typerep is a library for runtime types"; + propagatedBuildInputs = [ base ]; + }; + + ppx_typerep_conv = janePackage { + pname = "ppx_typerep_conv"; + hash = "09vik6qma1id44k8nz87y48l9wbjhqhap1ar1hpfdfkjai1hrzzq"; + meta.description = "Generation of runtime types from type declarations"; + propagatedBuildInputs = [ ppxlib typerep ]; + }; + + ppx_jane = janePackage { + pname = "ppx_jane"; + hash = "1a2602isqzsh640q20qbmarx0sc316mlsqc3i25ysv2kdyhh0kyw"; + meta.description = "Standard Jane Street ppx rewriters"; + propagatedBuildInputs = [ base_quickcheck ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_sexp_value ppx_stable ppx_typerep_conv ]; + }; + + base_bigstring = janePackage { + pname = "base_bigstring"; + hash = "0rbgyg511847fbnxad40prz2dyp4da6sffzyzl88j18cxqxbh1by"; + meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; + propagatedBuildInputs = [ ppx_jane ]; + }; + + parsexp = janePackage { + pname = "parsexp"; + hash = "1974i9s2c2n03iffxrm6ncwbd2gg6j6avz5jsxfd35scc2zxcd4l"; + meta.description = "S-expression parsing library"; + propagatedBuildInputs = [ base sexplib0 ]; + }; + + sexplib = janePackage { + pname = "sexplib"; + hash = "0780klc5nnv0ij6aklzra517cfnfkjdlp8ylwjrqwr8dl9rvxza2"; + meta.description = "Library for serializing OCaml values to and from S-expressions"; + propagatedBuildInputs = [ num parsexp ]; + }; + + core_kernel = janePackage { + pname = "core_kernel"; + version = "0.12.2"; + hash = "0c85bjvadrb4pmjcg0gjk3bkkgka62r90pjm690mjvcbbv5zjxzj"; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base_bigstring sexplib ]; + }; + + spawn = janePackage { + pname = "spawn"; + version = "0.13.0"; + hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf"; + meta.description = "Spawning sub-processes"; + buildInputs = [ ppx_expect ]; + }; + + core = janePackage { + pname = "core"; + version = "0.12.3"; + hash = "1vmjqiafkg45hqfvahx6jnlaww1q4a4215k8znbgprf0qn3zymnj"; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ core_kernel spawn ]; + }; + + async_kernel = janePackage { + pname = "async_kernel"; + hash = "1d9illx7vvpblj1i2r9y0f2yff2fbhy3rp4hhvamq1n9n3lvxmh2"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ core_kernel ]; + }; + + protocol_version_header = janePackage { + pname = "protocol_version_header"; + hash = "14vqhx3r84rlfhcjq52gxdqksckiaswlck9s47g7y2z1lsc17v7r"; + meta.description = "Protocol versioning"; + propagatedBuildInputs = [ core_kernel ]; + }; + + async_rpc_kernel = janePackage { + pname = "async_rpc_kernel"; + hash = "1znhqbzx4fp58i7dbcgyv5rx7difbhb5d8cbqzv96yqvbn67lsjk"; + meta.description = "Platform-independent core of Async RPC library"; + propagatedBuildInputs = [ async_kernel protocol_version_header ]; + }; + + async_unix = janePackage { + pname = "async_unix"; + hash = "09h10rdyykbm88n6r9nb5a22mlb6vcxa04q6hvrcr0kys6qhhqmb"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel core ]; + }; + + async_extra = janePackage { + pname = "async_extra"; + hash = "10j4mwlyqvf67yrp5dwd857llqjinpnnykmlzw2gpmks9azxk6mh"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_rpc_kernel async_unix ]; + }; + + textutils = janePackage { + pname = "textutils"; + hash = "0302awqihf3abib9mvzvn4g8m364hm6jxry1r3kc01hzybhy9acq"; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core ]; + }; + + async = janePackage { + pname = "async"; + hash = "0pk7z3h2gi21nfchvmjz2wx516bynf9vgwf84zf5qhvlvqqsmyrx"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_extra textutils ]; + }; + + async_ssl = janePackage { + pname = "async_ssl"; + hash = "02ard8x5q5c42d9jdqmyzfx624yjq8cxxmvq3zb82hf6p8cc57ml"; + meta.description = "An Async-pipe-based interface with OpenSSL"; + propagatedBuildInputs = [ async ctypes openssl ]; + }; + + async_find = janePackage { + pname = "async_find"; + hash = "0qsz9f15s5rlk6za10s810v6nlkdxg2g9p1827lcpa7nhjcpi673"; + meta.description = "Directory traversal with Async"; + propagatedBuildInputs = [ async ]; + }; + + re2 = janePackage { + pname = "re2"; + hash = "1sw32lb0y501y971ij7287796lvfhs0nfgla895r74ymfks2rcjb"; + meta.description = "OCaml bindings for RE2, Google's regular expression library"; + propagatedBuildInputs = [ core_kernel ]; + }; + + shell = janePackage { + pname = "shell"; + hash = "158857rdr6qgglc5iksg0l54jgf51b5lmsw7nlazpxwdwc9fcn5n"; + meta.description = "Yet another implementation of fork&exec and related functionality"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ re2 textutils ]; + }; + + async_shell = janePackage { + pname = "async_shell"; + hash = "0cxln9hkc3cy522la9yi9p23qjwl69kqmadsq4lnjh5bxdad06sv"; + meta.description = "Shell helpers for Async"; + propagatedBuildInputs = [ async shell ]; + }; + + core_bench = janePackage { + pname = "core_bench"; + hash = "00hyzbbj19dkcw0vhfnc8w0ca3zkjriwwvl00ssa0a2g9mygijdm"; + meta.description = "Benchmarking library"; + propagatedBuildInputs = [ textutils ]; + }; + + core_extended = janePackage { + pname = "core_extended"; + hash = "1gwx66235irpf5krb1r25a3c7w52qhmass8hp7rdv89il9jn49w4"; + meta.description = "Extra components that are not as closely vetted or as stable as Core"; + propagatedBuildInputs = [ core ]; + }; + + ### Packages at version 0.11, with dependencies at version 0.12 + + configurator = janePackage { + pname = "configurator"; + version = "0.11.0"; + hash = "0h686630cscav7pil8c3w0gbh6rj4b41dvbnwmicmlkc746q5bfk"; + propagatedBuildInputs = [ stdio ]; + meta.description = "Helper library for gathering system configuration"; + }; + + ppx_core = janePackage { + pname = "ppx_core"; + version = "0.11.0"; + hash = "11hgm9mxig4cm3c827f6dns9mjv3pf8g6skf10x0gw9xnp1dmzmx"; + propagatedBuildInputs = [ ppxlib ]; + meta.description = "Deprecated (see ppxlib)"; + }; + + ppx_driver = janePackage { + pname = "ppx_driver"; + version = "0.11.0"; + hash = "00kfx6js2kxk57k4v7hiqvwk7h35whgjihnxf75m82rnaf4yzvfi"; + propagatedBuildInputs = [ ppxlib ]; + meta.description = "Deprecated (see ppxlib)"; + }; + + ppx_type_conv = janePackage { + pname = "ppx_type_conv"; + version = "0.11.0"; + hash = "04dbrglqqhkas25cpjz8xhjcbpk141c35qggzw66bn69izczfmaf"; + propagatedBuildInputs = [ ppxlib ]; + meta.description = "Deprecated (see ppxlib)"; + }; + +} diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix new file mode 100644 index 00000000000..5b7d9c3210d --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -0,0 +1,19 @@ +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.12.0" }: + +{ pname, version ? defaultVersion, hash, ...}@args: + +buildDunePackage (args // { + inherit version; + + minimumOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "janestreet"; + repo = pname; + rev = "v${version}"; + sha256 = hash; + }; + + meta.license = lib.licenses.mit; + meta.homepage = "https://github.com/janestreet/${pname}"; +}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 11279f507d8..4ece950f09e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -825,7 +825,14 @@ let janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; - janeStreet = import ../development/ocaml-modules/janestreet { + janeStreet = + if lib.versionOlder "4.07" ocaml.version + then import ../development/ocaml-modules/janestreet/0.12.nix { + janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {}; + inherit ctypes num octavius ppxlib re; + inherit (pkgs) openssl; + } + else import ../development/ocaml-modules/janestreet { inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; inherit ppx_deriving re ppxlib; From 58dc1e2a6f088d53129a66b3298992056413fec7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 10 Sep 2019 16:33:48 +0200 Subject: [PATCH 048/159] matrix-synapse: fix startup Currently, `setuptools` isn't propagated automatically to python packages[1] which causes the following error when starting `matrix-synapse`: ``` Traceback (most recent call last): File "/nix/store/xxkds7821mrahfx75az0sq3ryf69m612-matrix-synapse-1.3.1/bin/.homeserver-wrapped", line 39, in import synapse.config.logger File "/nix/store/xxkds7821mrahfx75az0sq3ryf69m612-matrix-synapse-1.3.1/lib/python3.7/site-packages/synapse/config/logger.py", line 27, in from synapse.app import _base as appbase File "/nix/store/xxkds7821mrahfx75az0sq3ryf69m612-matrix-synapse-1.3.1/lib/python3.7/site-packages/synapse/app/__init__.py", line 18, in E402 File "/nix/store/xxkds7821mrahfx75az0sq3ryf69m612-matrix-synapse-1.3.1/lib/python3.7/site-packages/synapse/python_dependencies.py", line 19, in from pkg_resources import ( No module named 'pkg_resources' ``` [1] https://github.com/NixOS/nixpkgs/pull/68314 --- pkgs/servers/matrix-synapse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 8da9cef58a7..ab9a69afdcb 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -36,6 +36,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = [ + setuptools bcrypt bleach canonicaljson From b3de7e26fd0549c536816361f53ba067ecf6a77b Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Tue, 10 Sep 2019 17:06:23 +0200 Subject: [PATCH 049/159] morph: 1.3.0 -> 1.3.1 --- pkgs/tools/package-management/morph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 0daba5fadf3..9462cbec9c4 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "morph"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "1lp5nsril9pnqllkpmvj8wd2f7p4xzwc2z3f5j6yfakd2sg41kgc"; + sha256 = "0nwl9n5b0lnil96573wa3hyr3vyvfiwvmpkla3pmwkpmriac4xrg"; }; goPackagePath = "github.com/dbcdk/morph"; From ea70d67235cefe1077b22143232e4f6b7df18341 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Fri, 21 Dec 2018 10:08:40 +0100 Subject: [PATCH 050/159] pythonPackages.clickclick: init at 1.2.2 --- .../python-modules/clickclick/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/clickclick/default.nix diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix new file mode 100644 index 00000000000..93cd5c7a1d7 --- /dev/null +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: + +buildPythonPackage rec { + pname = "clickclick"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "hjacobs"; + repo = "python-clickclick"; + rev = version; + sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0"; + }; + + checkInputs = [ pytestCheckHook pytestcov ]; + propagatedBuildInputs = [ flake8 click pyyaml six ]; + + disabledTests = lib.optionals isPy36 [ + "test_cli" + "test_choice_default" + ]; + + meta = with stdenv.lib; { + description = "Click command line utilities"; + homepage = https://github.com/hjacobs/python-clickclick/; + license = licenses.asl20; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c010555d28c..a8cc7b6a8bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -475,6 +475,8 @@ in { clifford = callPackage ../development/python-modules/clifford { }; + clickclick = callPackage ../development/python-modules/clickclick { }; + clustershell = callPackage ../development/python-modules/clustershell { }; cnvkit = callPackage ../development/python-modules/cnvkit { }; From 6270f3955e0cb994a9bcc88aa7686c7188fc47ee Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Fri, 21 Dec 2018 10:09:59 +0100 Subject: [PATCH 051/159] pythonPackages.swagger-ui-bundle: init at 0.0.5 --- .../swagger-ui-bundle/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/swagger-ui-bundle/default.nix diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix new file mode 100644 index 00000000000..9922e081934 --- /dev/null +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, jinja2, flake8 }: + +buildPythonPackage rec { + pname = "swagger-ui-bundle"; + version = "0.0.5"; + + src = fetchPypi { + pname = "swagger_ui_bundle"; + inherit version; + sha256 = "0v69v94mzzb63ciwpz3n8jwxqcyll3fsyx087s9k9q543zdqzbh1"; + }; + + # patch away unused test requirements since package contains no tests + postPatch = '' + substituteInPlace setup.py --replace "setup_requires=['pytest-runner', 'flake8']" "setup_requires=[]" + ''; + + propagatedBuildInputs = [ jinja2 ]; + + # package contains no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "bundled swagger-ui pip package"; + homepage = https://github.com/dtkav/swagger_ui_bundle; + license = licenses.asl20; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8cc7b6a8bb..dcca2baadc6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2818,6 +2818,8 @@ in { starfish = callPackage ../development/python-modules/starfish { }; + swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; + multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; random2 = callPackage ../development/python-modules/random2 { }; From a4a7243a57bdddf2e37711f3e4372a25bfada3bb Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Wed, 30 Jan 2019 13:36:19 +0100 Subject: [PATCH 052/159] pythonPackages.aiohttp-swagger: init at 1.0.5 --- .../aiohttp-swagger/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/aiohttp-swagger/default.nix diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix new file mode 100644 index 00000000000..e01e3ce30bc --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, flake8 +, jinja2 +, pytestCheckHook +, pytest-aiohttp +, pyyaml +}: + +buildPythonPackage rec { + pname = "aiohttp-swagger"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "cr0hn"; + repo = pname; + rev = "5a59e86f8c5672d2cc97dd35dc730c2f809d95ce"; # corresponds to 1.0.5 on PyPi, no tag on GitHub + sha256 = "1vpfk5b3f7s9qzr2q48g776f39xzqppjwm57scfzqqmbldkk5nv7"; + }; + + propagatedBuildInputs = [ aiohttp jinja2 pyyaml ]; + + checkInputs = [ flake8 pytestCheckHook pytest-aiohttp ]; + + meta = with lib; { + description = "Swagger API Documentation builder for aiohttp"; + homepage = https://github.com/cr0hn/aiohttp-swagger; + license = licenses.mit; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcca2baadc6..37d9e23ddd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1307,6 +1307,8 @@ in { aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; + aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aioresponses = callPackage ../development/python-modules/aioresponses { }; From 2437ecacce6a3f9e048f097417ec1737d34ce77c Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Fri, 21 Dec 2018 10:10:23 +0100 Subject: [PATCH 053/159] pythonPackages.connexion: init at 2.3.0 --- .../python-modules/connexion/default.nix | 94 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 96 insertions(+) create mode 100644 pkgs/development/python-modules/connexion/default.nix diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix new file mode 100644 index 00000000000..bc1356a7274 --- /dev/null +++ b/pkgs/development/python-modules/connexion/default.nix @@ -0,0 +1,94 @@ +{ buildPythonPackage +, fetchFromGitHub +, isPy3k +, glibcLocales +, lib +, pythonOlder + +, aiohttp +, aiohttp-swagger +, aiohttp-jinja2 +, clickclick +, decorator +, flake8 +, flask +, gevent +, inflection +, jsonschema +, mock +, openapi-spec-validator +, pathlib +, pytest +, pytest-aiohttp +, pytestcov +, pyyaml +, requests +, six +, swagger-ui-bundle +, testfixtures +, typing +, ujson +}: + +buildPythonPackage rec { + pname = "connexion"; + version = "2.3.0"; + + # we're fetching from GitHub because tests weren't distributed on PyPi + src = fetchFromGitHub { + owner = "zalando"; + repo = pname; + rev = version; + sha256 = "1xdm3misxwgrl87ms0vvn0h4rjwzlmmi7kcra2ahs40iaraf33ln"; + }; + + checkInputs = [ + decorator + mock + pytest + pytestcov + testfixtures + flask + swagger-ui-bundle + ] + ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson pytest-aiohttp ] + ++ lib.optional (pythonOlder "3.7") glibcLocales + ; + propagatedBuildInputs = [ + clickclick + jsonschema + pyyaml + requests + six + inflection + openapi-spec-validator + swagger-ui-bundle + flask + ] + ++ lib.optional (pythonOlder "3.4") pathlib + ++ lib.optional (pythonOlder "3.6") typing + ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson ] + ; + + preConfigure = lib.optional (pythonOlder "3.7") '' + export LANG=en_US.UTF-8 + ''; + + postPatch = '' + substituteInPlace setup.py --replace "'aiohttp>=2.3.10,<3.5.2'" "'aiohttp>=2.3.10'" + ''; + + checkPhase = if isPy3k then '' + pytest -k "not test_app_get_root_path and \ + not test_verify_oauth_scopes_remote and \ + not test_verify_oauth_scopes_local and \ + not test_run_with_aiohttp_not_installed"'' + else "pytest --ignore=tests/aiohttp"; + + meta = with lib; { + description = "Swagger/OpenAPI First framework on top of Flask"; + homepage = https://github.com/zalando/connexion/; + license = licenses.asl20; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37d9e23ddd4..c7183f7a793 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -481,6 +481,8 @@ in { cnvkit = callPackage ../development/python-modules/cnvkit { }; + connexion = callPackage ../development/python-modules/connexion { }; + cozy = callPackage ../development/python-modules/cozy { }; codespell = callPackage ../development/python-modules/codespell { }; From 9d5b3c30191c21b70c480fa4b321f3ab459a9b7f Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 10 Sep 2019 15:39:30 +0000 Subject: [PATCH 054/159] routinator: 0.5.0 -> 0.6.0 --- pkgs/servers/routinator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 903f38617fc..ed1362a0a52 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "075dp092pgwnky96smv5v6sx9vj7hd5bif8rb1q4x6077ci5jixw"; + sha256 = "13xfnlaqjisi9fm1p7ydhgrh86ccbfwkxbnrv8abdx80jwb0lm15"; }; - cargoSha256 = "0qxp3pjmrr53n59c2wcdnbqgk259zcj9gd11wpqf7kj3wlzrnwvy"; + cargoSha256 = "13sx7mbirhrd0is7gvnk0mir5qizbhrlvsn0v55ibf3bybjsb644"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; From 91fc12514f19b67f47d91796bd3c6b3214c09d12 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 10 Sep 2019 18:34:16 +0200 Subject: [PATCH 055/159] pythonPackages.pivy: fix build --- pkgs/development/python-modules/pivy/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 9ff1094aec1..6c8fc211ae6 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -28,6 +28,9 @@ buildPythonPackage rec { "-I${pkgs.qt5.qtbase.dev}/include/QtWidgets" ]; + dontUseQmakeConfigure = true; + dontUseCmakeConfigure = true; + doCheck = false; postPatch = '' @@ -39,6 +42,7 @@ buildPythonPackage rec { homepage = http://pivy.coin3d.org/; description = "A Python binding for Coin"; license = licenses.bsd0; + maintainers = with maintainers; [ gebner ]; }; } From 6f1ad0676fafd70df48c193e6bd1c7956ac26e09 Mon Sep 17 00:00:00 2001 From: Dima Date: Tue, 10 Sep 2019 18:21:53 +0200 Subject: [PATCH 056/159] qtwebkit: fixing build / reducing build log size GCC 8 introduced a new type of warning `-Wclass-memaccess` which is included in `-Wall`. This warnings spits out *a million* of warnings like the following: ``` [...] /build/source/Source/WTF/wtf/Vector.h:128:15: warning: 'void* memcpy(void*, const void*, size_t)' writing to an object of type 'class WTF::RefPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] memcpy(dst, src, reinterpret_cast(srcEnd) - reinterpret_cast(src)); [...] `` Logs demonstrating the issue: https://hydra.nixos.org/build/100205478/nixlog/1 While I don't think disabling warnings is the best way to deal with this, there is alrady precedent for this package and I don't feel confident enough to either patch or bump this package. Please view this as a low-friction sub-optimal suggestion in case nobody else has a better fix. --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index d65449023b3..78404ddffa8 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -51,8 +51,12 @@ qtModule { ''; NIX_CFLAGS_COMPILE = - # with gcc7 this warning blows the log over Hydra's limit - [ "-Wno-expansion-to-defined" ] + [ + # with gcc7 this warning blows the log over Hydra's limit + "-Wno-expansion-to-defined" + # with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit + "-Wno-class-memaccess" + ] # with clang this warning blows the log over Hydra's limit ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override" ++ optionals flashplayerFix From c17e66afe4231ac967d62ce898cafceef0f011d2 Mon Sep 17 00:00:00 2001 From: SRGOM Date: Tue, 10 Sep 2019 23:04:00 +0530 Subject: [PATCH 057/159] nixos.manual.installation.installing: nixos-hw Fixed repo name gh:nixos/nixos-hardware --- nixos/doc/manual/installation/installing.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index c8576972256..f1e1568c034 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -393,7 +393,7 @@ configuration.nix and will be overwritten by future invocations of nixos-generate-config; thus, you generally should not modify it.) Additionally, you may want to look at - Hardware + Hardware configuration for known-hardware at this point or after installation. From 26771ad0c52265fb13ed86743193f485920c37c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Sep 2019 19:37:39 +0200 Subject: [PATCH 058/159] python-blessed: apply upstream patches to fix the test suite Fixes https://github.com/NixOS/nixpkgs/issues/68427. --- .../python-modules/blessed/default.nix | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 784de33e7ad..164848aeac9 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -1,5 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, wcwidth, pytest, mock -, glibcLocales }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, six +, wcwidth, pytest, mock, glibcLocales +}: + +let + + fixTestSuiteFailure_1 = fetchpatch { + url = https://github.com/jquast/blessed/pull/108/commits/76a54d39b0f58bfc71af04ee143459eefb0e1e7b.patch; + sha256 = "1higmv4c03ly7ywac1d7s71f3hrl531vj16nsfl9xh6zh9c47qcg"; + }; + + fixTestSuiteFailure_2 = fetchpatch { + url = https://github.com/jquast/blessed/pull/108/commits/aa94e01aed745715e667601fb674844b257cfcc9.patch; + sha256 = "1frygr6sc1vakdfx1hf6jj0dbwibiqz8hw9maf1b605cbslc9nay"; + }; + +in buildPythonPackage rec { pname = "blessed"; @@ -10,6 +25,8 @@ buildPythonPackage rec { sha256 = "777b0b6b5ce51f3832e498c22bc6a093b6b5f99148c7cbf866d26e2dec51ef21"; }; + patches = [ fixTestSuiteFailure_1 fixTestSuiteFailure_2 ]; + checkInputs = [ pytest mock glibcLocales ]; checkPhase = '' From b4b332bcad4f9f79e7fa9fc3115afeb67ead5162 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 10 Sep 2019 19:05:18 +0000 Subject: [PATCH 059/159] ibus-engines.mozc: fix build This fixes: FAILED: obj/engine/engine.engine.o clang++ -MMD -MF obj/engine/engine.engine.o.d -DOS_LINUX -DMOZC_BUILD -DCHANNEL_DEV -DENABLE_GTK_RENDERER -DNDEBUG -DQT_NO_DEBUG -DNO_LOGGING -DIGNORE_HELP_FLAG -DIGNORE_INVALID_FLAG -I/build/source/src -Igen -Igen/proto_out -Wall -Wno-char-subscripts -Wno-sign-compare -Wno-deprecated-declarations -Wwrite-strings -Wno-unknown-warning-option -Wno-inconsistent-missing-override -fPIC -fno-exceptions -fmessage-length=0 -fno-strict-aliasing -funsigned-char -pipe -pthread -fno-omit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -Wtype-limits -O2 -Wno-deprecated -Wno-covered-switch-default -Wno-unnamed-type-template-args -Wno-c++11-narrowing -std=gnu++0x -std=gnu++0x -c ../../engine/engine.cc -o obj/engine/engine.engine.o In file included from ../../engine/engine.cc:30: In file included from /build/source/src/engine/engine.h:33: In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/memory:62: In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algobase.h:66: /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:183:2: error: cannot decrement value of type 'mozc::ZeroQueryDict::iterator' --__i; ^ ~~~ /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:206:12: note: in instantiation of function template specialization 'std::__advance' requested here std::__advance(__i, __d, std::__iterator_category(__i)); ^ /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2137:9: note: in instantiation of function template specialization 'std::advance' requested here std::advance(__middle, __half); ^ /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2190:19: note: in instantiation of function template specialization 'std::__equal_range' requested here return std::__equal_range(__first, __last, __val, ^ /build/source/src/prediction/zero_query_dict.h:213:17: note: in instantiation of function template specialization 'std::equal_range' requested here return std::equal_range(begin(), end(), iter.index()); ^ 1 error generated. --- .../inputmethods/ibus-engines/ibus-mozc/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 5699a7931db..a33eb277926 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,5 +1,5 @@ -{ clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf -, ibus, gtk2, zinnia, qt5, libxcb }: +{ clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig +, protobuf, ibus, gtk2, zinnia, qt5, libxcb }: let japanese_usage_dictionary = fetchFromGitHub { @@ -31,6 +31,14 @@ in clangStdenv.mkDerivation rec { sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; }; + patches = [ + # https://github.com/google/mozc/pull/444 - fix for gcc8 STL + (fetchpatch { + url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch"; + sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla"; + }) + ]; + postUnpack = '' rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary From 4441befd43713e789edbf721965d9a1639eb451c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 10 Sep 2019 21:16:03 +0200 Subject: [PATCH 060/159] repmgr: init at 4.4.0 (#68444) --- pkgs/servers/sql/postgresql/ext/repmgr.nix | 30 ++++++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/repmgr.nix diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix new file mode 100644 index 00000000000..366d98d1b4b --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: + +stdenv.mkDerivation rec { + pname = "repmgr"; + version = "4.4.0"; + + src = fetchFromGitHub { + owner = "2ndQuadrant"; + repo = "repmgr"; + rev = "v${version}"; + sha256 = "185789f7igvlqyqcb8kf42jjq8g0wbs2aqd9kimrq5kf4srwgpim"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/postgresql/extension} + + cp *.so $out/lib + cp *.sql $out/share/postgresql/extension + cp *.control $out/share/postgresql/extension + ''; + + buildInputs = [ postgresql openssl zlib readline ]; + + meta = with stdenv.lib; { + homepage = "https://repmgr.org/"; + description = "Replication manager for PostgreSQL cluster"; + license = licenses.postgresql; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index ebce90d3451..a6821373389 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -50,4 +50,6 @@ self: super: { pg_partman = super.callPackage ./ext/pg_partman.nix { }; pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { }; + + repmgr = super.callPackage ./ext/repmgr.nix { }; } From 4dd38c42894c61358b9b0f56fe7838b045a157eb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 10 Sep 2019 21:52:25 +0200 Subject: [PATCH 061/159] python.pkgs.blessed: disable failing test --- pkgs/development/python-modules/blessed/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 164848aeac9..12184d0c746 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { checkInputs = [ pytest mock glibcLocales ]; checkPhase = '' - LANG=en_US.utf-8 py.test blessed/tests + LANG=en_US.utf-8 py.test blessed/tests -k 'not test_nested_formattingstring_type_error' ''; propagatedBuildInputs = [ wcwidth six ]; From aa6c38d9c162ecfc9c9f330ca65eb53de6d844c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 10 Sep 2019 22:07:14 +0200 Subject: [PATCH 062/159] python.pkgs.django_extensions: 2.1.4 -> 2.1.9 --- .../django-extensions/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 822815736da..1e9a6ac764d 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -1,23 +1,31 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, six, typing +, six, typing, pygments , django, shortuuid, python-dateutil, pytest , pytest-django, pytestcov, mock, vobject -, werkzeug, glibcLocales +, werkzeug, glibcLocales, factory_boy }: buildPythonPackage rec { pname = "django-extensions"; - version = "2.1.4"; + version = "2.1.9"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1bp0ybarkrj66qx2gn9954vsjqq2ya1w4bppfhr763mkis8qnb4f"; + sha256 = "08vggm6wrn5cbf8brfprif0rjrkqz06wddsw0ir1skkk8q2sp1b2"; }; postPatch = '' substituteInPlace setup.py --replace "'tox'," "" + + # not yet pytest 5 compatible? + rm tests/management/commands/test_set_fake_emails.py + rm tests/management/commands/test_set_fake_passwords.py + rm tests/management/commands/test_validate_templates.py + + # pip should not be used during tests... + rm tests/management/commands/test_pipchecker.py ''; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") typing; @@ -25,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ django shortuuid python-dateutil pytest pytest-django pytestcov mock vobject - werkzeug glibcLocales + werkzeug glibcLocales factory_boy pygments ]; LC_ALL = "en_US.UTF-8"; From 72f76fe856077becf4135acaf6cab385067ddf2e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 10 Sep 2019 14:23:38 -0400 Subject: [PATCH 063/159] openjdk8: use lndir instead of single symlink to JRE Directly symlinking from the JDK to the JRE confused Gradle and made it try to find JDK files inside the JRE. --- pkgs/development/compilers/openjdk/8.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index e764e9c62cb..1d356945a4f 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib +{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip +, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , openjdk8-bootstrap @@ -85,7 +85,7 @@ let outputs = [ "out" "jre" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig lndir ]; buildInputs = [ cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst @@ -190,7 +190,8 @@ let # Move the JRE to a separate output mkdir -p $jre/lib/openjdk mv $out/lib/openjdk/jre $jre/lib/openjdk/jre - ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre + mkdir $out/lib/openjdk/jre + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre # Setup fallback fonts ${lib.optionalString (!headless) '' From 0f34860540c37940359e0a5a426891f7e3476417 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Mon, 9 Sep 2019 22:56:46 -0700 Subject: [PATCH 064/159] tokei: 9.1.1 -> 10.0.1 Enable all crate features, which gets us alternative output formats. Update description and add long description to match what's in the GitHub repo. Add myself as a maintainer. --- .../tools/misc/tokei/Cargo.lock.patch | 13 +++++++++++++ pkgs/development/tools/misc/tokei/default.nix | 19 ++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/tools/misc/tokei/Cargo.lock.patch diff --git a/pkgs/development/tools/misc/tokei/Cargo.lock.patch b/pkgs/development/tools/misc/tokei/Cargo.lock.patch new file mode 100644 index 00000000000..46bd80a218d --- /dev/null +++ b/pkgs/development/tools/misc/tokei/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index db09bc4..1e4892d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -961,7 +961,7 @@ dependencies = [ + + [[package]] + name = "tokei" +-version = "10.0.0" ++version = "10.0.1" + dependencies = [ + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index f77e30b45ae..104aa4691ab 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,26 +2,35 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "9.1.1"; + version = "10.0.1"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "0gz8m5j9p7hwylyl7cdxbli9rpy1p6lsrbym4zk647819pg4k1jp"; + sha256 = "0g8p4f8g9zb1fqzzb1qi28idskahi5nldsma6rydjyrgi9gynpa0"; }; - cargoSha256 = "19h0ybi9qq5shvr7zix0gb24a29lqkvyfc5xbgps8wqgfrhx4nqa"; + cargoSha256 = "0pwq1scll5ga8rw4lx97s915zvp7v171b6316cin54f2zzpbrxx5"; + + # Patch for v10.0.1 Cargo.lock issue + patches = [ ./Cargo.lock.patch ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + # enable all output formats + cargoBuildFlags = [ "--features" "all" ]; + meta = with stdenv.lib; { - description = "Program that displays statistics about your code"; + description = "A program that allows you to count your code, quickly"; + longDescription = '' + Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language. + ''; homepage = https://github.com/XAMPPRocky/tokei; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner lilyball ]; platforms = platforms.all; }; } From 3ae2b4b5bb29889e908474d0352588a0ecdc1c3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Sep 2019 22:20:35 +0200 Subject: [PATCH 065/159] Revert "python.pkgs.blessed: disable failing test" This reverts commit 4dd38c42894c61358b9b0f56fe7838b045a157eb. Disabling the test suite is unnecessary; I fixed it with 4dd38c42894c61358b9b0f56fe7838b045a157eb. --- pkgs/development/python-modules/blessed/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 12184d0c746..164848aeac9 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { checkInputs = [ pytest mock glibcLocales ]; checkPhase = '' - LANG=en_US.utf-8 py.test blessed/tests -k 'not test_nested_formattingstring_type_error' + LANG=en_US.utf-8 py.test blessed/tests ''; propagatedBuildInputs = [ wcwidth six ]; From c99529a4b6cc4c09c5e4e4b51185d0521928a117 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 10 Sep 2019 22:13:08 +0200 Subject: [PATCH 066/159] python.pkgs.wheelUnpackHook: propagate wheel This was accidentally removed when buildPython* was rewritten as hooks. --- pkgs/development/interpreters/python/hooks/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 9a7ec98ba17..3a4b4a0ccad 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -88,8 +88,9 @@ in rec { }; } ./setuptools-check-hook.sh) {}; - wheelUnpackHook = callPackage ({ }: + wheelUnpackHook = callPackage ({ wheel }: makeSetupHook { name = "wheel-unpack-hook.sh"; + deps = [ wheel ]; } ./wheel-unpack-hook.sh) {}; } From 5d9a0038043ebba0ea2649c867e8c18de3af4d1f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 10 Sep 2019 21:04:12 +0000 Subject: [PATCH 067/159] libipt: init at 2.0.1 --- pkgs/development/libraries/libipt/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/libipt/default.nix diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix new file mode 100644 index 00000000000..6bf95c360f9 --- /dev/null +++ b/pkgs/development/libraries/libipt/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libipt"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "libipt"; + rev = "v${version}"; + sha256 = "19y1lk5z1rf8xmr08m8zrpjkgr5as83b96xyaxwn67m2wz58mpmh"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Intel Processor Trace decoder library"; + homepage = https://github.com/intel/libipt; + license = licenses.bsd3; + platforms = platforms.linux; + maintainer = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98e13c2bbf7..37699f9310b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12133,6 +12133,8 @@ in libisoburn = callPackage ../development/libraries/libisoburn { }; + libipt = callPackage ../development/libraries/libipt { }; + libiptcdata = callPackage ../development/libraries/libiptcdata { }; libjpeg_original = callPackage ../development/libraries/libjpeg { }; From 93bf6e26485280e9cfe811e4e5b6f30673e31347 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 10 Sep 2019 21:08:18 +0000 Subject: [PATCH 068/159] libipt: fix maintainers --- pkgs/development/libraries/libipt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix index 6bf95c360f9..c61053ff693 100644 --- a/pkgs/development/libraries/libipt/default.nix +++ b/pkgs/development/libraries/libipt/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/intel/libipt; license = licenses.bsd3; platforms = platforms.linux; - maintainer = with maintainers; [ orivej ]; + maintainers = with maintainers; [ orivej ]; }; } From 153127f507f07956e3a65029eb5df6e844986418 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sun, 1 Sep 2019 11:46:42 +0000 Subject: [PATCH 069/159] qolibri: 2018-11-14 -> 2019-07-22 --- pkgs/applications/misc/qolibri/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index ab15855b910..4b5ac55c28e 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation { pname = "qolibri"; - version = "2018-11-14"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "ludios"; repo = "qolibri"; - rev = "133a1c33e74d931ad54407f70d84a0016d96981f"; - sha256 = "16ifix0q8ww4l3xflgxr9j81c0lzlnkjr8fj961x3nxz7288pdg2"; + rev = "b58f9838d39300cba444eba725a369181c5d746b"; + sha256 = "0kcc6dvbcmq9y7hk8mp23pydiaqz6f0clg64d1f2y04ppphmah42"; }; nativeBuildInputs = [ pkgconfig cmake ]; From 939960b0faccddc11c53b5589ddc0a929f7eef15 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 10 Sep 2019 21:26:57 +0000 Subject: [PATCH 070/159] qolibri: use qt5's mkDerivation --- pkgs/applications/misc/qolibri/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 4b5ac55c28e..b7c137258fd 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase -, qtmultimedia, qttools, qtwebengine }: +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, libeb, lzo +, qtbase, qtmultimedia, qttools, qtwebengine }: -stdenv.mkDerivation { +mkDerivation { pname = "qolibri"; version = "2019-07-22"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/ludios/qolibri; description = "EPWING reader for viewing Japanese dictionaries"; platforms = platforms.linux; From 03c01e418f915a026f387bd8c0778043e4c0ab52 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 10 Sep 2019 21:54:41 +0000 Subject: [PATCH 071/159] fcitx-engines.mozc: use newer protobuf ibus-engines.mozc builds fine with the newer protobuf, this should as well. --- 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 37699f9310b..83a24aef558 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3036,7 +3036,7 @@ in mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { }; From fdccd9cd9bf2724daf7a5637433994f2780a08af Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 10 Sep 2019 21:57:49 +0000 Subject: [PATCH 072/159] fctix-engines.mozc: fix build This fixes: FAILED: obj/engine/engine.engine.o clang++ -MMD -MF obj/engine/engine.engine.o.d -DOS_LINUX -DMOZC_BUILD -DCHANNEL_DEV -DENABLE_GTK_RENDERER -DNDEBUG -DQT_NO_DEBUG -DNO_LOGGING -DIGNORE_HELP_FLAG -DIGNORE_INVALID_FLAG -I/build/source/src -Igen -Igen/proto_out -Wall -Wno-char-subscripts -Wno-sign-compare -Wno-deprecated-declarations -Wwrite-strings -fPIC -fno-exceptions -fmessage-length=0 -fno-strict-aliasing -funsigned-char -include base/namespace.h -pipe -pthread -fno-omit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -Wtype-limits -O2 -Wno-deprecated -Wno-covered-switch-default -Wno-unnamed-type-template-args -Wno-c++11-narrowing -std=gnu++0x -std=gnu++0x -c ../../engine/engine.cc -o obj/engine/engine.engine.o In file included from ../../engine/engine.cc:30: In file included from /build/source/src/engine/engine.h:33: In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/memory:62: In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algobase.h:66: /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:183:2: error: cannot decrement value of type 'mozc::ZeroQueryDict::iterator' --__i; ^ ~~~ /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:206:12: note: in instantiation of function template specialization 'std::__advance' requested here std::__advance(__i, __d, std::__iterator_category(__i)); ^ /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2137:9: note: in instantiation of function template specialization 'std::advance' requested here std::advance(__middle, __half); ^ /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2190:19: note: in instantiation of function template specialization 'std::__equal_range' requested here return std::__equal_range(__first, __last, __val, ^ /build/source/src/prediction/zero_query_dict.h:213:17: note: in instantiation of function template specialization 'std::equal_range' requested here return std::equal_range(begin(), end(), iter.index()); ^ 1 error generated. --- pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index d74c7608bc9..9f062036438 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -39,6 +39,11 @@ in clangStdenv.mkDerivation rec { url = "https://download.fcitx-im.org/fcitx-mozc/${name}"; sha256 = "1f9m4310kz09v5qvnv75ka2vq63m7by023qrkpddgq4dv7gxx3ca"; }) + # https://github.com/google/mozc/pull/444 - fix for gcc8 STL + (fetchpatch { + url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch"; + sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla"; + }) ]; postPatch = '' From cb966b6f7b91aa2b9e851729928a4f238c9b1d77 Mon Sep 17 00:00:00 2001 From: Dima Date: Wed, 11 Sep 2019 00:22:59 +0200 Subject: [PATCH 073/159] zeroc-ice-36: fix build for gcc8 The build was broken failing on unneccessary memsets. This issue was fixed upstream in 3.7 and discussed in https://github.com/zeroc-ice/ice/issues/82 The patch pertaining to the error causing the actual failure still applies nicely onto the 3.6 version. Hydra logs of breakage: https://hydra.nixos.org/build/100440955/nixlog/1 --- pkgs/development/libraries/zeroc-ice/3.6.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix index 13797f927c1..dd983a34f88 100644 --- a/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 +{ stdenv, lib, fetchFromGitHub, fetchpatch, mcpp, bzip2, expat, openssl, db5 , darwin, libiconv, Security , cpp11 ? false }: @@ -26,6 +26,16 @@ stdenv.mkDerivation rec { --replace xcrun "" ''; + patches = [ + # Fixes compilation issues with GCC 8 using one of the patches + # provided in https://github.com/zeroc-ice/ice/issues/82 + ( fetchpatch { + url = "https://github.com/zeroc-ice/ice/commit/a6a4981616b669432ff7b588179d6e93694d9e3f.patch"; + sha256 = "17j5r7gsa3izrm7zln4mrp7l16h532gvmpas0kzglybicbiz7d56"; + stripLen = 1; + }) + ]; + preBuild = '' makeFlagsArray+=( "prefix=$out" From ff93569d412149069da4e147a2de43f2fdc6323f Mon Sep 17 00:00:00 2001 From: Justin Lovinger Date: Tue, 10 Sep 2019 19:46:39 -0400 Subject: [PATCH 074/159] vimPlugins.deoplete-dictionary: init at 2019-04-16 --- 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 618d67037ea..f3b46348e75 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -831,6 +831,17 @@ let }; }; + deoplete-dictionary = buildVimPluginFrom2Nix { + pname = "deoplete-dictionary"; + version = "2019-04-16"; + src = fetchFromGitHub { + owner = "deoplete-plugins"; + repo = "deoplete-dictionary"; + rev = "e0879df5dce25b96d6a2a6f52a1a5e41d12b5992"; + sha256 = "05p707b15fzhf0laqy3q0hi34vxpljy86cd5qvpjzx5h0ry32p09"; + }; + }; + deoplete-fish = buildVimPluginFrom2Nix { pname = "deoplete-fish"; version = "2018-09-15"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 681f91f6648..a919e17afa5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -50,6 +50,7 @@ dannyob/quickfixstatus darfink/starsearch.vim dart-lang/dart-vim-plugin davidhalter/jedi-vim +deoplete-plugins/deoplete-dictionary deoplete-plugins/deoplete-jedi derekelkins/agda-vim derekwyatt/vim-scala From 91b7dd6c91786a872b0a99c3617248c8daed9427 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 10 Sep 2019 17:01:37 -0700 Subject: [PATCH 075/159] pythonPackages.brotli: fix build Recent changes to buildPythonPackage seem to have enabled a configure script that doesn't work, so disable it. --- pkgs/development/python-modules/brotli/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 35b40a3adf1..bec205676ba 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"; }; + dontConfigure = true; + checkInputs = [ pytest ]; checkPhase = '' From ef114315caed81b7a34d193ba6dca7bc878d235b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 10 Sep 2019 20:57:12 -0400 Subject: [PATCH 076/159] love_0_8: fix broken build --- pkgs/development/interpreters/love/0.8.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 5fbb34bf213..792fe299e4d 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -5,9 +5,11 @@ }: stdenv.mkDerivation rec { - name = "love-0.8.0"; + pname = "love"; + version = "0.8.0"; + src = fetchurl { - url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; + url = "https://bitbucket.org/rude/love/downloads/${pname}-${version}-linux-src.tar.gz"; sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; }; @@ -36,13 +38,14 @@ stdenv.mkDerivation rec { } || true ''; - NIX_CFLAGS_COMPILE = '' - -I${SDL.dev}/include/SDL - -I${freetype.dev}include/freetype2 - ''; + NIX_CFLAGS_COMPILE = [ + "-I${SDL.dev}/include/SDL" + "-I${freetype.dev}include/freetype2" + "-DGL_GLEXT_PROTOTYPES" # https://community.khronos.org/t/glgenbuffers-was-not-declared-in-this-scope/59283/2 + ]; meta = { - homepage = http://love2d.org; + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = stdenv.lib.licenses.zlib; From 7e7c98a1993f20021fa7531136674a64c6cda003 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Wed, 11 Sep 2019 04:52:49 +0000 Subject: [PATCH 077/159] snscrape: fix startup This fixes: Traceback (most recent call last): File "/nix/store/607z14x0spsz1lsh0fg9cbyc9lr038mi-python3.7-snscrape-0.3.0/bin/.snscrape-wrapped", line 11, in sys.exit(main()) File "/nix/store/607z14x0spsz1lsh0fg9cbyc9lr038mi-python3.7-snscrape-0.3.0/lib/python3.7/site-packages/snscrape/cli.py", line 218, in main args = parse_args() File "/nix/store/607z14x0spsz1lsh0fg9cbyc9lr038mi-python3.7-snscrape-0.3.0/lib/python3.7/site-packages/snscrape/cli.py", line 154, in parse_args import snscrape.version File "/nix/store/607z14x0spsz1lsh0fg9cbyc9lr038mi-python3.7-snscrape-0.3.0/lib/python3.7/site-packages/snscrape/version.py", line 1, in import pkg_resources ModuleNotFoundError: No module named 'pkg_resources' Related: https://github.com/NixOS/nixpkgs/pull/68314 --- pkgs/development/python-modules/snscrape/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index a97d2e82c34..18a7c2bb209 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -3,6 +3,7 @@ , isPy3k , fetchPypi , setuptools_scm +, setuptools , requests , lxml , beautifulsoup4 @@ -26,7 +27,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ requests lxml beautifulsoup4 ]; + propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ]; meta = with lib; { homepage = https://github.com/JustAnotherArchivist/snscrape; From 28abdeb448842c2575a8a219ba371fca51323930 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 4 Sep 2019 10:40:32 +0800 Subject: [PATCH 078/159] glplugin: requirement for check_xx_health --- pkgs/servers/monitoring/plugins/labs_consol_de.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index 744e333594c..ac07d396383 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -5,18 +5,16 @@ let glplugin = fetchFromGitHub { owner = "lausser"; repo = "GLPlugin"; - rev = "e8e1a2907a54435c932b3e6c584ba1d679754849"; - sha256 = "0wb55a9pmgbilfffx0wkiikg9830qd66j635ypczqp4basslpq5b"; + rev = "ef3107f01afe55fad5452e64ac5bbea00b18a8d5"; + sha256 = "047fwrycsl2vmpi4wl46fs6f8y191d6qc9ms5rvmrj1dm2r828ws"; }; generic = { pname, version, sha256, description, buildInputs, ... }: - let - name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] pname}-${version}"; - in stdenv.mkDerivation { - name = "${pname}-${version}"; + stdenv.mkDerivation { + inherit pname version; src = fetchurl { - url = "https://labs.consol.de/assets/downloads/nagios/${name'}.tar.gz"; + url = "https://labs.consol.de/assets/downloads/nagios/${pname}-${version}.tar.bz"; inherit sha256; }; From 3ce644e68340ef161a8dee61ed9d6949870e00c7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 4 Sep 2019 10:40:47 +0800 Subject: [PATCH 079/159] check-mssql-health: 2.6.4.14 -> 2.6.4.15 --- pkgs/servers/monitoring/plugins/labs_consol_de.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index ac07d396383..de2c25cc17d 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -53,8 +53,8 @@ let in { check-mssql-health = generic { pname = "check_mssql_health"; - version = "2.6.4.14"; - sha256 = "0w6gybrs7imx169l8740s0ax3adya867fw0abrampx59mnsj5pm1"; + version = "2.6.4.15"; + sha256 = "12z0b3c2p18viy7s93r6bbl8fvgsqh80136d07118qhxshp1pwxg"; description = "Check plugin for Microsoft SQL Server."; buildInputs = [ perlPackages.DBDsybase ]; }; From b2fb72dae38297b6b67f30befabe428f285859a5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 4 Sep 2019 10:41:08 +0800 Subject: [PATCH 080/159] check-nwc-health: 7.0.1.3 -> 7.10.0.6 --- pkgs/servers/monitoring/plugins/labs_consol_de.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index de2c25cc17d..b1fe0f27ad6 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -61,8 +61,8 @@ in { check-nwc-health = generic { pname = "check_nwc_health"; - version = "7.0.1.3"; - sha256 = "0rgd6zgd7kplx3z72n8zbzwkh8vnd83361sk9ibh6ng78sds1sl5"; + version = "7.10.0.6"; + sha256 = "092rhaqnk3403z0y60x38vgh65gcia3wrd6gp8mr7wszja38kxv2"; description = "Check plugin for network equipment."; buildInputs = [ perlPackages.NetSNMP ]; }; From d8807fa1081614d519d05992d91e7d55944fac19 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 4 Sep 2019 10:42:05 +0800 Subject: [PATCH 081/159] check-ups-health: 2.8.2.2 -> 2.8.3.3 --- pkgs/servers/monitoring/plugins/labs_consol_de.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index b1fe0f27ad6..b09990e3120 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -69,8 +69,8 @@ in { check-ups-health = generic { pname = "check_ups_health"; - version = "2.8.2.2"; - sha256 = "1gc2wjsymay2vk5ywc1jj9cvrbhs0fs851x8l4nc75df2g75v521"; + version = "2.8.3.3"; + sha256 = "0qc2aglppwr9ms4p53kh9nr48625sqrbn46xs0k9rx5sv8hil9hm"; description = "Check plugin for UPSs."; buildInputs = [ perlPackages.NetSNMP ]; }; From 4a83f6ba01a05b17eb379d40ba7b481f176daa54 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Jul 2018 15:05:26 +0800 Subject: [PATCH 082/159] kwin-tiling: init at 2.2 --- .../desktops/plasma-5/kwin/scripts/tiling.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/desktops/plasma-5/kwin/scripts/tiling.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix new file mode 100644 index 00000000000..d2c68d3cb7b --- /dev/null +++ b/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix @@ -0,0 +1,44 @@ +{ lib, mkDerivation, fetchFromGitHub +, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: + +mkDerivation rec { + pname = "kwin-tiling"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "kwin-scripts"; + repo = "kwin-tiling"; + rev = "v${version}"; + sha256 = "1sx64xv7g9yh3j26zxxrbndv79xam9jq0vs00fczgfv2n0m7j7bl"; + }; + + # This is technically not needed, but we might as well clean up + postPatch = '' + rm release.sh + ''; + + buildInputs = [ + kcoreaddons kwindowsystem plasma-framework systemsettings + ]; + + dontBuild = true; + + # 1. --global still installs to $HOME/.local/share so we use --packageroot + # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually + installPhase = '' + runHook preInstall + + plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts + install -Dm644 ${src}/metadata.desktop $out/share/kservices5/kwin-script-tiling.desktop + + runHook postInstalll + ''; + + meta = with lib; { + description = "Tiling script for kwin"; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + inherit (src.meta) homepage; + inherit (kwindowsystem.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca37025f7f3..8365e9c0dde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22733,6 +22733,8 @@ in plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings user-manager xdg-desktop-portal-kde; + kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; + ### SCIENCE ### SCIENCE/CHEMISTY From 85f655789e98b34bb2a13bb7b2bf054ca3e34459 Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Tue, 10 Sep 2019 23:37:55 -0700 Subject: [PATCH 083/159] python: thespian: 3.9.10 -> 3.9.11 --- pkgs/development/python-modules/thespian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index f4c498bed95..1c59b0cae6b 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.10"; + version = "3.9.11"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bffb04b93afcbab0268332445f02757c326f95056eb7e1e2f0515c1dfb92ac7d"; + sha256 = "84887f0437ec144f7266ae22678bc5dc5d2a9e60a89f1f7c1707cbea5e03022a"; }; # Do not run the test suite: it takes a long time and uses From 04c1fcd09caa70f47c240437f2af5fd5a9028e03 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 11 Sep 2019 08:38:13 +0200 Subject: [PATCH 084/159] home-assistant: remove outdated pyyaml_3 pinning The recent bump to 0.96.2 now requires pyyaml 5.1.1. The PRs upgrading home-assistant to a newer version and the one pinning to an old PyYAML version raced each other and we ended up with both submitted. Fixes home-assistant build. --- pkgs/servers/home-assistant/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 43633b07818..30e4b99ccbc 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -65,10 +65,6 @@ let }; }) - (self: super: { - pyyaml = super.pyyaml_3; - }) - # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; From 50956385ff6fe8f71aa3f9da276b85482b60ec0b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 11 Sep 2019 09:06:35 +0200 Subject: [PATCH 085/159] deluge: add missing setuptools dependency Latest staging merge broke nixos/tests/deluge.nix showing an ImportError for "pkg_resources": https://nix-cache.s3.amazonaws.com/log/h8qzkcjldal5j1925g0r04ncl5afjjnp-vm-test-run-deluge.drv --- pkgs/applications/networking/p2p/deluge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 6e3b8a7293e..63218f1c2ff 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python + libtorrentRasterbar.dev libtorrentRasterbar.python setuptools ]; nativeBuildInputs = [ intltool ]; From 863589ad4d6a8735a364b2948f3d9b006d7ca75b Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Wed, 11 Sep 2019 01:30:31 -0600 Subject: [PATCH 086/159] qutebrowser: add setuptools as a dependency --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 05eafb48e72..1f441b4e961 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -47,7 +47,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pyyaml pyqt5 pyqtwebengine jinja2 pygments - pypeg2 cssutils pyopengl attrs + pypeg2 cssutils pyopengl attrs setuptools # scripts and userscripts libs tldextract beautifulsoup4 pyreadability pykeepass stem From 7a4644fcb8b6b6c6d248a95726581e8232f5ce78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Wed, 11 Sep 2019 09:49:17 +0200 Subject: [PATCH 087/159] django: don't wrap binary files twice --- pkgs/development/python-modules/django/1_11.nix | 5 ----- pkgs/development/python-modules/django/1_8.nix | 5 ----- pkgs/development/python-modules/django/2_1.nix | 5 ----- 3 files changed, 15 deletions(-) diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 8b60155b50a..97c477d1c03 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -21,11 +21,6 @@ buildPythonPackage rec { }) ]; - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - propagatedBuildInputs = [ pytz ]; # too complicated to setup diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix index 9baafed4b75..d575599cbe1 100644 --- a/pkgs/development/python-modules/django/1_8.nix +++ b/pkgs/development/python-modules/django/1_8.nix @@ -15,11 +15,6 @@ buildPythonPackage rec { # too complicated to setup doCheck = false; - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - meta = with stdenv.lib; { description = "A high-level Python Web framework"; homepage = https://www.djangoproject.com/; diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index e5d08381055..78d595082a4 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -24,11 +24,6 @@ buildPythonPackage rec { }) ]; - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - propagatedBuildInputs = [ pytz ]; # too complicated to setup From 8d7f62083ab1b66b944e45f44e5abcc8c03afa2a Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 11 Sep 2019 00:21:21 +0200 Subject: [PATCH 088/159] lazydocker: 0.7 -> 0.7.4 --- pkgs/tools/misc/lazydocker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index a8ca200129a..9ee494e1f86 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.7"; + version = "0.7.4"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "0vai88g31yf55988paqzs7fqlxgi0ydrsgszzjig9ai3x9c52xim"; + sha256 = "03l6gs4p9p8g0ai6wqg9024rp0pd13m0b9y3sy1ww5afwxb82br6"; }; - modSha256 = "1iin1m6s9xxdskvj6jy2jwlqrsrm432ld13cpa28hpx7pylx61ij"; + modSha256 = "1hzrin8dfsfnxpc37szc1449s235w0dr24albswz06fjnl4bbs5y"; subPackages = [ "." ]; From 216fae4043a51442fe80ad6ccdd164fec329689d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Sep 2019 17:45:39 +0200 Subject: [PATCH 089/159] LTS Haskell 14.5 --- .../configuration-hackage2nix.yaml | 95 ++++++++++--------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9cbc4c21aed..9664221b1d5 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.4 + # LTS Haskell 14.5 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -64,7 +64,7 @@ default-package-overrides: - aeson-extra ==0.4.1.2 - aeson-generic-compat ==0.0.1.3 - aeson-iproute ==0.2 - - aeson-picker ==0.1.0.4 + - aeson-picker ==0.1.0.5 - aeson-pretty ==0.8.7 - aeson-qq ==0.8.2 - aeson-utils ==0.3.0.2 @@ -121,7 +121,7 @@ default-package-overrides: - atom-basic ==0.2.5 - atomic-primops ==0.8.3 - atomic-write ==0.2.0.6 - - attoparsec ==0.13.2.2 + - attoparsec ==0.13.2.3 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 @@ -275,8 +275,8 @@ default-package-overrides: - cased ==0.1.0.0 - case-insensitive ==1.2.0.11 - cases ==0.1.3.2 - - casing ==0.1.4.0 - - cassava ==0.5.1.0 + - casing ==0.1.4.1 + - cassava ==0.5.2.0 - cassava-conduit ==0.5.1 - cassava-megaparsec ==2.0.0 - cassava-records ==0.1.0.4 @@ -304,7 +304,7 @@ default-package-overrides: - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - - checkers ==0.5.0 + - checkers ==0.5.2 - checksum ==0.0 - chimera ==0.2.0.0 - choice ==0.2.2 @@ -383,7 +383,7 @@ default-package-overrides: - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - configurator-pg ==0.1.0.3 - - connection ==0.3.0 + - connection ==0.3.1 - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.3.0 @@ -412,7 +412,7 @@ default-package-overrides: - crackNum ==2.3 - crc32c ==0.0.0 - credential-store ==0.1.2 - - criterion ==1.5.5.0 + - criterion ==1.5.6.0 - criterion-measurement ==0.1.2.0 - cron ==0.6.1 - crypto-api ==0.13.3 @@ -538,7 +538,7 @@ default-package-overrides: - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.1.1 - distribution-opensuse ==1.1.1 - - distributive ==0.6 + - distributive ==0.6.1 - dl-fedora ==0.5 - dlist ==0.8.0.7 - dlist-instances ==0.1.1.1 @@ -596,10 +596,10 @@ default-package-overrides: - elm-street ==0.0.1 - emacs-module ==0.1.1 - email-validate ==2.3.2.11 - - emd ==0.1.4.0 + - emd ==0.1.5.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - - entropy ==0.4.1.4 + - entropy ==0.4.1.5 - enummapset ==0.6.0.2 - enumset ==0.0.5 - enum-subset-generate ==0.1.0.0 @@ -648,7 +648,7 @@ default-package-overrides: - farmhash ==0.1.0.5 - fast-builder ==0.1.1.0 - fast-digits ==0.2.1.0 - - fast-logger ==2.4.16 + - fast-logger ==2.4.17 - fast-math ==1.0.2 - fb ==2.0.0 - fclabels ==2.0.3.3 @@ -708,7 +708,7 @@ default-package-overrides: - forma ==1.1.2 - format-numbers ==0.1.0.0 - formatting ==6.3.7 - - foundation ==0.0.24 + - foundation ==0.0.25 - free ==5.1.2 - freenect ==1.2.1 - freer-simple ==1.2.1.0 @@ -724,12 +724,12 @@ default-package-overrides: - function-builder ==0.3.0.1 - functor-classes-compat ==1 - functor-combinators ==0.1.1.1 - - fused-effects ==0.5.0.0 + - fused-effects ==0.5.0.1 - fuzzcheck ==0.1.1 - fuzzy-dates ==0.1.1.1 - fuzzyset ==0.1.1 - galois-field ==0.3.0 - - gauge ==0.2.4 + - gauge ==0.2.5 - gc ==0.0.3 - gd ==3000.7.3 - gdp ==0.0.0.2 @@ -764,7 +764,7 @@ default-package-overrides: - genvalidity-uuid ==0.1.0.2 - genvalidity-vector ==0.3.0.0 - geojson ==4.0.1 - - getopt-generics ==0.13.0.3 + - getopt-generics ==0.13.0.4 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-exactprint ==0.6.1 @@ -796,7 +796,7 @@ default-package-overrides: - ginger ==0.9.1.0 - gingersnap ==0.3.1.0 - gi-pango ==1.0.22 - - githash ==0.1.3.1 + - githash ==0.1.3.2 - github-release ==1.2.4 - github-types ==0.2.1 - github-webhooks ==0.10.1 @@ -845,14 +845,14 @@ default-package-overrides: - hackage-db ==2.0.1 - hackage-security ==0.5.3.0 - haddock-library ==1.7.0 - - hadolint ==1.17.1 + - hadolint ==1.17.2 - half ==0.3 - hamilton ==0.1.0.3 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.3.9.3 - - happy ==1.19.11 - - hasbolt ==0.1.3.4 + - happy ==1.19.12 + - hasbolt ==0.1.3.5 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 @@ -863,14 +863,14 @@ default-package-overrides: - haskell-gi-base ==0.23.0 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - - haskell-lsp ==0.15.0.0 - - haskell-lsp-types ==0.15.0.0 + - haskell-lsp ==0.15.0.1 + - haskell-lsp-types ==0.15.0.1 - haskell-names ==0.9.6 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.3.0 - - haskell-src-exts ==1.21.0 + - haskell-src-exts ==1.21.1 - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.2 + - haskell-src-meta ==0.8.3 - haskey-btree ==0.3.0.1 - haskintex ==0.8.0.0 - haskoin-core ==0.9.0 @@ -893,7 +893,7 @@ default-package-overrides: - hedgehog ==1.0 - hedgehog-corpus ==0.1.0 - hedgehog-fn ==1.0 - - hedis ==0.12.7 + - hedis ==0.12.8 - hedn ==0.2.0.1 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1094,7 +1094,7 @@ default-package-overrides: - inline-r ==0.10.2 - inliterate ==0.1.0 - insert-ordered-containers ==0.2.2 - - inspection-testing ==0.4.2.1 + - inspection-testing ==0.4.2.2 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 - integer-logarithms ==1.0.3 @@ -1164,7 +1164,7 @@ default-package-overrides: - kdt ==0.2.4 - keycode ==0.2.2 - keys ==3.12.2 - - kind-apply ==0.3.1.0 + - kind-apply ==0.3.2.0 - kind-generics ==0.3.0.0 - kind-generics-th ==0.1.1.0 - kleene ==0.1 @@ -1276,11 +1276,11 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.4.0.0 + - massiv ==0.4.1.0 - massiv-io ==0.1.6.0 - massiv-test ==0.1.0 - mathexpr ==0.3.0.0 - - math-functions ==0.3.1.0 + - math-functions ==0.3.2.0 - matplotlib ==0.7.4 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1329,6 +1329,7 @@ default-package-overrides: - missing-foreign ==0.1.1 - MissingH ==1.4.1.0 - mixed-types-num ==0.4.0.1 + - mixpanel-client ==0.2.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.1 @@ -1376,7 +1377,7 @@ default-package-overrides: - mono-traversable-keys ==0.1.0 - more-containers ==0.2.1.2 - mountpoints ==1.0.2 - - mpi-hs ==0.5.1.2 + - mpi-hs ==0.5.3.0 - msgpack ==1.0.1.0 - msgpack-aeson ==0.1.0.0 - mtl ==2.2.2 @@ -1469,7 +1470,7 @@ default-package-overrides: - oblivious-transfer ==0.1.0 - odbc ==0.2.2 - oeis ==0.3.9 - - oeis2 ==1.0.2 + - oeis2 ==1.0.3 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 @@ -1590,7 +1591,7 @@ default-package-overrides: - pipes-network-tls ==0.3 - pipes-parse ==3.0.8 - pipes-random ==1.0.0.5 - - pipes-safe ==2.3.1 + - pipes-safe ==2.3.2 - pipes-wai ==3.2.0 - pkcs10 ==0.2.0.0 - placeholders ==0.1 @@ -1605,7 +1606,7 @@ default-package-overrides: - polynomials-bernstein ==1.1.2 - polyparse ==1.12.1 - polysemy ==1.0.0.0 - - polysemy-plugin ==0.2.2.0 + - polysemy-plugin ==0.2.3.0 - polysemy-zoo ==0.5.0.1 - pooled-io ==0.0.2.2 - port-utils ==0.2.1.0 @@ -1676,9 +1677,10 @@ default-package-overrides: - psqueues ==0.2.7.2 - pureMD5 ==2.1.3 - purescript-bridge ==0.13.0.0 - - pure-zlib ==0.6.4 + - pure-zlib ==0.6.6 - pushbullet-types ==0.4.1.0 - pusher-http-haskell ==1.5.1.9 + - PyF ==0.8.1.0 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qnap-decrypt ==0.3.5 @@ -1720,7 +1722,7 @@ default-package-overrides: - ratel ==1.0.8 - ratel-wai ==1.1.0 - rattle ==0.1 - - rattletrap ==9.0.1 + - rattletrap ==9.0.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 @@ -1731,7 +1733,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - reanimate ==0.1.5.0 - - reanimate-svg ==0.9.0.1 + - reanimate-svg ==0.9.1.0 - rebase ==1.3.1.1 - record-dot-preprocessor ==0.2 - record-hasfield ==1.0 @@ -1827,7 +1829,7 @@ default-package-overrides: - scanner ==0.3 - scheduler ==1.4.2 - scientific ==0.3.6.2 - - scotty ==0.11.4 + - scotty ==0.11.5 - scrypt ==0.5.0 - sdl2 ==2.5.0.0 - sdl2-gfx ==0.2 @@ -1873,13 +1875,12 @@ default-package-overrides: - servant-http-streams ==0.16 - servant-js ==0.9.4 - servant-JuicyPixels ==0.3.0.4 - - servant-kotlin ==0.1.1.8 + - servant-kotlin ==0.1.1.9 - servant-lucid ==0.9 - servant-machines ==0.15 - servant-mock ==0.8.5 - servant-multipart ==0.11.4 - servant-pipes ==0.15 - - servant-rawm ==0.3.1.0 - servant-ruby ==0.9.0.0 - servant-server ==0.16.2 - servant-static-th ==0.2.2.0 @@ -1901,7 +1902,7 @@ default-package-overrides: - sexpr-parser ==0.1.1.2 - SHA ==1.6.4.4 - shake-language-c ==0.12.0 - - shakespeare ==2.0.20 + - shakespeare ==2.0.21 - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 @@ -2117,7 +2118,7 @@ default-package-overrides: - text-region ==0.3.1.0 - text-short ==0.1.3 - text-show ==3.8.2 - - text-show-instances ==3.8.1 + - text-show-instances ==3.8.2 - text-zipper ==0.10.1 - tfp ==1.0.1.1 - tf-random ==0.5 @@ -2130,7 +2131,7 @@ default-package-overrides: - th-lift ==0.8.0.1 - th-lift-instances ==0.1.14 - th-nowq ==0.1.0.3 - - th-orphans ==0.13.7 + - th-orphans ==0.13.8 - th-printf ==0.6.0 - thread-hierarchy ==0.3.0.1 - thread-local-storage ==0.2 @@ -2306,9 +2307,9 @@ default-package-overrides: - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - verbosity ==0.3.0.0 - - versions ==3.5.1 + - versions ==3.5.1.1 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.28 + - viewprof ==0.0.0.29 - vinyl ==0.11.0 - vivid ==0.4.2.3 - vivid-osc ==0.5.0.0 @@ -2363,7 +2364,7 @@ default-package-overrides: - windns ==0.1.0.1 - winery ==1.1.2 - wire-streams ==0.1.1.0 - - witherable ==0.3.2 + - witherable ==0.3.3 - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.3 @@ -2406,7 +2407,7 @@ default-package-overrides: - xml-conduit-parse ==0.3.1.2 - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.2 - - xml-hamlet ==0.5.0 + - xml-hamlet ==0.5.0.1 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - xml-isogen ==0.3.0 @@ -2430,7 +2431,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1.1 - yesod-auth-oauth2 ==0.6.1.2 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.16 + - yesod-core ==1.6.16.1 - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 From fac2b0126f91cddc4c7cc7d0f0f50b23ba1ae364 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Sep 2019 17:44:49 +0200 Subject: [PATCH 090/159] hackage2nix: disable broken packages that cause evaluation errors on Hydra --- 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 9664221b1d5..c0692d975df 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5827,6 +5827,7 @@ broken-packages: - hiccup - hichi - hid-examples + - hie-core - hieraclus - hierarchical-clustering - hierarchical-clustering-diagrams @@ -8774,6 +8775,7 @@ broken-packages: - seqloc - seqloc-datafiles - sequence-formats + - sequenceTools - sequent-core - sequor - serialize-instances From f2bf25e53ae6f5ab16b0e2d82a31eddd4818e312 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Sep 2019 02:30:30 +0200 Subject: [PATCH 091/159] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.4-7-ga804c35 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/0bd93345ee12ca9a29d3c780b261d6684c5b0901. --- .../haskell-modules/hackage-packages.nix | 1882 ++++++++--------- 1 file changed, 851 insertions(+), 1031 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bb00b7c1fba..3b91b02ffad 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2875,6 +2875,8 @@ self: { pname = "Chart"; version = "1.9.1"; sha256 = "1pn735k9ifxlb9mdh8xy7wi22cxni8xyr28n8zx9w0j6vprcg89l"; + revision = "1"; + editedCabalFile = "1v7qip375kzn9k9k0c79jj55xigi05s5dl318smqazjdlyj55q55"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -2891,6 +2893,8 @@ self: { pname = "Chart-cairo"; version = "1.9.1"; sha256 = "0hknj4rsjf2m8p5pyq5zff8ai7v80yvmxb5c6n0bkgxs4317nbl9"; + revision = "1"; + editedCabalFile = "1c1m0vk4rnx3myv43kag17nf1j1w9kjc226jpf1f86gkcd35lq45"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -2909,6 +2913,8 @@ self: { pname = "Chart-diagrams"; version = "1.9.2"; sha256 = "0am51ck84apijwwvpkwhnpmsr4047svzdi7g5nbf5yprsb8vzd4n"; + revision = "1"; + editedCabalFile = "0h57ds1j43h4knnwb75dgsgw90mz7lf8k590dkfdrgsszpb9as50"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -11419,8 +11425,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "3"; - editedCabalFile = "1dkmlrn4vncx6n1646q1z9gfvpbgk0blax1i8n16dl6y5j042xf1"; + revision = "4"; + editedCabalFile = "0r6v9iv7fkslznn6fw2132j1gpxk9dyccdg8r5qj2vvsrbp0dpjf"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -15504,6 +15510,8 @@ self: { pname = "Prelude"; version = "0.1.0.1"; sha256 = "14p4jkhzdh618r7gvj6dd4w1zj4b032g4nx43bihnnaf2dqyppy6"; + revision = "1"; + editedCabalFile = "14z8gv75jnvykk5naqcqqrdcx7160kzd3gnfdvx6rw4nqzsi6hw1"; libraryHaskellDepends = [ base ]; description = "A Prelude module replacement"; license = stdenv.lib.licenses.bsd3; @@ -16313,6 +16321,8 @@ self: { pname = "RabbitMQ"; version = "0.1.0.0"; sha256 = "14rxwsxxqhj91alcnvvp6949ig0ifnls9x2mgnd1jmknqz7pwvrs"; + revision = "1"; + editedCabalFile = "17ypl1n9f1nyc1axdmmfgb188d0ml7i3sqgmbka1k4l0p2ik9qpp"; libraryHaskellDepends = [ array base binary bytestring clock containers HsOpenSSL io-streams monad-control network network-uri openssl-streams split stm text @@ -16718,6 +16728,8 @@ self: { pname = "S3"; version = "0.1.0.0"; sha256 = "0z59h36qnb1vvshqik3f1ai3a3frnmzzxdcmkbbh3x6flnih7r0a"; + revision = "1"; + editedCabalFile = "115432ww5hm6nv82rib363sx38f7vm0kl0xd5qc2dpfn1jljr0g7"; libraryHaskellDepends = [ base base-encoding bytestring cryptohash-md5 cryptohash-sha1 cryptohash-sha256 deepseq hashable http-io-streams io-streams @@ -22991,6 +23003,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson_1_4_5_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, base-orphans + , base16-bytestring, bytestring, containers, deepseq, Diff + , directory, dlist, filepath, generic-deriving, ghc-prim, hashable + , hashable-time, integer-logarithms, primitive, QuickCheck + , quickcheck-instances, scientific, tagged, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text + , th-abstraction, time, time-compat, unordered-containers + , uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.4.5.0"; + sha256 = "1jhabz1lbbv6yqxqiybifi86cb5xlsadrn368n5dd0wzzc7ja4iz"; + libraryHaskellDepends = [ + attoparsec base base-compat bytestring containers deepseq dlist + ghc-prim hashable primitive scientific tagged template-haskell text + th-abstraction time time-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers Diff directory dlist filepath + generic-deriving ghc-prim hashable hashable-time integer-logarithms + QuickCheck quickcheck-instances scientific tagged tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-compat unordered-containers uuid-types vector + ]; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -23088,8 +23133,8 @@ self: { pname = "aeson-compat"; version = "0.3.9"; sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0"; - revision = "1"; - editedCabalFile = "0m154kalrzqbnp41306i6md3ncvw02myb730bz8bv6ah59jq1qy6"; + revision = "2"; + editedCabalFile = "1y07skwfg22z37fvjmqcpcl1yz1kx2zn4zz3n1bfghk7740c4gyd"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -23185,8 +23230,8 @@ self: { pname = "aeson-extra"; version = "0.4.1.2"; sha256 = "1i6bm91d332117fx829imaxz6y59a0vqa7fjsr293sp8xyhlkkax"; - revision = "1"; - editedCabalFile = "0zvqb36r3dsh1dsrw3cbzqiia416qjby0gpskx5xz6nnab0l8mg4"; + revision = "2"; + editedCabalFile = "0z43xclsy4x3my7p7d1irb40nqvj9z49m7vhkwf3k2n5gxjs6379"; libraryHaskellDepends = [ aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions @@ -23426,8 +23471,8 @@ self: { ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }: mkDerivation { pname = "aeson-picker"; - version = "0.1.0.4"; - sha256 = "0ln4qwx7app1sc01irmy5lx7bqsq6wsgdig6zihpnp9rbj8263mj"; + version = "0.1.0.5"; + sha256 = "05lw6fd8xk9s37iz8pvznqh4vj856ayc75ha9iw1w82zxzv87pwp"; libraryHaskellDepends = [ aeson base lens lens-aeson text ]; testHaskellDepends = [ base hspec text ]; description = "Tiny library to get fields from JSON format"; @@ -32750,36 +32795,6 @@ self: { }) {}; "attoparsec" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, criterion, deepseq, directory, filepath, ghc-prim - , http-types, parsec, QuickCheck, quickcheck-unicode, scientific - , tasty, tasty-quickcheck, text, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "attoparsec"; - version = "0.13.2.2"; - sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx"; - revision = "4"; - editedCabalFile = "1vz6jz7cwd80sryabpa99hccamgccjf2l7907wjblbs7dy66a8cb"; - libraryHaskellDepends = [ - array base bytestring containers deepseq scientific text - transformers - ]; - testHaskellDepends = [ - array base bytestring deepseq QuickCheck quickcheck-unicode - scientific tasty tasty-quickcheck text transformers vector - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers criterion deepseq - directory filepath ghc-prim http-types parsec scientific text - transformers unordered-containers vector - ]; - description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "attoparsec_0_13_2_3" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, criterion, deepseq, directory, filepath, ghc-prim , http-types, parsec, QuickCheck, quickcheck-unicode, scientific @@ -32805,7 +32820,6 @@ self: { ]; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-arff" = callPackage @@ -32933,6 +32947,8 @@ self: { pname = "attoparsec-iso8601"; version = "1.0.1.0"; sha256 = "0hj10w15qp2z5bz2v4xahhmbgzclpyfi5l2sv97wqycysg9gp7s9"; + revision = "1"; + editedCabalFile = "1rjhscmczgs1bwyqx7lvkm8py3ylxjd2797mrzgnq60fvm292750"; libraryHaskellDepends = [ attoparsec base base-compat text time ]; description = "Parsing of ISO 8601 dates, originally from aeson"; license = stdenv.lib.licenses.bsd3; @@ -35804,8 +35820,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "2"; - editedCabalFile = "03qm7fgwwxcc5w65rwwvbl358dfnxmsg4rq1ixi5xpmmhmak67h8"; + revision = "3"; + editedCabalFile = "0gqyij803y0shpc5knljbffss6c1pbdanfzwlws01vkl4y10sfja"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -41837,8 +41853,8 @@ self: { pname = "boring"; version = "0.1.2"; sha256 = "0978dq53rpb7clz1ydjm6x38nrx0vkp3safqcbjp2kq6jlaz29jr"; - revision = "1"; - editedCabalFile = "010k2mw8q3iby78ak56xamp6pzdwijn92r64r76hblw32k1i80c0"; + revision = "2"; + editedCabalFile = "1qdgv5zanglhhx3hs4a7qlvfivsv82hnppj8lpyamfl4xw4x8vp1"; libraryHaskellDepends = [ adjunctions base base-compat constraints dec fin generics-sop singleton-bool streams tagged transformers transformers-compat vec @@ -47395,18 +47411,6 @@ self: { }) {}; "casing" = callPackage - ({ mkDerivation, base, split, tasty, tasty-hunit }: - mkDerivation { - pname = "casing"; - version = "0.1.4.0"; - sha256 = "1mznhlbg8qd2yrjg23rq7s77bijn92nrfx7bvx9sw8sqxwqkd2lf"; - libraryHaskellDepends = [ base split ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - description = "Convert between various source code casing conventions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "casing_0_1_4_1" = callPackage ({ mkDerivation, base, split, tasty, tasty-hunit }: mkDerivation { pname = "casing"; @@ -47418,7 +47422,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Convert between various source code casing conventions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casr-logbook" = callPackage @@ -47628,33 +47631,6 @@ self: { }) {}; "cassava" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, containers - , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances - , scientific, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, text-short - , unordered-containers, vector - }: - mkDerivation { - pname = "cassava"; - version = "0.5.1.0"; - sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n"; - revision = "3"; - editedCabalFile = "0q9hwcn5jr5vs52n246qw8iw9jmc1d3dla071hhc0hdpck4igq6m"; - configureFlags = [ "-f-bytestring--lt-0_10_4" ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers deepseq hashable Only - scientific text text-short unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hashable HUnit QuickCheck - quickcheck-instances scientific test-framework test-framework-hunit - test-framework-quickcheck2 text unordered-containers vector - ]; - description = "A CSV parsing and encoding library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cassava_0_5_2_0" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances , scientific, test-framework, test-framework-hunit @@ -47677,7 +47653,6 @@ self: { ]; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-conduit" = callPackage @@ -49449,19 +49424,6 @@ self: { }) {}; "checkers" = callPackage - ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: - mkDerivation { - pname = "checkers"; - version = "0.5.0"; - sha256 = "1kbn71blf67jfncv4gia8ygyzh4bngq36vapq2vqrqrzhap3mqi7"; - libraryHaskellDepends = [ - array base QuickCheck random semigroupoids - ]; - description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "checkers_0_5_2" = callPackage ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; @@ -49472,7 +49434,6 @@ self: { ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "checkmate" = callPackage @@ -53219,6 +53180,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "coercible-utils_0_1_0" = callPackage + ({ mkDerivation, base, gauge }: + mkDerivation { + pname = "coercible-utils"; + version = "0.1.0"; + sha256 = "0nadwhr96nvwz1vxxr7814h22v02zrycqa9xijgvrakf0j174yls"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "Utility functions for Coercible types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "coercion-extras" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -56496,6 +56471,8 @@ self: { pname = "config-schema"; version = "1.1.0.0"; sha256 = "1nr1jyrgvvm1zlzvlfpz35zb5iydn1mpk89kljp0h1cvkl35mjkl"; + revision = "1"; + editedCabalFile = "0h828xld2dfjj43jwq1f98wd21nzvhn74wsx586a0kcd6q41pcs5"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -56528,8 +56505,8 @@ self: { pname = "config-value"; version = "0.6.3.1"; sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z"; - revision = "1"; - editedCabalFile = "16h47yc8z3fkxs6gdyzfkahi9ibm7narkc72xcx67bmk309xb46c"; + revision = "2"; + editedCabalFile = "037hi6hrd3kk2zjsi8ly9jj4gc8xq5vnn8p09dm0hshd31fyhl52"; libraryHaskellDepends = [ array base pretty text ]; libraryToolDepends = [ alex happy ]; description = "Simple, layout-based value language similar to YAML or JSON"; @@ -56811,25 +56788,6 @@ self: { }) {}; "connection" = callPackage - ({ mkDerivation, base, basement, bytestring, containers - , data-default-class, network, socks, tls, x509, x509-store - , x509-system, x509-validation - }: - mkDerivation { - pname = "connection"; - version = "0.3.0"; - sha256 = "1f53bysp8zr8c8dhivrq2k9qmlwnk84d4c1s31sd62ws9yddcw34"; - revision = "3"; - editedCabalFile = "17l56sgrirlcfgi18svbkv9233yxd81ymyr3k8k712rzf5gi6rpi"; - libraryHaskellDepends = [ - base basement bytestring containers data-default-class network - socks tls x509 x509-store x509-system x509-validation - ]; - description = "Simple and easy network connections API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "connection_0_3_1" = callPackage ({ mkDerivation, base, basement, bytestring, containers , data-default-class, network, socks, tls, x509, x509-store , x509-system, x509-validation @@ -56846,7 +56804,6 @@ self: { ]; description = "Simple and easy network connections API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "connection-pool" = callPackage @@ -59771,43 +59728,6 @@ self: { }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, bytestring, cassava, code-page - , containers, criterion-measurement, deepseq, directory, exceptions - , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl - , mwc-random, optparse-applicative, parsec, QuickCheck, statistics - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.5.5.0"; - sha256 = "1a5i9ghy4hr3355ml4b0rc3b94fa2ijfflh398ncn9sw1ivmx8pa"; - revision = "2"; - editedCabalFile = "03b2a257spl0ckjw8mx5sf173nfmfqacllvyfskqpn0q1j4aj0qk"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary bytestring - cassava code-page containers criterion-measurement deepseq - directory exceptions filepath Glob js-flot js-jquery microstache - mtl mwc-random optparse-applicative parsec statistics text time - transformers transformers-compat vector vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_5_6_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, binary-orphans, bytestring , cassava, code-page, containers, criterion-measurement, deepseq @@ -59842,7 +59762,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-compare" = callPackage @@ -65046,7 +64965,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "dbus_1_2_8" = callPackage + "dbus_1_2_9" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -65055,8 +64974,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.8"; - sha256 = "1jk43ngc9z6wq5idhnzmvjy3psdvivzcpva62x83c6fnb10vg25f"; + version = "1.2.9"; + sha256 = "1q9qhl6hjbr9yxmr62md4ycadv04nqdkvsa8l5c0p724rz3faqw3"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -66873,6 +66792,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deque_0_4_3" = callPackage + ({ mkDerivation, base, hashable, mtl, QuickCheck + , quickcheck-instances, rerebase, strict-list, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "deque"; + version = "0.4.3"; + sha256 = "19apwmcykprz3a91wszmc1w3qcz4x3rq79gmik514fszi9yhwsmp"; + libraryHaskellDepends = [ base hashable mtl strict-list ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Double-ended queues"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dequeue" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck , safe @@ -67155,8 +67093,8 @@ self: { ({ mkDerivation, base, bytestring, cereal, QuickCheck }: mkDerivation { pname = "describe"; - version = "0.1.1.0"; - sha256 = "0xnamrmdvcb1spgrm1fh9d98gvdz6kljqsm04chlhz4zxk7ixv0x"; + version = "0.1.2.1"; + sha256 = "1k2ik717ab2wnffmkfqm7akp3irp3jsfsb8l49gqgn30wgrx3nk7"; libraryHaskellDepends = [ base bytestring cereal ]; testHaskellDepends = [ base bytestring cereal QuickCheck ]; description = "Combinators for describing binary data structures"; @@ -67567,8 +67505,8 @@ self: { pname = "dhall"; version = "1.25.0"; sha256 = "0d8qx4fawvxykig628jfgqpa660mzzicysa7g3mda6zni9j4yq0h"; - revision = "1"; - editedCabalFile = "0pbhm350am7qxb92lr7fz5s9znsm9ngfra7w8b93zbabh5hf6mm3"; + revision = "2"; + editedCabalFile = "00jb0n07sa6v5ynzlyz39gc6zc0s0jlfck5w64pya1nmdbiijizz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70832,22 +70770,6 @@ self: { }) {}; "distributive" = callPackage - ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest - , generic-deriving, hspec, hspec-discover, tagged, transformers - }: - mkDerivation { - pname = "distributive"; - version = "0.6"; - sha256 = "1m61ppv851nifid98fimvpml0z0j3ximj7nxd72hshrslr0i7bx4"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base base-orphans tagged transformers ]; - testHaskellDepends = [ base doctest generic-deriving hspec ]; - testToolDepends = [ hspec-discover ]; - description = "Distributive functors -- Dual to Traversable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "distributive_0_6_1" = callPackage ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest , generic-deriving, hspec, hspec-discover, tagged, transformers }: @@ -70861,7 +70783,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Distributive functors -- Dual to Traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ditto" = callPackage @@ -71102,8 +71023,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "5"; - editedCabalFile = "01x05d62y8f3kippxawra3fdr7jdms3zcgd7c4n8wf39np9wy556"; + revision = "7"; + editedCabalFile = "0cp5v4zfkx7mz8cc8hgjx0v0a37y4fnld3r59i6mb00ilzrh1nhk"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -76214,25 +76135,6 @@ self: { }) {}; "emd" = callPackage - ({ mkDerivation, base, binary, containers, data-default-class - , finite-typelits, ghc-typelits-knownnat, ghc-typelits-natnormalise - , HUnit, transformers, typelits-witnesses, vector, vector-sized - }: - mkDerivation { - pname = "emd"; - version = "0.1.4.0"; - sha256 = "0mrkyy6fn4jsy6h4acqjkkq1bvp7c8yjpw5zyk9ycnk2izb7a9zw"; - libraryHaskellDepends = [ - base binary containers data-default-class finite-typelits - ghc-typelits-knownnat ghc-typelits-natnormalise transformers - typelits-witnesses vector vector-sized - ]; - testHaskellDepends = [ base containers HUnit ]; - description = "Empirical Mode Decomposition and Hilbert-Huang Transform"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "emd_0_1_5_1" = callPackage ({ mkDerivation, base, binary, containers, criterion , data-default-class, deepseq, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit @@ -76255,7 +76157,6 @@ self: { ]; description = "Empirical Mode Decomposition and Hilbert-Huang Transform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "emgm" = callPackage @@ -76564,22 +76465,6 @@ self: { }) {}; "entropy" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , process, unix - }: - mkDerivation { - pname = "entropy"; - version = "0.4.1.4"; - sha256 = "1fgf47l9klwn1xssbcbq6by651vikd8hlfxhiwd5bqzxr1jnlgrf"; - revision = "1"; - editedCabalFile = "0h9wvpq4hw5ipn15ni0qdsrssjil0m59wm4l5hl607l3w2lif864"; - setupHaskellDepends = [ base Cabal directory filepath process ]; - libraryHaskellDepends = [ base bytestring unix ]; - description = "A platform independent entropy source"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "entropy_0_4_1_5" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , process, unix }: @@ -76591,7 +76476,6 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; description = "A platform independent entropy source"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "entwine" = callPackage @@ -77238,21 +77122,19 @@ self: { "equivalence" = callPackage ({ mkDerivation, base, containers, fail, mtl, QuickCheck - , STMonadTrans, template-haskell, test-framework - , test-framework-quickcheck2, transformers, transformers-compat + , STMonadTrans, template-haskell, transformers, transformers-compat }: mkDerivation { pname = "equivalence"; - version = "0.3.4"; - sha256 = "02s24624xnwq790mip5pj6828an36j8jbdj5kvx9bv5a7ap3vzn1"; + version = "0.3.5"; + sha256 = "167njzd1cf32aa7br90rjafrxy6hw3fxkk8awifqbxjrcwm5maqp"; libraryHaskellDepends = [ base containers fail mtl STMonadTrans transformers transformers-compat ]; testHaskellDepends = [ base containers fail mtl QuickCheck STMonadTrans template-haskell - test-framework test-framework-quickcheck2 transformers - transformers-compat + transformers transformers-compat ]; description = "Maintaining an equivalence relation implemented as union-find using STT"; license = stdenv.lib.licenses.bsd3; @@ -78708,18 +78590,18 @@ self: { ({ mkDerivation, aeson, array, attoparsec, base, blaze-html , bytestring, containers, file-embed, filepath, ghc-events , hashtables, hvega, mtl, optparse-applicative, semigroups, text - , time + , time, vector }: mkDerivation { pname = "eventlog2html"; - version = "0.2.0"; - sha256 = "106jydjz8lg80xmj2ahllvqz57dfkf8qybm6nqib3hrw956igy4c"; + version = "0.3.0"; + sha256 = "1vg94x1f5wh20dvnqil3b3ipd8kajyplv7sv9f7zmrl73m5cgg9s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array attoparsec base blaze-html bytestring containers file-embed filepath ghc-events hashtables hvega mtl - optparse-applicative semigroups text time + optparse-applicative semigroups text time vector ]; executableHaskellDepends = [ aeson base filepath text ]; description = "Visualise an eventlog"; @@ -80843,25 +80725,6 @@ self: { }) {}; "fast-logger" = callPackage - ({ mkDerivation, array, auto-update, base, bytestring, directory - , easy-file, filepath, hspec, hspec-discover, text, unix-compat - , unix-time - }: - mkDerivation { - pname = "fast-logger"; - version = "2.4.16"; - sha256 = "090wv1as2ylr7f90dzhp5g9xzagg03zv0swy1zz08kar9qx3fwhc"; - libraryHaskellDepends = [ - array auto-update base bytestring directory easy-file filepath text - unix-compat unix-time - ]; - testHaskellDepends = [ base bytestring directory hspec ]; - testToolDepends = [ hspec-discover ]; - description = "A fast logging system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fast-logger_2_4_17" = callPackage ({ mkDerivation, array, auto-update, base, bytestring, directory , easy-file, filepath, hspec, hspec-discover, text, unix-compat , unix-time @@ -80880,7 +80743,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-math" = callPackage @@ -82539,8 +82401,8 @@ self: { pname = "file-embed-lzma"; version = "0"; sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; - revision = "3"; - editedCabalFile = "138ihhsxzqm0m7890l98j5679dk7r5aa522hcfpggqx12f7g1pnc"; + revision = "4"; + editedCabalFile = "19z355zylpsqsfihldbda6lwrdj5divfhhnc24ryzvi384dw74lx"; libraryHaskellDepends = [ base base-compat bytestring directory filepath lzma template-haskell text th-lift-instances transformers @@ -83129,6 +82991,26 @@ self: { broken = true; }) {}; + "finitary" = callPackage + ({ mkDerivation, base, bitvec, coercible-utils, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog + , monad-loops, mtl, template-haskell, vector-sized + }: + mkDerivation { + pname = "finitary"; + version = "0.1.0.0"; + sha256 = "0s42ja10hnv1czy75wh8bkz3mj9qwy0bsa90bnwnazf9q6xn9lyv"; + libraryHaskellDepends = [ + base bitvec coercible-utils finite-typelits ghc-typelits-knownnat + ghc-typelits-natnormalise mtl template-haskell vector-sized + ]; + testHaskellDepends = [ + base bitvec finite-typelits hedgehog monad-loops vector-sized + ]; + description = "A better, more type-safe Enum"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "finite-field" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, primes , QuickCheck, singletons, tasty, tasty-hunit, tasty-quickcheck @@ -85024,8 +84906,8 @@ self: { pname = "foldl"; version = "1.4.5"; sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b"; - revision = "3"; - editedCabalFile = "0ci6wq1lqmz0i5rlb4my21ic6ziq87kg35mkp3f9la9y32zbq600"; + revision = "4"; + editedCabalFile = "12qrmlazijyz5dn73p50klyny7x4vx8yw2isfmjikmrr12nhc5g0"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids semigroups text @@ -85933,21 +85815,6 @@ self: { }) {}; "foundation" = callPackage - ({ mkDerivation, base, basement, gauge, ghc-prim }: - mkDerivation { - pname = "foundation"; - version = "0.0.24"; - sha256 = "1yygliyg5dh06n7iyyrvy4iz2328hgb5igjp832wxrfa529pwqdk"; - revision = "1"; - editedCabalFile = "1p8q1324dfg3w81dv29hc3wgvg43qsfps1c156xmml566jwvf1l2"; - libraryHaskellDepends = [ base basement ghc-prim ]; - testHaskellDepends = [ base basement ]; - benchmarkHaskellDepends = [ base basement gauge ]; - description = "Alternative prelude with batteries and no dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "foundation_0_0_25" = callPackage ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; @@ -85960,7 +85827,6 @@ self: { benchmarkHaskellDepends = [ base basement gauge ]; description = "Alternative prelude with batteries and no dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -88237,26 +88103,6 @@ self: { }) {}; "fused-effects" = callPackage - ({ mkDerivation, base, criterion, deepseq, doctest, hspec - , inspection-testing, MonadRandom, QuickCheck, random, transformers - , unliftio-core - }: - mkDerivation { - pname = "fused-effects"; - version = "0.5.0.0"; - sha256 = "1s1jvxdmwnjyxcx7zhspv1qkfy1dvcj0c92az2njqjibldbvqsa4"; - libraryHaskellDepends = [ - base deepseq MonadRandom random transformers unliftio-core - ]; - testHaskellDepends = [ - base doctest hspec inspection-testing QuickCheck transformers - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "A fast, flexible, fused effect system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fused-effects_0_5_0_1" = callPackage ({ mkDerivation, base, deepseq, doctest, gauge, hspec , inspection-testing, MonadRandom, QuickCheck, random, transformers , unliftio-core @@ -88274,7 +88120,6 @@ self: { benchmarkHaskellDepends = [ base gauge ]; description = "A fast, flexible, fused effect system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fused-effects-exceptions" = callPackage @@ -88975,13 +88820,13 @@ self: { }: mkDerivation { pname = "gauge"; - version = "0.2.4"; - sha256 = "1p8accsrv0njiqgybz2plwiglg90nazibggc270j7gmqxqna0zr9"; + version = "0.2.5"; + sha256 = "19zmnyyx7x6gf95dphqi1118avcp7w01scq12qmvzhchg1kzs86m"; libraryHaskellDepends = [ base basement deepseq directory process vector ]; testHaskellDepends = [ - base bytestring deepseq directory foundation + base basement bytestring deepseq directory foundation ]; benchmarkHaskellDepends = [ base ]; description = "small framework for performance measurement and analysis"; @@ -89946,6 +89791,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-random_1_3_0_0" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "generic-random"; + version = "1.3.0.0"; + sha256 = "1z62lvb0zjdy5ass2cvj442w0cbk0zi4cx6n4qm2ai4sbmgh5hzk"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + description = "Generic random generators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-records" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -91016,25 +90874,6 @@ self: { }) {}; "getopt-generics" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, filepath - , generics-sop, hspec, QuickCheck, safe, silently, tagged - }: - mkDerivation { - pname = "getopt-generics"; - version = "0.13.0.3"; - sha256 = "1202xsfvygd06h1d70v73ldwj32qv6sqadk5zl2979dgjx4841db"; - libraryHaskellDepends = [ - base base-compat base-orphans generics-sop tagged - ]; - testHaskellDepends = [ - base base-compat base-orphans filepath generics-sop hspec - QuickCheck safe silently tagged - ]; - description = "Create command line interfaces with ease"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "getopt-generics_0_13_0_4" = callPackage ({ mkDerivation, base, base-compat, base-orphans, filepath , generics-sop, hspec, QuickCheck, safe, silently, tagged }: @@ -91051,7 +90890,6 @@ self: { ]; description = "Create command line interfaces with ease"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "getopt-simple" = callPackage @@ -91955,6 +91793,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-prof_1_4_1_6" = callPackage + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , process, scientific, tasty, tasty-hunit, temporary, text, time + }: + mkDerivation { + pname = "ghc-prof"; + version = "1.4.1.6"; + sha256 = "1rypk644xpgvawymn8ib992n4qkc2fc796arf574hhikdffr5a14"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers scientific text time + ]; + testHaskellDepends = [ + attoparsec base containers directory filepath process tasty + tasty-hunit temporary text + ]; + description = "Library for parsing GHC time and allocation profiling reports"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-prof-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }: mkDerivation { @@ -94639,25 +94499,6 @@ self: { }) {}; "githash" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec - , process, template-haskell, temporary, unliftio - }: - mkDerivation { - pname = "githash"; - version = "0.1.3.1"; - sha256 = "0vpwzbhnr0xwc7vkg3l5qy4awgsr1fkxj58lz6m56jayaad6hn7a"; - libraryHaskellDepends = [ - base bytestring directory filepath process template-haskell - ]; - testHaskellDepends = [ - base bytestring directory filepath hspec process template-haskell - temporary unliftio - ]; - description = "Compile git revision info into Haskell projects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "githash_0_1_3_2" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec , process, template-haskell, temporary, unliftio }: @@ -94674,7 +94515,6 @@ self: { ]; description = "Compile git revision info into Haskell projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github" = callPackage @@ -100311,8 +100151,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.5.0.0"; - sha256 = "01466hfw3mkiz557r5ch3rn01w6wys38n580hdqmkhsqysgsqzqa"; + version = "0.5.0.1"; + sha256 = "03q5ip176ji0yn02mhgj5rh9vpsi8kwsq3zh3cr7ry6jajgfdq3l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base megaparsec text transformers unordered-containers @@ -103966,36 +103806,6 @@ self: { }) {}; "hadolint" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, gitrev, hspec, HsYAML, HUnit, language-docker - , megaparsec, mtl, optparse-applicative, ShellCheck, split, text - , void - }: - mkDerivation { - pname = "hadolint"; - version = "1.17.1"; - sha256 = "199kpx6wfshky0slgjv0h6ckibrsywy3r3j393r9ln4wcjzs31yi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath HsYAML - language-docker megaparsec mtl ShellCheck split text void - ]; - executableHaskellDepends = [ - base containers gitrev language-docker megaparsec - optparse-applicative text - ]; - testHaskellDepends = [ - aeson base bytestring hspec HsYAML HUnit language-docker megaparsec - ShellCheck split text - ]; - description = "Dockerfile Linter JavaScript API"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hadolint_1_17_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, gitrev, hspec, HsYAML, HUnit, language-docker , megaparsec, mtl, optparse-applicative, ShellCheck, split, text @@ -106326,23 +106136,6 @@ self: { }) {}; "happy" = callPackage - ({ mkDerivation, array, base, Cabal, containers, directory - , filepath, mtl, process - }: - mkDerivation { - pname = "happy"; - version = "1.19.11"; - sha256 = "0xszsjl4943kp7cjzlpf7g5lx6yzqxj8xmgzy4s0m66vs2gd354h"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ array base containers mtl ]; - testHaskellDepends = [ base process ]; - description = "Happy is a parser generator for Haskell"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "happy_1_19_12" = callPackage ({ mkDerivation, array, base, containers, mtl, process }: mkDerivation { pname = "happy"; @@ -106355,7 +106148,6 @@ self: { testHaskellDepends = [ base process ]; description = "Happy is a parser generator for Haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happy-hour" = callPackage @@ -106741,26 +106533,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.4"; - sha256 = "06z47djpg6sar1cadzrn86cmn092jhf7cwnjv402sx00i4r2v5dh"; - 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_5" = callPackage ({ mkDerivation, base, binary, bytestring, connection, containers , data-binary-ieee754, data-default, hex, hspec, mtl, network , QuickCheck, text @@ -106778,7 +106550,6 @@ self: { ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasbolt-extras" = callPackage @@ -108310,8 +108081,10 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.15.0.0"; - sha256 = "111c0hdlpnj979p3avlhswziyc6vh6apij5b2nhhi8wlfhqwrpcg"; + version = "0.15.0.1"; + sha256 = "0l11psgknqppisn102h2392y5jiyz026rv8v2dpq4bk50zibb7qb"; + revision = "1"; + editedCabalFile = "0rk44rxal0sm1ci7c0phwl7fpcby1vys3n3vpp4bgla2hrc6pwba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108330,6 +108103,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp_0_16_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.16.0.0"; + sha256 = "1s04lfnb3c0g9bkwp4j7j59yw8ypps63dq27ayybynrfci4bpj95"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , haskell-lsp, lens, process, text, unix @@ -108359,8 +108162,10 @@ self: { }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.15.0.0"; - sha256 = "1ky20lpgbdiijh3z6ilf7jn7cyxl2kshqnm2p4dgabfh97gbf8bb"; + version = "0.15.0.1"; + sha256 = "07195h5qdmnkrr7v1yx8l398vi4zbcawbh7k6slyj3xs3zq9s6kx"; + revision = "1"; + editedCabalFile = "06naxwj75jxy9xvvlc229m1jn9bandqsxaavzm7zj9vw8sxygr0h"; libraryHaskellDepends = [ aeson base bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -108369,6 +108174,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp-types_0_16_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, deepseq + , filepath, hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.16.0.0"; + sha256 = "14wlv54ydbddpw6cwgykcas3rb55w7m78q0s1wdbi594wg1bscqg"; + libraryHaskellDepends = [ + aeson base bytestring data-default deepseq filepath hashable lens + network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-menu" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -108841,28 +108664,6 @@ self: { }) {}; "haskell-src-exts" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath - , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty - , tasty-golden, tasty-smallcheck - }: - mkDerivation { - pname = "haskell-src-exts"; - version = "1.21.0"; - sha256 = "1wwzd6m5mm76fq7ql7k49b7ghg8ibq5qhqr3d8xs5psfha3w3nlm"; - revision = "1"; - editedCabalFile = "1mmjxh0vhf9pbx9jr1208bbrqj3k5qy6il4ypjmczh9zx2m65lyf"; - libraryHaskellDepends = [ array base ghc-prim pretty ]; - libraryToolDepends = [ happy ]; - testHaskellDepends = [ - base containers directory filepath mtl pretty-show smallcheck tasty - tasty-golden tasty-smallcheck - ]; - doCheck = false; - description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-exts_1_21_1" = callPackage ({ mkDerivation, array, base, containers, directory, filepath , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty , tasty-golden, tasty-smallcheck @@ -108880,7 +108681,6 @@ self: { doCheck = false; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts-observe" = callPackage @@ -108974,26 +108774,6 @@ self: { }) {}; "haskell-src-meta" = callPackage - ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty - , syb, template-haskell, test-framework, test-framework-hunit - , th-orphans - }: - mkDerivation { - pname = "haskell-src-meta"; - version = "0.8.2"; - sha256 = "0vqnq668c88x4amvbs34rxiwdpnxqxr40jy998fc4vd9z6gd4w3r"; - libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans - ]; - testHaskellDepends = [ - base containers haskell-src-exts HUnit pretty syb template-haskell - test-framework test-framework-hunit - ]; - description = "Parse source to template-haskell abstract syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-meta_0_8_3" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty , syb, tasty, tasty-hunit, template-haskell, th-orphans }: @@ -109010,7 +108790,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -113695,30 +113474,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.7"; - sha256 = "1q59g99mv4axwm77f8m5fmlnq04qy04c6s1aj57jvfq7p31iq05a"; - 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_8" = 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 @@ -113740,7 +113495,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 @@ -116103,6 +115857,8 @@ self: { ]; description = "The core of an IDE"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hieraclus" = callPackage @@ -124204,6 +123960,8 @@ self: { pname = "hslogger"; version = "1.3.0.0"; sha256 = "1gnnqyd5hr59agqjcbim3kys5zarwsj7b1kfdbhy5qmjjwnpyzs8"; + revision = "1"; + editedCabalFile = "0hvlixqc7vr66qq96flnh3l2p7a6pfmzxf9sn8f243yvsq867yah"; libraryHaskellDepends = [ base bytestring containers network network-bsd old-locale time unix ]; @@ -125376,15 +125134,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-wai_0_10_0" = callPackage + "hspec-wai_0_10_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, case-insensitive , hspec, hspec-core, hspec-expectations, http-types, QuickCheck , text, transformers, wai, wai-extra }: mkDerivation { pname = "hspec-wai"; - version = "0.10.0"; - sha256 = "1gw0z9wwvwzhxxkqp4snx77k956zq0wwdq3mjiznng0pa2xc0fhf"; + version = "0.10.1"; + sha256 = "05jv0cz8r8bf63ma5byjb2gkj9vwgnls4n9mks99qc525n055ckz"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive hspec-core hspec-expectations http-types QuickCheck text transformers wai @@ -125417,14 +125175,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-wai-json_0_10_0" = callPackage + "hspec-wai-json_0_10_1" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, hspec, hspec-wai, template-haskell }: mkDerivation { pname = "hspec-wai-json"; - version = "0.10.0"; - sha256 = "1hbmwsl1vsjsqgbdgrs6210cj1zh437smdsnmsmvnyfc0xpr9pcy"; + version = "0.10.1"; + sha256 = "04mpqij446ki5l6xwi3bjmlf3ggjia2nzv8j62mdy6ick96dqwk6"; libraryHaskellDepends = [ aeson aeson-qq base bytestring case-insensitive hspec-wai template-haskell @@ -127032,8 +126790,8 @@ self: { pname = "http-api-data"; version = "0.4.1"; sha256 = "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv"; - revision = "1"; - editedCabalFile = "0jhaj9qxw8a4gnvqi6i7lmn6vk8cmvc1mm1cp1saqz4whn13fgbs"; + revision = "2"; + editedCabalFile = "14gvcqdxxs9s74r73i5f5g2819dfyp05m0p4s729ynwm7c20fzfs"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring @@ -127686,8 +127444,8 @@ self: { pname = "http-media"; version = "0.8.0.0"; sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir"; - revision = "1"; - editedCabalFile = "01kb67m99jl3b8k06bp84sxiwxygz48ci5wkll42688qgsjb3rab"; + revision = "2"; + editedCabalFile = "0qvkhbxdz33lis5vca3jm1b44fkm7aalf4iz1gblr8xivnpmq885"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -129136,8 +128894,8 @@ self: { pname = "hw-dsv"; version = "0.3.5"; sha256 = "15dy96ah7frs79g102vvsrihzlk2qc5c773y7bqdcm66mjhin3x2"; - revision = "1"; - editedCabalFile = "1i67wr9yhks9bzpcr0dqhqgvv2i94izv4p6wrcb2vbjl7wzzgs1v"; + revision = "2"; + editedCabalFile = "0flmxhc1w38si89wdr9i6x70mc3sl07hrw2b77xabva8dgx7ph3q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133822,6 +133580,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_7_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, raw-strings-qq + , scientific, tagged, tasty, tasty-hunit, template-haskell, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.7.1.1"; + sha256 = "15qzlbgnplxc53l5134igf6yplxg4fgblx0s8bl8hfjh0gbnn8x8"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ + base containers doctest raw-strings-qq tasty tasty-hunit + template-haskell time + ]; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -134237,22 +134023,6 @@ self: { }) {}; "inspection-testing" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; - version = "0.4.2.1"; - sha256 = "1aw6yj7aikzlisjk5w0gfvby1hqdxm7vj5a65haxs41nxfyifrfd"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_2_2" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: @@ -134266,7 +134036,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -134648,6 +134417,25 @@ self: { broken = true; }) {intel_aes = null;}; + "interactive-plot" = callPackage + ({ mkDerivation, base, containers, data-default-class, microlens + , microlens-th, MonadRandom, mtl, transformers, vty + }: + mkDerivation { + pname = "interactive-plot"; + version = "0.1.0.0"; + sha256 = "0iq7y0vxn7cqrlqd0iqfk6cy80sc4ijln9mwm5r24v94s8cq1rkn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default-class microlens microlens-th + MonadRandom mtl transformers vty + ]; + executableHaskellDepends = [ base ]; + description = "Interactive quick time series plotting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "interchangeable" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -141490,17 +141278,6 @@ self: { }) {}; "kind-apply" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "kind-apply"; - version = "0.3.1.0"; - sha256 = "1rvm0zw5gxn4jfy7ndplrzi2k77mciiisylf9adppy1an8q4zw3d"; - libraryHaskellDepends = [ base ]; - description = "Utilities to work with lists of types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "kind-apply_0_3_2_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "kind-apply"; @@ -141509,7 +141286,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Utilities to work with lists of types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kind-generics" = callPackage @@ -141611,8 +141387,8 @@ self: { pname = "kleene"; version = "0.1"; sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; - revision = "1"; - editedCabalFile = "0cirgqhbwz849szrzmyvs47pzja9wnmz5rc2ccylgdikkv4mg3bb"; + revision = "2"; + editedCabalFile = "1kiaxmxhlv1pczw8bg5vhcbyxgl87qs5bgcdaipd29ml0z7sncsd"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers lattices MemoTrie QuickCheck range-set-list regex-applicative semigroupoids @@ -142087,8 +141863,8 @@ self: { ({ mkDerivation, base, boxes, containers, lens }: mkDerivation { pname = "kuifje"; - version = "0.1.1.0"; - sha256 = "1hfrj1msp1g0f4bqih4m1k28vssfds2nmr47adxikgwsfi3qgsq2"; + version = "0.1.2.0"; + sha256 = "0f7ldw506g4r6f7s803iwq49syfl1zmxdyyr62arbzg6h5qg81j7"; libraryHaskellDepends = [ base boxes containers lens ]; description = "A Quantitative Information Flow aware programming language"; license = stdenv.lib.licenses.bsd3; @@ -142846,8 +142622,8 @@ self: { }: mkDerivation { pname = "lambdabot-xmpp"; - version = "0.1.0.3"; - sha256 = "0nixz3g2invajirvhkqwl3cnqiimjfjfsm82b59yyzpdk26c5fmi"; + version = "0.1.0.4"; + sha256 = "0jgj1vyfw26asnj6zxlfzax6hs3syn29c0abp5b7blzl27iy5pdm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144785,6 +144561,8 @@ self: { pname = "lattices"; version = "2.0.1"; sha256 = "0c7n7fh89llg8ijylwc14ikqrg077vcqcgph5h9nar6i5dyaprfy"; + revision = "1"; + editedCabalFile = "1zfxq1gpfv0vb7arw0hw2nf61hyjwl8c72jng4v61xywvqh9i36q"; libraryHaskellDepends = [ base base-compat containers deepseq hashable integer-logarithms QuickCheck semigroupoids tagged transformers universe-base @@ -148587,21 +148365,22 @@ self: { ({ mkDerivation, base, bytestring, bytestring-conversion , case-insensitive, either, exceptions, hspec, http-media , http-types, mtl, QuickCheck, quickcheck-classes - , quickcheck-instances, text, transformers, uri-encode, wai, warp + , quickcheck-instances, text, time, transformers, uri-encode, wai + , warp }: mkDerivation { pname = "linnet"; - version = "0.3.0.0"; - sha256 = "1ir150a6a94yz23d9w31m2clvi2i7fag6kih4fwrffmnl3p3z6i4"; + version = "0.4.0.0"; + sha256 = "0k64pnzs13rc68h4qpn0kd3qm3hsyzgd8d8r96vak8a0pbjkzgrq"; libraryHaskellDepends = [ base bytestring bytestring-conversion case-insensitive either - exceptions http-media http-types mtl text transformers uri-encode - wai warp + exceptions http-media http-types mtl text time transformers + uri-encode wai warp ]; testHaskellDepends = [ base bytestring bytestring-conversion case-insensitive either exceptions hspec http-media http-types mtl QuickCheck - quickcheck-classes quickcheck-instances text transformers + quickcheck-classes quickcheck-instances text time transformers uri-encode wai warp ]; description = "Lightweight library for building HTTP API"; @@ -148614,8 +148393,8 @@ self: { }: mkDerivation { pname = "linnet-aeson"; - version = "0.3.0.0"; - sha256 = "1nfn9xh3dbgbgfgdvrq057lgcrk9ipqq13c6i1y20zg49gpawd9w"; + version = "0.4.0.0"; + sha256 = "1rpc3i32vywvhfndg9p3rd5qy1m1fv0zqxbhdyp36c8awm1q5086"; libraryHaskellDepends = [ aeson base bytestring linnet ]; testHaskellDepends = [ aeson base bytestring hspec linnet QuickCheck quickcheck-classes @@ -148632,8 +148411,8 @@ self: { }: mkDerivation { pname = "linnet-conduit"; - version = "0.3.0.0"; - sha256 = "0p5fgzvs4cqhc9f37v1fqqq0qbzrywl224wd73mzl1k4v7vj249i"; + version = "0.4.0.0"; + sha256 = "1a29sahlmhl8k6xqyfm9ixf64k2x0k631z5jixvg1x1s6xpq3hyi"; libraryHaskellDepends = [ base bytestring conduit http-types linnet wai warp ]; @@ -149205,8 +148984,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "list-singleton"; - version = "1.0.0.0"; - sha256 = "0xc6vkbvsd7sbccb6pwgmvx34qpnh4ppv6fd5qp0xcylmw4gbvyv"; + version = "1.0.0.2"; + sha256 = "0nl363fr751s2jlvkql96pdj5kvkzz3h0kbd02y5vqc3r13pchaq"; libraryHaskellDepends = [ base ]; description = "Easily and clearly create lists with only one element in them"; license = stdenv.lib.licenses.isc; @@ -151832,6 +151611,33 @@ self: { broken = true; }) {}; + "lsp-test_0_7_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, rope-utf16-splay, text, transformers + , unix, unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.7.0.0"; + sha256 = "1lm299gbahrnwfrprhhpzxrmjljj33pps1gzz2wzmp3m9gzl1dx5"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-parse containers data-default Diff directory filepath + haskell-lsp lens mtl parser-combinators process rope-utf16-splay + text transformers unix unordered-containers + ]; + testHaskellDepends = [ + aeson base data-default haskell-lsp hspec lens text + unordered-containers + ]; + description = "Functional test framework for LSP servers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -152053,6 +151859,8 @@ self: { pname = "lucid"; version = "2.9.11"; sha256 = "13xz21hf9ywbyqwm33z8pfrjq03rzffhqswi30xsi13rrawj99cc"; + revision = "1"; + editedCabalFile = "10k3x9cn4a23kqk909xiv8phkfgagf7p16qlfpr9swn1dn4xasgf"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -154637,31 +154445,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.0.0"; - sha256 = "077w18fxgq50h1ylbalf6lbam2rcqp4a3b6qr21ac63514dyvyfz"; - 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_1_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -154704,6 +154487,24 @@ self: { broken = true; }) {}; + "massiv-io_0_1_7_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , directory, filepath, JuicyPixels, massiv, netpbm, process, vector + }: + mkDerivation { + pname = "massiv-io"; + version = "0.1.7.0"; + sha256 = "0w3yffkrsjkgfqdfmhq42am2hpmkblnfg0prifr2ja5pfwr02l5c"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq directory filepath + JuicyPixels massiv netpbm process vector + ]; + description = "Import/export of Image files into massiv Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "massiv-scheduler" = callPackage ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell @@ -154858,8 +154659,8 @@ self: { }: mkDerivation { pname = "math-functions"; - version = "0.3.1.0"; - sha256 = "0mb61yn7faxhpj5d6w5dzgawz2hbjbdqbxz3dkw4855r1bnfnh1k"; + version = "0.3.2.0"; + sha256 = "1798n8x3w3x4s058dph18g11k2hm7vcxkbr2rb2snlksjr59c2wa"; libraryHaskellDepends = [ base data-default-class deepseq primitive vector vector-th-unbox ]; @@ -154872,15 +154673,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "math-functions_0_3_2_0" = callPackage + "math-functions_0_3_2_1" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit , primitive, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, vector, vector-th-unbox }: mkDerivation { pname = "math-functions"; - version = "0.3.2.0"; - sha256 = "1798n8x3w3x4s058dph18g11k2hm7vcxkbr2rb2snlksjr59c2wa"; + version = "0.3.2.1"; + sha256 = "1d1zgc9y3pgahpkn2vgzc2vh412z54i03gw98s95jpqclvl7fyck"; libraryHaskellDepends = [ base data-default-class deepseq primitive vector vector-th-unbox ]; @@ -157573,8 +157374,8 @@ self: { pname = "microstache"; version = "1.0.1.1"; sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax"; - revision = "4"; - editedCabalFile = "0rkc0zmwi2vx47l4ssjkxlyd54fxz0w3xrgdhn7baf66gr90nrc7"; + revision = "5"; + editedCabalFile = "1dr1yqn42j6im1x333rpsqj57nhmagmhwkdfwx832cdsw9ry2gjz"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -157934,8 +157735,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.3.0"; - sha256 = "0n46w570i9nrh0c71gl58phbsb8g05b9gcxvkcdx94yms41wsjh1"; + version = "0.5.4.0"; + sha256 = "1ldjm2m1rbm74j7kygli6g6rcl5hqk0agh5xpah1i02n2f01i078"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base monad-control mtl murmur-hash network random resource-pool @@ -162148,30 +161949,6 @@ self: { }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage - ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion - , monad-loops, openmpi, store - }: - mkDerivation { - pname = "mpi-hs"; - version = "0.5.1.2"; - sha256 = "0v31d8i8z6ixg0vl2fk8wscnsl76y096a16650mfpbifwh9ax71m"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring cereal monad-loops store - ]; - librarySystemDepends = [ openmpi ]; - libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base binary ]; - testHaskellDepends = [ base monad-loops ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "MPI bindings for Haskell"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {inherit (pkgs) openmpi;}; - - "mpi-hs_0_5_3_0" = callPackage ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion , monad-loops, openmpi, store }: @@ -168131,6 +167908,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "newtype-generics_0_5_4" = callPackage + ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups + , transformers + }: + mkDerivation { + pname = "newtype-generics"; + version = "0.5.4"; + sha256 = "0cprfg4n0z62cnix1qrbc79bfdd4s50b05fj9m9hk6vm1pc3szq0"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base gauge semigroups ]; + description = "A typeclass and set of functions for working with newtypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "newtype-th" = callPackage ({ mkDerivation, base, haskell-src-meta, newtype, syb , template-haskell @@ -171158,27 +170952,6 @@ self: { }) {}; "oeis2" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, http-conduit, lens - , lens-aeson, QuickCheck, text, vector - }: - mkDerivation { - pname = "oeis2"; - version = "1.0.2"; - sha256 = "1pmyx9w3jg3wsfhqp4hby6px05g09a91s6fiazyvm9yxmhaaxhxd"; - libraryHaskellDepends = [ - aeson base containers http-conduit lens lens-aeson text vector - ]; - testHaskellDepends = [ - aeson base containers hspec http-conduit lens lens-aeson QuickCheck - text vector - ]; - description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "oeis2_1_0_3" = callPackage ({ mkDerivation, aeson, base, containers, hspec, http-conduit, lens , lens-aeson, QuickCheck, text, vector }: @@ -171756,6 +171529,8 @@ self: { pname = "opaleye"; version = "0.6.7004.0"; sha256 = "1p897zswmxil3yrxgdnjszbafi01gib8rl0y9lay4vqj1mrwa14m"; + revision = "1"; + editedCabalFile = "0wxcygykflm06v7m0p3pi7i490c1mjbid8whc9dsc181hfzhr6wl"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -171772,6 +171547,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_6_7004_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-locale-compat, transformers, uuid + , void + }: + mkDerivation { + pname = "opaleye"; + version = "0.6.7004.1"; + sha256 = "09jgdqkw8hp82b3x0fg9906gyxwl9gz3hifv2dvrj915fvgiybg1"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time time-locale-compat + transformers uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant dotenv hspec hspec-discover + multiset postgresql-simple product-profunctors profunctors + QuickCheck semigroups text time transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -173435,6 +173239,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "orderly-workers" = callPackage + ({ mkDerivation, base, stm }: + mkDerivation { + pname = "orderly-workers"; + version = "0.1.0.2"; + sha256 = "0w032z05yxl7zqdganxvd8rklzli5k8bya2648hk8scl51q98390"; + libraryHaskellDepends = [ base stm ]; + description = "Fork concurrent worker threads and produce ordered results"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "orders" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -173909,6 +173724,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "overloaded" = callPackage + ({ mkDerivation, base, bytestring, containers, fin, generic-lens + , ghc, HUnit, lens, sop-core, split, syb, symbols, tasty + , tasty-hunit, text, vec + }: + mkDerivation { + pname = "overloaded"; + version = "0.1"; + sha256 = "0sb910gk8z3a97vqk9naa079sm84p24jh2jgm39lxagwhmz72w6a"; + libraryHaskellDepends = [ + base bytestring containers fin ghc sop-core split syb symbols text + vec + ]; + testHaskellDepends = [ + base bytestring containers fin generic-lens HUnit lens sop-core + symbols tasty tasty-hunit text vec + ]; + description = "Overloaded pragmas as a plugin"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "overloaded-records" = callPackage ({ mkDerivation, base, data-default-class, HUnit, template-haskell , test-framework, test-framework-hunit @@ -178643,8 +178479,8 @@ self: { pname = "persistent"; version = "2.7.3.1"; sha256 = "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p"; - revision = "1"; - editedCabalFile = "17kdzvhakjqkif1xxrbgh1lwjd0sfd0ikl1jxrjn4il16jy7gazz"; + revision = "2"; + editedCabalFile = "0yccajc9j8vih4slpm28dfz2ib1phalbvg7qci78d6vsz1jjilhp"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger @@ -178678,6 +178514,8 @@ self: { pname = "persistent"; version = "2.9.2"; sha256 = "1wsa3kn427v88a6r0vwr6mz23snik2krbsgc8zqp18xajqn5szj9"; + revision = "1"; + editedCabalFile = "1v6ll8aggz6gvz53mzfrnb4jsc25dspk39x3vcxpzqkdp8rgz1am"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers fast-logger http-api-data @@ -178708,6 +178546,8 @@ self: { pname = "persistent"; version = "2.10.1"; sha256 = "1wwka7pxyym12hcvf45qr15n3ig9zyz5y2wl30vgcvwnhawmrsbg"; + revision = "1"; + editedCabalFile = "0b2ahki4wqb071rb329mz92gv8xnk0n8m1c39apcdq0pfqfx0a2z"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data monad-logger mtl @@ -181766,24 +181606,6 @@ self: { }) {}; "pipes-safe" = callPackage - ({ mkDerivation, base, containers, exceptions, monad-control, mtl - , pipes, primitive, transformers, transformers-base - }: - mkDerivation { - pname = "pipes-safe"; - version = "2.3.1"; - sha256 = "0dfdd3fccfd7wfn5228hbfj3h10xq01sddpy1v2ds63wlg84kwly"; - revision = "1"; - editedCabalFile = "0qyx585dvyvnpkb6hmdml4ndl8sk0d1z747d40gfr0m7c320wjzm"; - libraryHaskellDepends = [ - base containers exceptions monad-control mtl pipes primitive - transformers transformers-base - ]; - description = "Safety for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-safe_2_3_2" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control, mtl , pipes, primitive, transformers, transformers-base }: @@ -181797,7 +181619,6 @@ self: { ]; description = "Safety for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-shell" = callPackage @@ -183621,29 +183442,6 @@ self: { }) {}; "polysemy-plugin" = callPackage - ({ mkDerivation, base, containers, doctest, ghc - , ghc-tcplugins-extra, hspec, hspec-discover, inspection-testing - , polysemy, should-not-typecheck, syb, transformers - }: - mkDerivation { - pname = "polysemy-plugin"; - version = "0.2.2.0"; - sha256 = "1z8dyhcg2r9vb8m93khjzvmzc3lk7zaj64yjjdsnjmzzv13k8hl5"; - libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra polysemy syb transformers - ]; - testHaskellDepends = [ - base containers doctest ghc ghc-tcplugins-extra hspec - inspection-testing polysemy should-not-typecheck syb transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "Disambiguate obvious uses of effects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "polysemy-plugin_0_2_3_0" = callPackage ({ mkDerivation, base, containers, doctest, ghc , ghc-tcplugins-extra, hspec, hspec-discover, inspection-testing , polysemy, should-not-typecheck, syb, transformers @@ -183690,6 +183488,32 @@ self: { broken = true; }) {}; + "polysemy-zoo_0_6_0_0" = callPackage + ({ mkDerivation, async, base, binary, bytestring, constraints + , containers, contravariant, ghc-prim, hedis, hspec, hspec-discover + , mtl, polysemy, polysemy-plugin, random, reflection, transformers + }: + mkDerivation { + pname = "polysemy-zoo"; + version = "0.6.0.0"; + sha256 = "1d8h1hmq59b4igxdym83rd4ggcq45jb5zb0sdyvacqiicy5rnzhz"; + libraryHaskellDepends = [ + async base binary bytestring constraints containers contravariant + ghc-prim hedis mtl polysemy polysemy-plugin random reflection + transformers + ]; + testHaskellDepends = [ + async base binary bytestring constraints containers contravariant + ghc-prim hedis hspec mtl polysemy polysemy-plugin random reflection + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Experimental, user-contributed effects and interpreters for polysemy"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polyseq" = callPackage ({ mkDerivation, array, base, bytestring, cgi, containers , free-theorems, haskell-src, mtl, network, old-locale, old-time @@ -184865,8 +184689,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-named"; - version = "0.0.1.0"; - sha256 = "1lp7bq7w3l127cb4js3gmmp8c9nvxabs64c200c73lqg5mw9fkfp"; + version = "0.0.2.0"; + sha256 = "1bk6r67jy533zskwmg251vlb2imzyh60hx9lwag2rqclgb7fgplr"; libraryHaskellDepends = [ base bytestring mtl postgresql-simple text ]; @@ -186467,6 +186291,8 @@ self: { pname = "prettyprinter"; version = "1.2.1.1"; sha256 = "1p9c3q55hba4c0zyxc624g5df7wgsclpsmd8wqpdnmib882q9d1v"; + revision = "1"; + editedCabalFile = "0p3qvc1fr2ayxq5s7ysm80nl6107xfkv27p3mcripffq1lqvmlma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -186492,6 +186318,8 @@ self: { pname = "prettyprinter"; version = "1.3.0"; sha256 = "1dc43z53s8pbrv6wf2mq6zvggd67lk415zqg8q9bcd1ld5m9h2x4"; + revision = "1"; + editedCabalFile = "0i5m6x3xsph343w2902xvv91l1raak4nz4q1py7vf95p0hbb72qq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -187640,8 +187468,8 @@ self: { pname = "product-profunctors"; version = "0.10.0.0"; sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd"; - revision = "2"; - editedCabalFile = "0sarkc9sch60f5j1xjy30yrgycvmp5bqx1iynmlsfzdx7rvk5s29"; + revision = "3"; + editedCabalFile = "09czbjfn7kwg18726401dhlpkd5gibkk96wzczn9lngpl730jhm9"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -189724,33 +189552,6 @@ self: { }) {}; "pure-zlib" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring - , bytestring-builder, containers, filepath, fingertree, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time - }: - mkDerivation { - pname = "pure-zlib"; - version = "0.6.4"; - sha256 = "05rhvhvdn8ly5jldxg3q7ip6zflzqa1wyj8mlcl0scgsngn9lrzb"; - revision = "1"; - editedCabalFile = "0mskig3fppav6f6x34vl5fxsih2hndiqvbdxz24hmr1dzkpnfvq1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base base-compat bytestring bytestring-builder containers - fingertree - ]; - executableHaskellDepends = [ base base-compat bytestring ]; - testHaskellDepends = [ - base base-compat bytestring filepath HUnit QuickCheck tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base base-compat bytestring time ]; - description = "A Haskell-only implementation of zlib / DEFLATE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pure-zlib_0_6_6" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , bytestring-builder, containers, filepath, fingertree, HUnit , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time @@ -189773,7 +189574,6 @@ self: { benchmarkHaskellDepends = [ base base-compat bytestring time ]; description = "A Haskell-only implementation of zlib / DEFLATE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pureMD5" = callPackage @@ -191384,6 +191184,8 @@ self: { pname = "quickcheck-classes"; version = "0.6.3.0"; sha256 = "0rbrxs79naffzp809523452xprh7z33j6p256qs0cnni9v9zfgjf"; + revision = "1"; + editedCabalFile = "1qm6zfmhil1wn1972hfdsvxlgzgps0ip8vdlgz3fz5a048l29ahq"; libraryHaskellDepends = [ aeson base base-orphans bifunctors containers contravariant fail primitive primitive-addr QuickCheck quickcheck-classes-base @@ -191448,8 +191250,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.22"; sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax"; - revision = "1"; - editedCabalFile = "1ln7zp6rx7ya7iwcbh8m1s1y1pdh28f64nga74f2lszmpmmd512w"; + revision = "2"; + editedCabalFile = "1ia5fjhpg7rz793552v88gv2iqx7hl9mi2g09m0llasy1cpzc9jr"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific splitmix tagged text time @@ -193628,39 +193430,6 @@ self: { }) {}; "rattletrap" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits - , bytestring, containers, filepath, http-client, http-client-tls - , HUnit, scientific, template-haskell, temporary, text - , transformers - }: - mkDerivation { - pname = "rattletrap"; - version = "9.0.1"; - sha256 = "0b6w0zb5vzm0zp5lv00n599dqsqmvxbm96zdlnw4y9gx579qxpc6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls scientific template-haskell - text transformers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls scientific template-haskell - text transformers - ]; - testHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls HUnit scientific - template-haskell temporary text transformers - ]; - description = "Parse and generate Rocket League replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "rattletrap_9_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, containers, filepath, http-client, http-client-tls , HUnit, scientific, template-haskell, temporary, text @@ -194705,8 +194474,8 @@ self: { }: mkDerivation { pname = "reanimate-svg"; - version = "0.9.0.1"; - sha256 = "0a4gp16zm1j6xi9algg4fkl53rxjzq38dvfjk0bzw6sm727rxvnf"; + version = "0.9.1.0"; + sha256 = "1hiinaz8swlg1lzm5narlwmkzqjxym4k3qn5izyhjjhx4ch0avr4"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -194718,15 +194487,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "reanimate-svg_0_9_0_2" = callPackage + "reanimate-svg_0_9_1_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, hspec , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text , transformers, vector, xml }: mkDerivation { pname = "reanimate-svg"; - version = "0.9.0.2"; - sha256 = "1nlxdyvy4fzr21qm428112w7af9ziajg9vqiv73q45ijgc6icgc9"; + version = "0.9.1.1"; + sha256 = "1y2q6nljgs4h05ga0v713z5bcjd8xrxvg6sf81di65rhdkksidx7"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -196011,18 +195780,19 @@ self: { "reflex-vty" = callPackage ({ mkDerivation, base, bimap, containers, data-default , dependent-map, dependent-sum, exception-transformers, mtl - , primitive, ref-tf, reflex, stm, text, time, transformers, vty + , primitive, ref-tf, reflex, stm, text, text-icu, time + , transformers, vty }: mkDerivation { pname = "reflex-vty"; - version = "0.1.1.1"; - sha256 = "1qhmpdfwavr4vip39p1ih3hz0yb1b308g3m24w80n3zw7xqnqz6j"; + version = "0.1.2.0"; + sha256 = "0g28vv0p5p9z7zrh8w5n0xkardg8kcpadqz7hs52y0xz68fi0akh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bimap containers data-default dependent-map dependent-sum - exception-transformers mtl primitive ref-tf reflex stm text time - transformers vty + exception-transformers mtl primitive ref-tf reflex stm text + text-icu time transformers vty ]; executableHaskellDepends = [ base containers reflex text time transformers vty @@ -196226,8 +195996,8 @@ self: { pname = "regex-applicative-text"; version = "0.1.0.1"; sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh"; - revision = "3"; - editedCabalFile = "1h911harqgfgkhdr22cndj2fdsl48sqhn8q0akgjngpf3p8z0bvv"; + revision = "4"; + editedCabalFile = "0ykzppl1v6k70idjl73m4w161f6lsax89v1gp100y4xgipf3yijj"; libraryHaskellDepends = [ base regex-applicative text ]; description = "regex-applicative on text"; license = stdenv.lib.licenses.bsd3; @@ -197292,6 +197062,23 @@ self: { broken = true; }) {}; + "releaser" = callPackage + ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-pcre + }: + mkDerivation { + pname = "releaser"; + version = "0.1.0.0"; + sha256 = "04icyx42ya7l4h5923yji0170c3xl0gg9lvcmswh7lmrg8x9gvip"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal pretty-terminal process regex-pcre + ]; + executableHaskellDepends = [ base ]; + description = "Automation of Haskell package release process"; + license = stdenv.lib.licenses.asl20; + }) {}; + "relevant-time" = callPackage ({ mkDerivation, aeson, base, chronos, text, torsor }: mkDerivation { @@ -197982,14 +197769,33 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "replace-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, criterion + , parsers, text + }: + mkDerivation { + pname = "replace-attoparsec"; + version = "1.0.0.0"; + sha256 = "0cyaqdlhjmpmw51h8k93gi21d1wkyajd2zyzfk787kg8hby0hkzi"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal parsers text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Stream editing with Attoparsec"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "replace-megaparsec" = callPackage ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec , text }: mkDerivation { pname = "replace-megaparsec"; - version = "1.1.1.0"; - sha256 = "1g8hwjiv7lrx1vvnylbzn4l7dxnn73blfhv2w9j1zz37f87jyr7m"; + version = "1.1.2.0"; + sha256 = "154abc29xhc8qz3ilzrpnjn3a43rbiq7b60k4agv7zmsllihb0kk"; libraryHaskellDepends = [ base megaparsec ]; testHaskellDepends = [ base bytestring Cabal megaparsec text ]; benchmarkHaskellDepends = [ @@ -202145,8 +201951,8 @@ self: { pname = "safe-exceptions"; version = "0.1.7.0"; sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; - revision = "4"; - editedCabalFile = "0fid41gishzsyb47wzxhd5falandfirqcp760hcja81qjpfmqd32"; + revision = "5"; + editedCabalFile = "0yghh99yg24pzhzrflvgi4ip56ln7a56871pl3q70sm8rszy8vbr"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; description = "Safe, consistent, and easy exception handling"; @@ -202260,6 +202066,32 @@ self: { broken = true; }) {}; + "safe-json_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , generic-arbitrary, hashable, quickcheck-instances, scientific + , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time + , unordered-containers, uuid, uuid-types, vector + }: + mkDerivation { + pname = "safe-json"; + version = "1.0.0"; + sha256 = "0i5wryhfiqdqxgzzk9ywnlh4y8hvanrm2mqa0niavf4jgvkkfalh"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist hashable scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers dlist generic-arbitrary hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + temporary text time unordered-containers uuid uuid-types vector + ]; + description = "Automatic JSON format versioning"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "safe-lazy-io" = callPackage ({ mkDerivation, base, extensible-exceptions, parallel, strict-io }: @@ -204366,35 +204198,6 @@ self: { }) {}; "scotty" = callPackage - ({ mkDerivation, aeson, async, base, blaze-builder, bytestring - , case-insensitive, data-default-class, directory, exceptions, fail - , hspec, hspec-discover, hspec-wai, http-types, lifted-base - , monad-control, mtl, nats, network, regex-compat, text - , transformers, transformers-base, transformers-compat, wai - , wai-extra, warp - }: - mkDerivation { - pname = "scotty"; - version = "0.11.4"; - sha256 = "13z0zmginaa1y5iywbbygvb9q3cmfgjkv6n2drs8gfbv3sirrf7i"; - revision = "2"; - editedCabalFile = "168wg4kbqfg907gwyyxj159rk3ayfjcmyfbfsf97lxqic72vcff9"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class exceptions fail http-types monad-control mtl - nats network regex-compat text transformers transformers-base - transformers-compat wai wai-extra warp - ]; - testHaskellDepends = [ - async base bytestring data-default-class directory hspec hspec-wai - http-types lifted-base network text wai - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scotty_0_11_5" = callPackage ({ mkDerivation, aeson, async, base, blaze-builder, bytestring , case-insensitive, data-default-class, directory, exceptions, fail , hspec, hspec-discover, hspec-wai, http-types, lifted-base @@ -204419,7 +204222,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-binding-play" = callPackage @@ -205474,6 +205276,29 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) secp256k1;}; + "secp256k1-legacy" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal + , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "secp256k1-legacy"; + version = "0.5.4"; + sha256 = "1sm0w29iwlhd1596h4x8dcqv5jz0jk6vfc41iqikdhgbn89xv6sd"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base base16-bytestring bytestring cereal entropy mtl QuickCheck + string-conversions + ]; + testHaskellDepends = [ + base base16-bytestring bytestring cereal cryptohash entropy HUnit + mtl QuickCheck string-conversions test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "fork of secp256k1"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "secret-santa" = callPackage ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib , haskell-qrencode, random @@ -206515,6 +206340,36 @@ self: { broken = true; }) {}; + "sequenceTools" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec + , lens-family, optparse-applicative, pipes, pipes-group + , pipes-ordered-zip, pipes-safe, random, rio, sequence-formats + , split, vector + }: + mkDerivation { + pname = "sequenceTools"; + version = "1.4.0.2"; + sha256 = "1s6g5n9rb9yk2rzjc2dvmw14ncjfrf66lkla8bcacdvqwa8hl7kr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring optparse-applicative pipes random sequence-formats + vector + ]; + executableHaskellDepends = [ + ansi-wl-pprint base bytestring foldl lens-family + optparse-applicative pipes pipes-group pipes-ordered-zip pipes-safe + random rio sequence-formats split vector + ]; + testHaskellDepends = [ + base bytestring hspec pipes sequence-formats vector + ]; + description = "A package with tools for processing DNA sequencing data"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sequent-core" = callPackage ({ mkDerivation, base, bytestring, containers, ghc, transformers }: mkDerivation { @@ -207945,31 +207800,6 @@ self: { }) {}; "servant-kotlin" = callPackage - ({ mkDerivation, aeson, base, containers, directory, formatting - , hspec, http-api-data, lens, servant, servant-foreign, shelly - , text, time, wl-pprint-text - }: - mkDerivation { - pname = "servant-kotlin"; - version = "0.1.1.8"; - sha256 = "0w68sfsf7x0wvj67klbl464jzkibr8p78knxix5fqxxd5kb5d25r"; - libraryHaskellDepends = [ - base containers directory formatting lens servant servant-foreign - text time wl-pprint-text - ]; - testHaskellDepends = [ - aeson base containers directory formatting hspec http-api-data lens - servant servant-foreign text time wl-pprint-text - ]; - benchmarkHaskellDepends = [ - aeson base containers directory formatting http-api-data lens - servant servant-foreign shelly text time wl-pprint-text - ]; - description = "Automatically derive Kotlin class to query servant webservices"; - license = stdenv.lib.licenses.mit; - }) {}; - - "servant-kotlin_0_1_1_9" = callPackage ({ mkDerivation, aeson, base, containers, directory, formatting , hspec, http-api-data, lens, servant, servant-foreign, shelly , text, time, wl-pprint-text @@ -207992,7 +207822,6 @@ self: { ]; description = "Automatically derive Kotlin class to query servant webservices"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-lucid" = callPackage @@ -208411,34 +208240,6 @@ self: { }) {}; "servant-rawm" = callPackage - ({ mkDerivation, base, bytestring, doctest, filepath, Glob - , hspec-wai, http-client, http-media, http-types, lens, resourcet - , servant, servant-client, servant-client-core, servant-docs - , servant-server, tasty, tasty-hspec, tasty-hunit, text - , transformers, wai, wai-app-static, warp - }: - mkDerivation { - pname = "servant-rawm"; - version = "0.3.1.0"; - sha256 = "055ys4gkywy1ld0d736fsmc39fix2b4ad4myb7qn0sbax6y9zn3q"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring filepath http-client http-media http-types lens - resourcet servant-client servant-client-core servant-docs - servant-server wai wai-app-static - ]; - testHaskellDepends = [ - base bytestring doctest Glob hspec-wai http-client http-media - http-types servant servant-client servant-client-core - servant-server tasty tasty-hspec tasty-hunit text transformers wai - warp - ]; - description = "Embed a raw 'Application' in a Servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-rawm_0_3_2_0" = callPackage ({ mkDerivation, base, bytestring, doctest, filepath, Glob , hspec-wai, http-client, http-media, http-types, lens, resourcet , servant, servant-client, servant-client-core, servant-docs @@ -208464,7 +208265,6 @@ self: { ]; description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-reason" = callPackage @@ -210524,31 +210324,6 @@ self: { }) {}; "shakespeare" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.20"; - sha256 = "00wybn9dcwi2y1cp87fyvhcqn8filvb8as7k78g1m1c5wpwby3pm"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_21" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec , process, scientific, template-haskell, text, time, transformers @@ -210570,7 +210345,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -218195,8 +217969,8 @@ self: { ({ mkDerivation, base, invariant, lens, QuickCheck }: mkDerivation { pname = "split-morphism"; - version = "0.1.0.0"; - sha256 = "08mrnaj03j5z9ihayqikb06rw1fvrbjrqq0ysz28nlzawhz8x970"; + version = "0.1.0.1"; + sha256 = "0j7z4im0f0dblx8jzia21f3zg5qi2b3lpd9qf7w4ns8rhk4ycr58"; libraryHaskellDepends = [ base invariant lens ]; testHaskellDepends = [ base invariant lens QuickCheck ]; description = "Split Epimorphisms and Monomorphisms"; @@ -221022,8 +220796,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; - revision = "2"; - editedCabalFile = "074399mj4p0sk49rqc9a3fikpsly95mndnmm71ya7wy34nxyafzv"; + revision = "3"; + editedCabalFile = "0aa7x22n5ylvryd7bm1j9s12k5xcp9fp5fz9qy03hjicxzlhm07a"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -222790,6 +222564,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strict-list_0_1_5" = callPackage + ({ mkDerivation, base, hashable, QuickCheck, quickcheck-instances + , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "strict-list"; + version = "0.1.5"; + sha256 = "06mv208bspfl2mh1razi6af3fri8w7f5p3klkc3b9yx5ddv3hwxs"; + libraryHaskellDepends = [ base hashable semigroupoids ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Strict linked list"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strict-tuple" = callPackage ({ mkDerivation, base, deepseq, hashable }: mkDerivation { @@ -224640,6 +224432,8 @@ self: { pname = "sv"; version = "1.4"; sha256 = "02ymnnknfppx59b922y62grkmarwsyy77iv6bmyp2bzm8vbvnvd5"; + revision = "1"; + editedCabalFile = "0lzl0602dbq8nih9ylqk18vqg3xgj3bnf8c6hkxhbc2mryszrhyj"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -224718,6 +224512,8 @@ self: { pname = "sv-core"; version = "0.5"; sha256 = "1x5gmv2pbn3hx1dhpkigivjkbg6n6xy7lc36wmccsw2qqn9r5qxa"; + revision = "1"; + editedCabalFile = "1vsd3g5kh50c7vrx9y04crrw6pfs3g74z3sr9s1dbapa9411pif8"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -224853,13 +224649,12 @@ self: { }: mkDerivation { pname = "svgcairo"; - version = "0.13.1.1"; - sha256 = "0kx5qc2snrpml2figrq1f74fzj81zbibv1x9dp8z2kh8z6n659nd"; + version = "0.13.2.0"; + sha256 = "1h3phyq9g7lmw0mf75hlccvixgwffvkfnlyy1g34hwh9i5nj0aqw"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base cairo glib mtl text ]; libraryPkgconfigDepends = [ librsvg ]; - libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the libsvg-cairo library"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) librsvg;}; @@ -225550,6 +225345,27 @@ self: { broken = true; }) {}; + "symbiote" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, cereal, containers + , monad-control, mtl, QuickCheck, quickcheck-instances, stm, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "symbiote"; + version = "0.0.0"; + sha256 = "1p38lblwd8cxbypnqy7f71ab2s7ia00xv6ysy24lh9xaqns43ad4"; + libraryHaskellDepends = [ + aeson async base bytestring cereal containers monad-control mtl + QuickCheck stm text + ]; + testHaskellDepends = [ + aeson async base bytestring cereal containers monad-control mtl + QuickCheck quickcheck-instances stm tasty tasty-hunit text + ]; + description = "Data serialization, communication, and operation verification implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "symbol" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -225579,8 +225395,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "symbols"; - version = "0.2.0.1"; - sha256 = "00c28qy0g011acgf98981x7pw3d58dcsmb8iqfna5f6qmcya6393"; + version = "0.3.0.0"; + sha256 = "19hlvyq5s4lvqi8n4qwxy4fgi33y72n8h4lw5bbb35sbq9jlw69c"; libraryHaskellDepends = [ base ]; description = "Symbol manipulation"; license = stdenv.lib.licenses.bsd3; @@ -228459,6 +228275,8 @@ self: { pname = "tasty-wai"; version = "0.1.1.0"; sha256 = "1ix1ksibdkqrycrcnyi6vablp17kg3ajw5kghff1ia7wd2nb9fbk"; + revision = "1"; + editedCabalFile = "1zwfdad5kp3l1lysz9x5hxwp0yphsdbhgbp33yczw8c8sai3l7xb"; libraryHaskellDepends = [ base bytestring http-types tasty wai wai-extra ]; @@ -228703,8 +228521,8 @@ self: { pname = "tdigest"; version = "0.2.1"; sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl"; - revision = "3"; - editedCabalFile = "1gdmfh1xhwg18lq9awpmcn2zzirxspi31fa7y3nzh6mkzyz5dz5r"; + revision = "4"; + editedCabalFile = "0830zzgbf5xffa1yqwcvy4xm1wzzydvy5wmy3sqk3a5n85v295by"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers @@ -229423,8 +229241,8 @@ self: { }: mkDerivation { pname = "tensorflow"; - version = "0.2.0.0"; - sha256 = "0qlz4fxq2dv5l8krmi8q2g61ng1lhxjyzmv3bcxnc1nz4a1438dl"; + version = "0.2.0.1"; + sha256 = "16qwr72yyan6gvcx771p7dhp8d7m47j3l8q4dq86ljjzi2c9pswi"; libraryHaskellDepends = [ async attoparsec base bytestring containers data-default exceptions fgl lens-family mainland-pretty mtl proto-lens semigroups split @@ -229450,8 +229268,8 @@ self: { }: mkDerivation { pname = "tensorflow-core-ops"; - version = "0.2.0.0"; - sha256 = "0ii5n2fxx6frkk6cscbn2fywx9yc914n6y9dp84rr4v3vr08ixf0"; + version = "0.2.0.1"; + sha256 = "1hdifal9bapc747c2w7bw2ai68sw0frhx4kvrjh0g8a19fqq95sa"; setupHaskellDepends = [ base bytestring Cabal directory filepath mainland-pretty proto-lens tensorflow tensorflow-opgen text @@ -229475,8 +229293,8 @@ self: { }: mkDerivation { pname = "tensorflow-logging"; - version = "0.2.0.0"; - sha256 = "083jv105cx1kqc9krjp75ja8zhy860q7667l8z6fl5l9w5ilqnfs"; + version = "0.2.0.1"; + sha256 = "14gj6ykfrnqhzi12k3l3pvaa892bakxx3hhml117vfzgcz736gcr"; libraryHaskellDepends = [ base bytestring conduit data-default directory exceptions filepath hostname lens-family proto-lens resourcet stm stm-chans stm-conduit @@ -229537,8 +229355,8 @@ self: { }: mkDerivation { pname = "tensorflow-opgen"; - version = "0.2.0.0"; - sha256 = "16d4bgc665synpwcapzffd1kqzvpwvfs97k0fwkxda0lzziy87xq"; + version = "0.2.0.1"; + sha256 = "0hlzw5l3a42q9ls8xmi9d9nybspizf1acl7ga4rzs4mw3qyadf2k"; libraryHaskellDepends = [ base bytestring containers filepath lens-family mainland-pretty optparse-applicative proto-lens semigroups tensorflow-proto text @@ -229559,8 +229377,8 @@ self: { }: mkDerivation { pname = "tensorflow-ops"; - version = "0.2.0.0"; - sha256 = "12x37bh8172xkgnp5ahr87ykad8gbsnb4amchpjcwxap33n9h19c"; + version = "0.2.0.1"; + sha256 = "1v89yi2cm39aybhz4lvy2fqgpdslb1d0adxk9516f0xqz3k23ks6"; libraryHaskellDepends = [ base bytestring containers data-default fgl lens-family mtl proto-lens tensorflow tensorflow-core-ops tensorflow-proto text @@ -229582,15 +229400,15 @@ self: { "tensorflow-proto" = callPackage ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types - , proto-lens-protoc, protobuf + , proto-lens-runtime, proto-lens-setup, protobuf }: mkDerivation { pname = "tensorflow-proto"; - version = "0.2.0.0"; - sha256 = "0s3gkis2m3ciia83ziz7rca61czzj77racmcb8si9jxxgw3rxhkc"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + version = "0.2.0.1"; + sha256 = "1gc4gwfsy0b6ns79zmxyd0pg3g00jnfynmrnkp81cq3a170z7558"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ - base proto-lens proto-lens-protobuf-types proto-lens-protoc + base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; libraryToolDepends = [ protobuf ]; description = "TensorFlow protocol buffers"; @@ -230007,8 +229825,8 @@ self: { pname = "test-framework"; version = "0.8.2.0"; sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; - revision = "3"; - editedCabalFile = "0qg8zr0ga2kq8qrs9vckxmk11zrp105cbybcb9ra3dk4linngjw3"; + revision = "4"; + editedCabalFile = "1g1z9h55ii55b44gzgrjgi1lpk85yfi4yhrynvfy0199ywpckpd5"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml @@ -231343,41 +231161,6 @@ self: { }) {}; "text-show-instances" = callPackage - ({ mkDerivation, base, base-compat-batteries, bifunctors, binary - , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, old-locale, old-time - , pretty, QuickCheck, quickcheck-instances, random, semigroups - , tagged, template-haskell, terminfo, text, text-short, text-show - , th-orphans, time, transformers, transformers-compat, unix - , unordered-containers, vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; - version = "3.8.1"; - sha256 = "1z54vgw1rsck3lr6jnl5vdd0aq1hni1wy0fag985d6b73qmxlm1l"; - revision = "1"; - editedCabalFile = "1yprndi65gspjp8srqciwjx81wbh2yyyrsj0905zqd9g150sj121"; - libraryHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory - ghc-boot-th haskeline hpc old-locale old-time pretty random - semigroups tagged template-haskell terminfo text text-short - text-show time transformers transformers-compat unix - unordered-containers vector xhtml - ]; - testHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory - generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - tagged template-haskell terminfo text-short text-show th-orphans - time transformers transformers-compat unix unordered-containers - vector xhtml - ]; - testToolDepends = [ hspec-discover ]; - description = "Additional instances for text-show"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-show-instances_3_8_2" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time @@ -231408,7 +231191,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-stream-decode" = callPackage @@ -232147,27 +231929,6 @@ self: { }) {}; "th-orphans" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover - , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.7"; - sha256 = "0qqxrm04nqh062cw6a2p6grvvfpg0nxkj3aymmar29yky17y8vgy"; - revision = "1"; - editedCabalFile = "1gf2rmphwgnqbbk4qcwfiprmsqp2d30xqlcxgs9h9ymazkwlh203"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-lift-instances th-reify-many - ]; - testHaskellDepends = [ - base bytestring ghc-prim hspec template-haskell th-lift - ]; - testToolDepends = [ hspec-discover ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-orphans_0_13_8" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many }: @@ -232184,7 +231945,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-pprint" = callPackage @@ -233637,6 +233397,8 @@ self: { pname = "time-parsers"; version = "0.1.2.1"; sha256 = "102k6l9888kbgng045jk170qjbmdnwv2lbzlc12ncybfk2yk7wdv"; + revision = "1"; + editedCabalFile = "00063s6a75sy9fjg5507yix0wizdfx5vangn3yfmfvh3wgw8yj8c"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -235552,8 +235314,8 @@ self: { pname = "topograph"; version = "1"; sha256 = "0vm7ja5f677lpphfmggx68h144k0fzj0n6r6ypf5474da405xad7"; - revision = "1"; - editedCabalFile = "0pgvjjzmlc947xb1jx1l3bjxz6p9ldm3zlqlm7wf0bcfrznfxgqc"; + revision = "2"; + editedCabalFile = "0sci2p1spsh7as4n7mp1hb4pwiq4wd69p60c71kwx56wpwiglp9i"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -236954,6 +236716,8 @@ self: { pname = "tree-sitter-go"; version = "0.1.0.0"; sha256 = "0lpj6sphc8gfyy8yz4pkrykwvrly3vdhy7j9n7jiacjsxnbw33ag"; + revision = "1"; + editedCabalFile = "04cq0vlwk4b0kyjsdc8aykm2m173wxzlvm3pjwfshcg2d5kqcn8a"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Go"; @@ -236968,6 +236732,8 @@ self: { pname = "tree-sitter-haskell"; version = "0.1.0.0"; sha256 = "0jglvy6p4xwdwpk7jn9sh83j0zv51crvzfc45l10s8lflprydk1m"; + revision = "1"; + editedCabalFile = "0326iz5r9bz4qsmqpiih1h28hbr10lhfy810b4p1bwianj7735bp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base template-haskell tree-sitter ]; @@ -236984,6 +236750,8 @@ self: { pname = "tree-sitter-java"; version = "0.1.0.0"; sha256 = "1npa7i8c24hb0ds52cphfhn5cw087f8iq5w56x5wsjkvm531zblr"; + revision = "1"; + editedCabalFile = "07b2pwnfn2smaq4x9zhh721r2vqf8ipcgr3m19s9bnsyd7pbqyiy"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Java"; @@ -236998,6 +236766,8 @@ self: { pname = "tree-sitter-json"; version = "0.1.0.0"; sha256 = "0agmr5nj4rjdlwcf64ijjwbmkpgl10gbgg26v8bpnx84cxhfjpa3"; + revision = "1"; + editedCabalFile = "14gyys09392bf46vnhv4skc817ghka0bbqzrzr6lamaszk9a02ax"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for JSON"; @@ -237010,8 +236780,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-php"; - version = "0.1.0.0"; - sha256 = "0a8sp6kvw2qxx5mmfyp08fgi65fvchizrw47ay985vbrkmmqgip5"; + version = "0.1.0.1"; + sha256 = "1wbslim9ps3pf29445cxjr5kb4haidb43zl3a87pk5gfbr2wj0r0"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for PHP"; @@ -237046,6 +236816,8 @@ self: { pname = "tree-sitter-ruby"; version = "0.1.0.0"; sha256 = "1rcaqib1ly4p54vqwm2mivijqirc031w18hgkccrnyv97yxrbhw9"; + revision = "1"; + editedCabalFile = "0vwhd6g77s0y0wxflsfvhxcb4hg527nm0h92xxkxk3f50rf2rp0z"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Ruby"; @@ -237060,6 +236832,8 @@ self: { pname = "tree-sitter-tsx"; version = "0.1.0.0"; sha256 = "0jsc5kx5dw4b686dfs7n3vdafyg8mpf94cq2mscwmcyv9w1f3gma"; + revision = "1"; + editedCabalFile = "0hfghgxa138m4krml12yf9s3zqnad14ryynzmyqdwb9j25302hb6"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for TSX"; @@ -237074,6 +236848,8 @@ self: { pname = "tree-sitter-typescript"; version = "0.1.0.0"; sha256 = "1mpk1vhahbva8733anx624vl66fg3h6l9lsby87kf98yrp55ycbn"; + revision = "1"; + editedCabalFile = "0ahjxiz4jgym12490xmh2vsyvxly5gza01aasxblncf1h2q1nggi"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for TypeScript"; @@ -237326,8 +237102,8 @@ self: { pname = "trifecta"; version = "2"; sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk"; - revision = "3"; - editedCabalFile = "11c4y7qx3389ghcjnsl1xm7dz6bhndx27xs36ply2rvx4aly976c"; + revision = "4"; + editedCabalFile = "0xbwyvwl6f2zylk60f2akwgq03qv49113xil7b1z1s3vlwbn5aj1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -241377,8 +241153,8 @@ self: { pname = "union"; version = "0.1.2"; sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3"; - revision = "3"; - editedCabalFile = "160jc4ykqvkzw79sb9j95mw7hsnknpfhkbbd75xmkpx08vnv4d76"; + revision = "4"; + editedCabalFile = "09b6wqnmv4g2pnjzl5k90yp78jcif8pk40c0spdrbr2vr5766clj"; libraryHaskellDepends = [ base deepseq hashable profunctors tagged vinyl ]; @@ -241778,6 +241554,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe_1_1_1" = callPackage + ({ mkDerivation, universe-base, universe-dependent-sum + , universe-instances-extended, universe-reverse-instances + }: + mkDerivation { + pname = "universe"; + version = "1.1.1"; + sha256 = "0jm5wi5blc21jn5hfgmx13ra006dc08dvl1sx7ciq8id87kwvxzg"; + libraryHaskellDepends = [ + universe-base universe-dependent-sum universe-instances-extended + universe-reverse-instances + ]; + description = "A class for finite and recursively enumerable types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "universe-base" = callPackage ({ mkDerivation, base, containers, QuickCheck, tagged, transformers }: @@ -241785,6 +241578,8 @@ self: { pname = "universe-base"; version = "1.1.1"; sha256 = "1a6yyvrzkz7jnjz4lyp8aw0r5hci1nx8c06v3dicgfqs3frk1v8x"; + revision = "1"; + editedCabalFile = "1l6vxapfjhm5mb6w25ah8sl78hdw1ia5s18cf40lm0vzb6ip4bkk"; libraryHaskellDepends = [ base containers tagged transformers ]; testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; @@ -241799,8 +241594,8 @@ self: { pname = "universe-dependent-sum"; version = "1.1.0.1"; sha256 = "1mfvfh7rnk8lnd5lgxbhi40y31sar11dmgh5s7g2kgsprzmg1qpi"; - revision = "1"; - editedCabalFile = "0mvb919ig57zpvhpmqjsznwjd2wzglwk16w7hkfxzp73p4a21821"; + revision = "2"; + editedCabalFile = "1vh93f1nq72fwnrhl9r8qwwiwr26l9pgcmdic56j2b2iz3imnfhc"; libraryHaskellDepends = [ base dependent-sum template-haskell th-abstraction transformers universe-base @@ -241838,6 +241633,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-instances-extended_1_1_1" = callPackage + ({ mkDerivation, adjunctions, base, comonad, containers + , contravariant, universe-base + }: + mkDerivation { + pname = "universe-instances-extended"; + version = "1.1.1"; + sha256 = "1ppklq2rjcryld9d9kdzz55vfllfpxxgsvvkhpd1jrvhyj51yahh"; + libraryHaskellDepends = [ + adjunctions base comonad containers contravariant universe-base + ]; + description = "Universe instances for types from selected extra packages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "universe-instances-trans" = callPackage ({ mkDerivation, base, universe-base }: mkDerivation { @@ -241857,8 +241668,8 @@ self: { pname = "universe-reverse-instances"; version = "1.1"; sha256 = "0pdmv146ap0dh38mxhjf11jx3fbr9im7mc0zxb3bsnwpfrv1kfqd"; - revision = "1"; - editedCabalFile = "1v8cqdx20b5a2lrmyyvig8fkwl4ljycmf78g8rap5gngvhfz30rk"; + revision = "2"; + editedCabalFile = "1ls6hss9mrdk535k9ssy4lv01gbw11pbqiikpv2m8sjmh65fjilx"; libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = stdenv.lib.licenses.bsd3; @@ -243824,8 +243635,8 @@ self: { pname = "uuid"; version = "1.3.13"; sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z"; - revision = "2"; - editedCabalFile = "0m185q62jkfb5jsv358nxbnrkv8y8hd0qqvgvh22wvc5g9ipz0r9"; + revision = "3"; + editedCabalFile = "1p2srrapgx1f3zkdjjzm5g0dyfpg1h2g056la85xmpyjs77la2rq"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -244619,8 +244430,8 @@ self: { }: mkDerivation { pname = "varying"; - version = "0.7.1.0"; - sha256 = "0lb76yqhb6jyfi046cy0axadi10n2h155dhi9c8sqrlwyc0n7hlx"; + version = "0.7.1.1"; + sha256 = "03k41nik9nl3qqb4xrwfrqwc58wpdcdfmjls84fp140n2pwgd5av"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base contravariant transformers ]; @@ -245480,6 +245291,24 @@ self: { broken = true; }) {}; + "vega-view" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, directory + , filepath, http-types, scotty, text, unordered-containers + }: + mkDerivation { + pname = "vega-view"; + version = "0.2.0.2"; + sha256 = "0r9l77xx0bdrpn0jj432cdrw6xw9ni09f08n70kik57raay04bnq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base blaze-html bytestring directory filepath http-types + scotty text unordered-containers + ]; + description = "Easily view Vega or Vega-Lite visualizations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "verbalexpressions" = callPackage ({ mkDerivation, base, regex-pcre }: mkDerivation { @@ -245641,24 +245470,6 @@ self: { }) {}; "versions" = callPackage - ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable - , megaparsec, microlens, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "versions"; - version = "3.5.1"; - sha256 = "1qbihyqw99wkdmslvxqkj6h8x0ih9w86h4s7k51maaicmgijm94w"; - libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; - testHaskellDepends = [ - base base-prelude checkers megaparsec microlens QuickCheck tasty - tasty-hunit tasty-quickcheck text - ]; - description = "Types and parsers for software version numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "versions_3_5_1_1" = callPackage ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable , megaparsec, microlens, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, text @@ -245674,7 +245485,6 @@ self: { ]; description = "Types and parsers for software version numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vflow-types" = callPackage @@ -245816,8 +245626,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.28"; - sha256 = "1l2cjisay7vbqb64xd4lkz594x2ji2gs249h9j4anbifzg6bbjb2"; + version = "0.0.0.29"; + sha256 = "1cy1p1dq6blval791x01rpf1ihqawyj1shfgz46hmmfx1f5dlcdv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -245828,14 +245638,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "viewprof_0_0_0_29" = callPackage + "viewprof_0_0_0_30" = callPackage ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: mkDerivation { pname = "viewprof"; - version = "0.0.0.29"; - sha256 = "1cy1p1dq6blval791x01rpf1ihqawyj1shfgz46hmmfx1f5dlcdv"; + version = "0.0.0.30"; + sha256 = "0l3hf7dj9y4zr6qzih3xl3yz56pjd4gy9jfk9aqypv2rcvwh1w17"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -246254,18 +246064,18 @@ self: { "visualize-cbn" = callPackage ({ mkDerivation, ansi-terminal, base, blaze-html, blaze-markup - , containers, data-default, optparse-applicative, parsec + , containers, data-default, mtl, optparse-applicative, parsec , template-haskell, text }: mkDerivation { pname = "visualize-cbn"; - version = "0.1.0.1"; - sha256 = "0aj8s3gn2qha409n1sf9a5psh5mvb2qcmqax62c2miw5i79rh7ap"; + version = "0.1.0.2"; + sha256 = "1vlidljhy0ykflgf7k8gawlqazcrkvcs7r8wbv7h9x6wfnx0w334"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal base blaze-html blaze-markup containers data-default - optparse-applicative parsec template-haskell text + mtl optparse-applicative parsec template-haskell text ]; description = "Visualize CBN reduction"; license = stdenv.lib.licenses.bsd3; @@ -248678,7 +248488,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "warp_3_3_0" = callPackage + "warp_3_3_1" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types @@ -248688,8 +248498,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.0"; - sha256 = "0dqh1rrrmhw343786337qwgjwap8yk91zrxc9vxdmal6mkf1q4dq"; + version = "3.3.1"; + sha256 = "0qay9h5cby5vcb1nkbrn4ch5xmj2i01g8f3psmvbgs854w2x0ygn"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -248788,6 +248598,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp-tls_3_2_8" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, streaming-commons, tls, tls-session-manager, wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.2.8"; + sha256 = "1z5jzl40x1gp249fk8h51gkw6m3hzxchm2bp3kbpqdgmw8r5im8y"; + libraryHaskellDepends = [ + base bytestring cryptonite data-default-class network + streaming-commons tls tls-session-manager wai warp + ]; + description = "HTTP over TLS support for Warp via the TLS package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-tls-uid" = callPackage ({ mkDerivation, base, bytestring, data-default, network , streaming-commons, tls, unix, wai, warp, warp-tls, x509 @@ -250419,6 +250246,17 @@ self: { broken = true; }) {}; + "which" = callPackage + ({ mkDerivation, base, shelly, template-haskell, text }: + mkDerivation { + pname = "which"; + version = "0.1.0.0"; + sha256 = "0w1jik9bkndx8ssd00i1ii686kb0fd2sc0slr7ki561g5z1xa7dz"; + libraryHaskellDepends = [ base shelly template-haskell text ]; + description = "Determine the full path to an executable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "while-lang-parser" = callPackage ({ mkDerivation, base, indents, parsec }: mkDerivation { @@ -250934,25 +250772,6 @@ self: { }) {}; "witherable" = callPackage - ({ mkDerivation, base, base-orphans, containers, hashable - , monoidal-containers, transformers, transformers-compat - , unordered-containers, vector - }: - mkDerivation { - pname = "witherable"; - version = "0.3.2"; - sha256 = "1iqf3kc9h599lbiym8rf9b4fhj31lqwm1cxqz6x02q9dxyrcprmi"; - revision = "1"; - editedCabalFile = "01mprffm41km3pm5nlpsp2ig2izgl6ll9ylrym3dg01f9609aa0z"; - libraryHaskellDepends = [ - base base-orphans containers hashable monoidal-containers - transformers transformers-compat unordered-containers vector - ]; - description = "filterable traversable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "witherable_0_3_3" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable, lens , monoidal-containers, transformers, transformers-compat , unordered-containers, vector @@ -250969,7 +250788,6 @@ self: { ]; description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witness" = callPackage @@ -253662,26 +253480,6 @@ self: { }) {}; "xml-hamlet" = callPackage - ({ mkDerivation, base, containers, hspec, HUnit, parsec - , shakespeare, template-haskell, text, xml-conduit - }: - mkDerivation { - pname = "xml-hamlet"; - version = "0.5.0"; - sha256 = "18qmj14jzh379fni477h5hrzcy1x7dajfczx1s3w4wiyv2mc1kkv"; - libraryHaskellDepends = [ - base containers parsec shakespeare template-haskell text - xml-conduit - ]; - testHaskellDepends = [ - base containers hspec HUnit parsec shakespeare template-haskell - text xml-conduit - ]; - description = "Hamlet-style quasiquoter for XML content"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xml-hamlet_0_5_0_1" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, parsec , shakespeare, template-haskell, text, xml-conduit }: @@ -253699,7 +253497,6 @@ self: { ]; description = "Hamlet-style quasiquoter for XML content"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-helpers" = callPackage @@ -256820,8 +256617,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.16"; - sha256 = "02bzg0cyvb56hjmrcc0m6a0r7y4kq1cjqhkds542rh73w6dm6fpd"; + version = "1.6.16.1"; + sha256 = "0a0yv7wkwvb0n6iia532y9nzrirgnm09pjc8hpm0lx4ff609pgd2"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -257131,6 +256928,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form_1_6_7" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, text, time, transformers, wai + , xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.6.7"; + sha256 = "0mny71dyp6cp5akyp5wvmrhmip5rkqi8ibdn3lipvmajx9h58r5d"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare text time + transformers wai xss-sanitize yesod-core yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text , yesod-core, yesod-form From f4316473d94e0e5eff2736bd24dc802e09752771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 9 Sep 2019 17:57:13 +0200 Subject: [PATCH 092/159] ghc: compile with DWARF support by default This allows our GHCs to build programs with DWARF debug information when -g is passed, see https://ghc.haskell.org/trac/ghc/wiki/DWARF. Compiling with debug symbols is off by default until GHC ticket #15960 (Using -g causes differences in generated core) is fixed. --- pkgs/development/compilers/ghc/8.2.2.nix | 7 ++++++- pkgs/development/compilers/ghc/8.4.4.nix | 7 ++++++- pkgs/development/compilers/ghc/8.6.4.nix | 7 ++++++- pkgs/development/compilers/ghc/8.6.5.nix | 7 ++++++- pkgs/development/compilers/ghc/8.8.1.nix | 7 ++++++- pkgs/development/compilers/ghc/head.nix | 7 ++++++- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index a034e4ec8dd..7c13db74c4c 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -8,6 +8,8 @@ , libiconv ? null, ncurses +, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support + , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a @@ -69,7 +71,8 @@ let # Splicer will pull out correct variations libDeps = platform: [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv + ++ stdenv.lib.optional enableDwarf elfutils; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -203,6 +206,8 @@ stdenv.mkDerivation (rec { ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ "--disable-large-address-space" + ] ++ stdenv.lib.optional enableDwarf [ + "--enable-dwarf-unwind" ]; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 52fb926cdc6..30353771ea6 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -7,6 +7,8 @@ , libiconv ? null, ncurses +, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support + , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a @@ -71,7 +73,8 @@ let # Splicer will pull out correct variations libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv + ++ stdenv.lib.optional enableDwarf elfutils; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -180,6 +183,8 @@ stdenv.mkDerivation (rec { ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ "--disable-large-address-space" + ] ++ stdenv.lib.optional enableDwarf [ + "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 18b2407a90b..7b6769df682 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -7,6 +7,8 @@ , libiconv ? null, ncurses +, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support + , # GHC can be built with system libffi or a bundled one. libffi ? null @@ -76,7 +78,8 @@ let libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv + ++ stdenv.lib.optional enableDwarf elfutils; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -179,6 +182,8 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" + ] ++ stdenv.lib.optional enableDwarf [ + "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index cdbcb8e1aed..acc97f93c63 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -7,6 +7,8 @@ , libiconv ? null, ncurses +, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support + , # GHC can be built with system libffi or a bundled one. libffi ? null @@ -76,7 +78,8 @@ let libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv + ++ stdenv.lib.optional enableDwarf elfutils; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -179,6 +182,8 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" + ] ++ stdenv.lib.optional enableDwarf [ + "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 95bbab3cb3e..c80ccf72817 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -7,6 +7,8 @@ , libiconv ? null, ncurses +, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support + , # GHC can be built with system libffi or a bundled one. libffi ? null @@ -76,7 +78,8 @@ let libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv + ++ stdenv.lib.optional enableDwarf elfutils; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -164,6 +167,8 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" + ] ++ stdenv.lib.optional enableDwarf [ + "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index b78f5bc2204..240b55deb68 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,6 +7,8 @@ , libiconv ? null, ncurses +, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support + , useLLVM ? !stdenv.targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a @@ -73,7 +75,8 @@ let # Splicer will pull out correct variations libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv + ++ stdenv.lib.optional enableDwarf elfutils; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -176,6 +179,8 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" + ] ++ stdenv.lib.optional enableDwarf [ + "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. From 5c582f35c163e5674bc1fe83099e2e95ef2bee9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Sep 2019 17:44:03 +0200 Subject: [PATCH 093/159] haskell: fix evaluation error in tensorflow-proto --- pkgs/development/haskell-modules/configuration-tensorflow.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index 43a3b82923b..71ae70335fd 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -44,7 +44,7 @@ in ); tensorflow-proto = super.tensorflow-proto.override { - inherit proto-lens proto-lens-protoc proto-lens-protobuf-types; + inherit proto-lens proto-lens-protobuf-types; }; tensorflow = super.tensorflow.override { inherit mainland-pretty proto-lens; From efb354ef04fcccc0597154d6152b7e7dc34dea56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Sep 2019 11:09:50 +0200 Subject: [PATCH 094/159] python-setuptools_scm: enable the test suite It succeeds fine with both Python 2.x and 3.x. --- pkgs/development/python-modules/setuptools_scm/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index 9e176bc6874..eda01679528 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -9,10 +9,6 @@ buildPythonPackage rec { sha256 = "19cyndx23xmpbhz4qrwmfwsmnnaczd0dw7qg977ksq2dbvxy29dx"; }; - # Seems to fail due to chroot and would cause circular dependency - # with pytest - doCheck = false; - meta = with stdenv.lib; { homepage = https://bitbucket.org/pypa/setuptools_scm/; description = "Handles managing your python package versions in scm metadata"; From b57f25ac805819b3b48635c1a59ae46b1ceb3468 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Sep 2019 11:42:23 +0200 Subject: [PATCH 095/159] python-django-haystack: add missing 'setuptools' to propagatedBuildInputs As a side-effect of f7e28bf5d8181926e600a222cb70180519d09726, the build no longer propagated 'setuptools', which is a run-time dependency. See https://github.com/NixOS/nixpkgs/pull/68314 for further details. Fixes https://github.com/NixOS/nixpkgs/issues/68479. --- pkgs/development/python-modules/django-haystack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 905ce92e517..381624e5719 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm, django, dateutil, whoosh, pysolr +, setuptools, setuptools_scm, django, dateutil, whoosh, pysolr , coverage, mock, nose, geopy, requests }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ django setuptools ]; nativeBuildInputs = [ setuptools_scm ]; postPatch = '' From 14854f20bb8002fa70828c820233ec05b177d04f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Sep 2019 12:13:52 +0200 Subject: [PATCH 096/159] python-alembic: add missing 'setuptools' to propagatedBuildInputs As a side-effect of f7e28bf5d8181926e600a222cb70180519d09726, the build no longer propagated 'setuptools', which is a run-time dependency. See https://github.com/NixOS/nixpkgs/pull/68314 for further details. --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 88fd18431d6..ddc3779749b 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, coverage +, pytest, pytestcov, mock, coverage, setuptools , Mako, sqlalchemy, python-editor, dateutil }: @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest pytestcov mock coverage ]; - propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil ]; + propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil setuptools ]; meta = with stdenv.lib; { homepage = https://bitbucket.org/zzzeek/alembic; From 0d71e6910131e5bf331c2c43967c87ab5ffccf0a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 11 Sep 2019 11:49:54 +0200 Subject: [PATCH 097/159] tdesktop: 1.8.4 -> 1.8.8 --- .../instant-messengers/telegram/tdesktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 020fdb2fb2c..26b858aa3b8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -8,7 +8,7 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.8.4"; + version = "1.8.8"; # Note: Due to our strong dependency on the Arch patches it's probably best # to also wait for the Arch update (especially if the patches don't apply). @@ -17,7 +17,7 @@ mkDerivation rec { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1q6y05kb6jjarb690qq28fqkv6kfkxdmfx0va1qi7aqxlhd5rvyl"; + sha256 = "1aj1pnzc6bz8jbdrfwdj2r54jhw9z7b5fd1095r007zmlnzs51lv"; fetchSubmodules = true; }; @@ -25,8 +25,8 @@ mkDerivation rec { archPatches = fetchsvn { url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - rev = "498563"; - sha256 = "0g2y6impygqhfiqnyxc1ivxwl8j82q9qcnkqcjn6mwj3cisyxwnl"; + rev = "509240"; + sha256 = "1sf4mspbsqsnjzp9ys9l0asrx1bhj273d163i2bv1zhl4mmgpl3k"; }; privateHeadersPatch = fetchpatch { url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch"; From 72c7ba5aba1d8dde9da8f4e7b5805edb30cbad7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Sep 2019 20:33:47 +0200 Subject: [PATCH 098/159] nixos/mailman: add support for the Mailman Web UI (Postorius & Hyperkitty) --- nixos/modules/services/mail/mailman.nix | 193 ++++++++- pkgs/servers/mail/mailman/settings.py | 512 ++++++++++++++++++++++++ pkgs/servers/mail/mailman/urls.py | 34 ++ pkgs/servers/mail/mailman/web.nix | 27 ++ pkgs/servers/mail/mailman/wsgi.py | 17 + pkgs/top-level/python-packages.nix | 2 + 6 files changed, 776 insertions(+), 9 deletions(-) create mode 100644 pkgs/servers/mail/mailman/settings.py create mode 100644 pkgs/servers/mail/mailman/urls.py create mode 100644 pkgs/servers/mail/mailman/web.nix create mode 100644 pkgs/servers/mail/mailman/wsgi.py diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 11dd5cb48db..93f4d889955 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -6,14 +6,14 @@ let cfg = config.services.mailman; - pythonEnv = pkgs.python3.withPackages (ps: [ps.mailman]); + mailmanPyEnv = pkgs.python3.withPackages (ps: [ps.mailman ps.mailman-hyperkitty]); mailmanExe = with pkgs; stdenv.mkDerivation { name = "mailman-" + python3Packages.mailman.version; unpackPhase = ":"; installPhase = '' mkdir -p $out/bin - sed >"$out/bin/mailman" <"${pythonEnv}/bin/mailman" \ + sed >"$out/bin/mailman" <"${mailmanPyEnv}/bin/mailman" \ -e "2 iexport MAILMAN_CONFIG_FILE=/etc/mailman.cfg" chmod +x $out/bin/mailman ''; @@ -28,13 +28,40 @@ let bin_dir: ${pkgs.python3Packages.mailman}/bin var_dir: /var/lib/mailman queue_dir: $var_dir/queue + template_dir: $var_dir/templates log_dir: $var_dir/log lock_dir: $var_dir/lock etc_dir: /etc ext_dir: $etc_dir/mailman.d pid_file: /run/mailman/master.pid + '' + optionalString (cfg.hyperkittyApiKey != null) '' + [archiver.hyperkitty] + class: mailman_hyperkitty.Archiver + enable: yes + configuration: ${pkgs.writeText "mailman-hyperkitty.cfg" mailmanHyperkittyCfg} ''; + mailmanHyperkittyCfg = '' + [general] + # This is your HyperKitty installation, preferably on the localhost. This + # address will be used by Mailman to forward incoming emails to HyperKitty + # for archiving. It does not need to be publicly available, in fact it's + # better if it is not. + base_url: ${cfg.hyperkittyBaseUrl} + + # Shared API key, must be the identical to the value in HyperKitty's + # settings. + api_key: ${cfg.hyperkittyApiKey} + ''; + + djangoPyEnv = pkgs.python3.withPackages (x: with x; [postorius hyperkitty]); + + djangoExe = with pkgs; stdenv.mkDerivation { + name = "mailman-django-" + python3Packages.mailman.version; + unpackPhase = ":"; + installPhase = "install -D ${djangoPyEnv}/bin/django-admin $out/bin/mailman-django-admin"; + }; + in { ###### interface @@ -51,7 +78,7 @@ in { siteOwner = mkOption { type = types.str; - default = "postmaster"; + default = "postmaster@example.org"; description = '' Certain messages that must be delivered to a human, but which can't be delivered to a list owner (e.g. a bounce from a list owner), will @@ -59,6 +86,51 @@ in { ''; }; + webRoot = mkOption { + type = types.path; + default = pkgs.python3Packages.mailman-web.override { serverEMail = cfg.siteOwner; + archiverKey = cfg.hyperkittyApiKey; + allowedHosts = cfg.webHosts; + }; + defaultText = "pkgs.python3Packages.mailman-web"; + description = '' + The web root for the Hyperkity + Postorius apps provided by Mailman. + This variable can be set, of course, but it mainly exists so that site + admins can refer to it in their own hand-written httpd configuration files. + ''; + }; + + webHosts = mkOption { + type = types.listOf types.string; + default = []; + description = '' + The list of hostnames and/or IP addresses from which the Mailman Web + UI will accept requests. By default, "localhost" and "127.0.0.1" are + enabled. All additional names under which your web server accepts + requests for the UI must be listed here or incoming requests will be + rejected. + ''; + }; + + hyperkittyBaseUrl = mkOption { + type = types.str; + default = "http://localhost/hyperkitty/"; + description = '' + Where can Mailman connect to Hyperkitty's internal API, preferably on + localhost? + ''; + }; + + hyperkittyApiKey = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The shared secret used to authenticate Mailman's internal + communication with Hyperkitty. Must be set to enable support for the + Hyperkitty archiver. Note that this secret is going to be visible to + all local users in the Nix store. + ''; + }; }; }; @@ -71,25 +143,22 @@ in { { assertion = cfg.enable -> config.services.postfix.enable; message = "Mailman requires Postfix"; } - { assertion = config.services.postfix.recipientDelimiter == "+"; - message = "Postfix's recipientDelimiter must be set to '+'."; - } ]; users.users.mailman = { description = "GNU Mailman"; isSystemUser = true; }; environment = { - systemPackages = [ mailmanExe ]; + systemPackages = [ mailmanExe djangoExe pkgs.sassc ]; etc."mailman.cfg".text = mailmanCfg; }; services.postfix = { relayDomains = [ "hash:/var/lib/mailman/data/postfix_domains" ]; + recipientDelimiter = "+"; # bake recipient addresses in mail envelopes via VERP config = { transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; - # Mailman uses recipient delimiters, so we don't need special handling. - owner_request_special = "no"; + owner_request_special = "no"; # Mailman handles -owner addresses on its own }; }; @@ -109,6 +178,112 @@ in { }; }; + systemd.services.mailman-web = { + description = "Init Postorius DB"; + before = [ "httpd.service" ]; + wantedBy = [ "httpd.service" ]; + script = '' + ${djangoExe}/bin/mailman-django-admin migrate --pythonpath ${cfg.webRoot} --settings settings + rm -rf static + ${djangoExe}/bin/mailman-django-admin collectstatic --pythonpath ${cfg.webRoot} --settings settings + ${djangoExe}/bin/mailman-django-admin compress --pythonpath ${cfg.webRoot} --settings settings + ''; + serviceConfig = { + User = config.services.httpd.user; + Type = "oneshot"; + StateDirectory = "mailman-web"; + StateDirectoryMode = "0700"; + WorkingDirectory = "/var/lib/mailman-web"; + }; + }; + + systemd.services.mailman-daily = { + description = "Trigger daily Mailman events"; + startAt = "daily"; + serviceConfig = { + ExecStart = "${mailmanExe}/bin/mailman digests --send"; + User = "mailman"; + }; + }; + + systemd.services.hyperkitty = { + enable = cfg.hyperkittyApiKey != null; + description = "GNU Hyperkitty QCluster Process"; + after = [ "network.target" ]; + wantedBy = [ "mailman.service" "multi-user.target" ]; + serviceConfig = { + ExecStart = "${djangoExe}/bin/mailman-django-admin qcluster --pythonpath ${cfg.webRoot} --settings settings"; + User = config.services.httpd.user; + WorkingDirectory = "/var/lib/mailman-web"; + }; + }; + + systemd.services.hyperkitty-minutely = { + enable = cfg.hyperkittyApiKey != null; + description = "Trigger minutely Hyperkitty events"; + startAt = "minutely"; + serviceConfig = { + ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs minutely --pythonpath ${cfg.webRoot} --settings settings"; + User = config.services.httpd.user; + WorkingDirectory = "/var/lib/mailman-web"; + }; + }; + + systemd.services.hyperkitty-quarter-hourly = { + enable = cfg.hyperkittyApiKey != null; + description = "Trigger quarter-hourly Hyperkitty events"; + startAt = "*:00/15"; + serviceConfig = { + ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs quarter_hourly --pythonpath ${cfg.webRoot} --settings settings"; + User = config.services.httpd.user; + WorkingDirectory = "/var/lib/mailman-web"; + }; + }; + + systemd.services.hyperkitty-hourly = { + enable = cfg.hyperkittyApiKey != null; + description = "Trigger hourly Hyperkitty events"; + startAt = "hourly"; + serviceConfig = { + ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs hourly --pythonpath ${cfg.webRoot} --settings settings"; + User = config.services.httpd.user; + WorkingDirectory = "/var/lib/mailman-web"; + }; + }; + + systemd.services.hyperkitty-daily = { + enable = cfg.hyperkittyApiKey != null; + description = "Trigger daily Hyperkitty events"; + startAt = "daily"; + serviceConfig = { + ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs daily --pythonpath ${cfg.webRoot} --settings settings"; + User = config.services.httpd.user; + WorkingDirectory = "/var/lib/mailman-web"; + }; + }; + + systemd.services.hyperkitty-weekly = { + enable = cfg.hyperkittyApiKey != null; + description = "Trigger weekly Hyperkitty events"; + startAt = "weekly"; + serviceConfig = { + ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs weekly --pythonpath ${cfg.webRoot} --settings settings"; + User = config.services.httpd.user; + WorkingDirectory = "/var/lib/mailman-web"; + }; + }; + + systemd.services.hyperkitty-yearly = { + enable = cfg.hyperkittyApiKey != null; + description = "Trigger yearly Hyperkitty events"; + startAt = "yearly"; + serviceConfig = { + ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs yearly --pythonpath ${cfg.webRoot} --settings settings"; + User = config.services.httpd.user; + WorkingDirectory = "/var/lib/mailman-web"; + }; + }; + }; } diff --git a/pkgs/servers/mail/mailman/settings.py b/pkgs/servers/mail/mailman/settings.py new file mode 100644 index 00000000000..5f246db41ad --- /dev/null +++ b/pkgs/servers/mail/mailman/settings.py @@ -0,0 +1,512 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 1998-2019 by the Free Software Foundation, Inc. +# +# This file is part of Postorius. +# +# Postorius is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Postorius is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# Postorius. If not, see . + +""" +Django settings for postorius project. + +For more information on this file, see +https://docs.djangoproject.com/en/1.9/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.9/ref/settings/ +""" + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +import os + +# Compatibility with Bootstrap 3 +from django.contrib.messages import constants as messages + + +BASE_DIR = os.path.dirname(os.path.abspath(__file__)) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '$!-7^wl#wiifjbh)5@f7ji%x!vp7s1vzbvwt26hxv$idixq0u0' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = False + +ADMINS = ( + #('Admin', 'webmaster@example.com'), +) + +SITE_ID = 1 + +# Hosts/domain names that are valid for this site; required if DEBUG is False +# See https://docs.djangoproject.com/en/1.8/ref/settings/#allowed-hosts +ALLOWED_HOSTS = [ + "localhost", # Archiving API from Mailman, keep it. + "127.0.0.1", + # Add here all production URLs you may have. + @ALLOWED_HOSTS@ +] + +# Mailman API credentials +MAILMAN_REST_API_URL = 'http://localhost:8001' +MAILMAN_REST_API_USER = 'restadmin' +MAILMAN_REST_API_PASS = 'restpass' +MAILMAN_ARCHIVER_KEY = "@ARCHIVER_KEY@" +MAILMAN_ARCHIVER_FROM = ('127.0.0.1', '::1') + +# Application definition + +INSTALLED_APPS = ( + 'hyperkitty', + 'postorius', + 'django_mailman3', + # Uncomment the next line to enable the admin: + 'django.contrib.admin', + # Uncomment the next line to enable admin documentation: + # 'django.contrib.admindocs', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'rest_framework', + 'django_gravatar', + 'compressor', + 'haystack', + 'django_extensions', + 'django_q', + 'allauth', + 'allauth.account', + 'allauth.socialaccount', + 'django_mailman3.lib.auth.fedora', + 'allauth.socialaccount.providers.openid', + 'allauth.socialaccount.providers.github', + 'allauth.socialaccount.providers.gitlab', + 'allauth.socialaccount.providers.google', + #'allauth.socialaccount.providers.facebook', + #'allauth.socialaccount.providers.twitter', + 'allauth.socialaccount.providers.stackexchange', +) + + +MIDDLEWARE = ( + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django_mailman3.middleware.TimezoneMiddleware', +) + +ROOT_URLCONF = 'urls' + + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.i18n', + 'django.template.context_processors.media', + 'django.template.context_processors.static', + 'django.template.context_processors.tz', + 'django.template.context_processors.csrf', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + 'django_mailman3.context_processors.common', + 'hyperkitty.context_processors.common', + ], + }, + }, +] + +WSGI_APPLICATION = 'wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.9/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': '/var/lib/mailman-web/mailman-web.db' + } +} + +# Password validation +# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# If you're behind a proxy, use the X-Forwarded-Host header +# See https://docs.djangoproject.com/en/1.8/ref/settings/#use-x-forwarded-host +# USE_X_FORWARDED_HOST = True + +# And if your proxy does your SSL encoding for you, set SECURE_PROXY_SSL_HEADER +# https://docs.djangoproject.com/en/1.8/ref/settings/#secure-proxy-ssl-header +# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') +# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SCHEME', 'https') + +# Other security settings +# SECURE_SSL_REDIRECT = True +# If you set SECURE_SSL_REDIRECT to True, make sure the SECURE_REDIRECT_EXEMPT +# contains at least this line: +# SECURE_REDIRECT_EXEMPT = [ +# "archives/api/mailman/.*", # Request from Mailman. +# ] +# SESSION_COOKIE_SECURE = True +# SECURE_CONTENT_TYPE_NOSNIFF = True +# SECURE_BROWSER_XSS_FILTER = True +# CSRF_COOKIE_SECURE = True +# CSRF_COOKIE_HTTPONLY = True +# X_FRAME_OPTIONS = 'DENY' + + +# Internationalization +# https://docs.djangoproject.com/en/1.9/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.9/howto/static-files/ + + +# Absolute path to the directory static files should be collected to. +# Don't put anything in this directory yourself; store your static files +# in apps' "static/" subdirectories and in STATICFILES_DIRS. +# Example: "/var/www/example.com/static/" +STATIC_ROOT = 'static' + +# URL prefix for static files. +# Example: "http://example.com/static/", "http://static.example.com/" +STATIC_URL = '/static/' + +# Additional locations of static files +STATICFILES_DIRS = ( + # Put strings here, like "/home/html/static" or "C:/www/django/static". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. + # BASE_DIR + '/static/', +) + +# List of finder classes that know how to find static files in +# various locations. +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + # 'django.contrib.staticfiles.finders.DefaultStorageFinder', + 'compressor.finders.CompressorFinder', +) + +# Django 1.6+ defaults to a JSON serializer, but it won't work with +# django-openid, see +# https://bugs.launchpad.net/django-openid-auth/+bug/1252826 +SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' + + +LOGIN_URL = 'account_login' +LOGIN_REDIRECT_URL = 'hk_root' +LOGOUT_URL = 'account_logout' + + +# If you enable internal authentication, this is the address that the emails +# will appear to be coming from. Make sure you set a valid domain name, +# otherwise the emails may get rejected. +# https://docs.djangoproject.com/en/1.8/ref/settings/#default-from-email +DEFAULT_FROM_EMAIL = "@SERVER_EMAIL@" + +# If you enable email reporting for error messages, this is where those emails +# will appear to be coming from. Make sure you set a valid domain name, +# otherwise the emails may get rejected. +# https://docs.djangoproject.com/en/1.8/ref/settings/#std:setting-SERVER_EMAIL +SERVER_EMAIL = "@SERVER_EMAIL@" + + +MESSAGE_TAGS = { + messages.ERROR: 'danger' +} + + +# +# Social auth +# +AUTHENTICATION_BACKENDS = ( + 'django.contrib.auth.backends.ModelBackend', + 'allauth.account.auth_backends.AuthenticationBackend', +) + +# Django Allauth +ACCOUNT_AUTHENTICATION_METHOD = "username_email" +ACCOUNT_EMAIL_REQUIRED = True +ACCOUNT_EMAIL_VERIFICATION = "mandatory" +ACCOUNT_DEFAULT_HTTP_PROTOCOL = "https" +ACCOUNT_UNIQUE_EMAIL = True + +SOCIALACCOUNT_PROVIDERS = { + 'openid': { + 'SERVERS': [ + dict(id='yahoo', + name='Yahoo', + openid_url='http://me.yahoo.com'), + ], + }, + 'google': { + 'SCOPE': ['profile', 'email'], + 'AUTH_PARAMS': {'access_type': 'online'}, + }, + 'facebook': { + 'METHOD': 'oauth2', + 'SCOPE': ['email'], + 'FIELDS': [ + 'email', + 'name', + 'first_name', + 'last_name', + 'locale', + 'timezone', + ], + 'VERSION': 'v2.4', + }, + 'gitlab': { + 'GITLAB_URL': 'https://gitlab.com', + 'SCOPE': ['read_user'], + }, +} + + +# +# Gravatar +# https://github.com/twaddington/django-gravatar +# +# Gravatar base url. +# GRAVATAR_URL = 'http://cdn.libravatar.org/' +# Gravatar base secure https url. +# GRAVATAR_SECURE_URL = 'https://seccdn.libravatar.org/' +# Gravatar size in pixels. +# GRAVATAR_DEFAULT_SIZE = '80' +# An image url or one of the following: 'mm', 'identicon', 'monsterid', +# 'wavatar', 'retro'. +# GRAVATAR_DEFAULT_IMAGE = 'mm' +# One of the following: 'g', 'pg', 'r', 'x'. +# GRAVATAR_DEFAULT_RATING = 'g' +# True to use https by default, False for plain http. +# GRAVATAR_DEFAULT_SECURE = True + +# These can be set to override the defaults but are not mandatory: +# EMAIL_CONFIRMATION_TEMPLATE = 'postorius/address_confirmation_message.txt' +# EMAIL_CONFIRMATION_SUBJECT = 'Confirmation needed' + +# +# django-compressor +# https://pypi.python.org/pypi/django_compressor +# +COMPRESS_PRECOMPILERS = ( + ('text/x-scss', '/run/current-system/sw/bin/sassc -t compressed {infile} {outfile}'), + ('text/x-sass', '/run/current-system/sw/bin/sassc -t compressed {infile} {outfile}'), +) +# On a production setup, setting COMPRESS_OFFLINE to True will bring a +# significant performance improvement, as CSS files will not need to be +# recompiled on each requests. It means running an additional "compress" +# management command after each code upgrade. +# http://django-compressor.readthedocs.io/en/latest/usage/#offline-compression +COMPRESS_ENABLED = True +COMPRESS_OFFLINE = True + +# Needed for debug mode +# INTERNAL_IPS = ('127.0.0.1',) + + +# +# Full-text search engine +# +HAYSTACK_CONNECTIONS = { + 'default': { + 'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine', + 'PATH': "/var/lib/mailman-web/fulltext_index", + # You can also use the Xapian engine, it's faster and more accurate, + # but requires another library. + # http://django-haystack.readthedocs.io/en/v2.4.1/installing_search_engines.html#xapian + # Example configuration for Xapian: + #'ENGINE': 'xapian_backend.XapianEngine' + }, +} + + +# +# REST framework +# +REST_FRAMEWORK = { + 'PAGE_SIZE': 10, + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', + 'DEFAULT_FILTER_BACKENDS': ( + 'rest_framework.filters.OrderingFilter', + ), +} + + +# +# Asynchronous tasks +# +Q_CLUSTER = { + 'timeout': 300, + 'save_limit': 100, + 'orm': 'default', +} + + +# A sample logging configuration. The only tangible logging +# performed by this configuration is to send an email to +# the site admins on every HTTP 500 error when DEBUG=False. +# See http://docs.djangoproject.com/en/dev/topics/logging for +# more details on how to customize your logging configuration. +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'filters': { + 'require_debug_false': { + '()': 'django.utils.log.RequireDebugFalse' + } + }, + 'handlers': { + 'console': { + 'class': 'logging.StreamHandler', + 'formatter': 'simple', + }, + 'mail_admins': { + 'level': 'ERROR', + 'filters': ['require_debug_false'], + 'class': 'django.utils.log.AdminEmailHandler' + }, + 'file':{ + 'level': 'INFO', + #'class': 'logging.handlers.RotatingFileHandler', + 'class': 'logging.handlers.WatchedFileHandler', + 'filename': 'mailman-web.log', + 'formatter': 'verbose', + }, + }, + 'loggers': { + 'django': { + 'handlers': ['console', 'file'], + 'level': 'INFO', + }, + 'django.request': { + 'handlers': ['console', 'mail_admins', 'file'], + 'level': 'ERROR', + 'propagate': True, + }, + 'postorius': { + 'handlers': ['console', 'file'], + 'level': 'INFO', + }, + 'django': { + 'handlers': ['file'], + 'level': 'ERROR', + 'propagate': True, + }, + 'hyperkitty': { + 'handlers': ['file'], + 'level': 'DEBUG', + 'propagate': True, + }, + }, + 'formatters': { + 'simple': { + 'format': '%(levelname)s: %(message)s' + }, + 'verbose': { + 'format': '%(levelname)s %(asctime)s %(process)d %(name)s %(message)s' + }, + 'simple': { + 'format': '%(levelname)s %(message)s' + }, + }, + #'root': { + # 'handlers': ['file'], + # 'level': 'INFO', + #}, +} + + +POSTORIUS_TEMPLATE_BASE_URL = "http://localhost:8000" + + +# Using the cache infrastructure can significantly improve performance on a +# production setup. This is an example with a local Memcached server. +#CACHES = { +# 'default': { +# 'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache', +# 'LOCATION': '127.0.0.1:11211', +# } +#} + + +# When DEBUG is True, don't actually send emails to the SMTP server, just store +# them in a directory. This way you won't accidentally spam your mailing-lists +# while you're fiddling with the code. +if DEBUG == True: + EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend' + EMAIL_FILE_PATH = '/tmp/hyperkitty-emails' + + +# +# HyperKitty-specific +# +# Only display mailing-lists from the same virtual host as the webserver +FILTER_VHOST = False +# Disable singleton locking for Django-Q tasks. +HYPERKITTY_DISABLE_SINGLETON_TASKS = False +# Maximum time between two task runs with same function and arguments. +# This setting is mostly meant for Mailman Developers and should be used +# with caution. +# Default set to 10mins. +HYPERKITTY_TASK_LOCK_TIMEOUT = 10 * 60 + + +try: + from settings_local import * +except ImportError: + pass diff --git a/pkgs/servers/mail/mailman/urls.py b/pkgs/servers/mail/mailman/urls.py new file mode 100644 index 00000000000..9e18da2a218 --- /dev/null +++ b/pkgs/servers/mail/mailman/urls.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 1998-2019 by the Free Software Foundation, Inc. +# +# This file is part of Postorius. +# +# Postorius is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Postorius is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# Postorius. If not, see . + + +from django.conf.urls import include, url +from django.contrib import admin +from django.urls import reverse_lazy +from django.views.generic import RedirectView + + +urlpatterns = [ + url(r'^$', RedirectView.as_view(url=reverse_lazy('hk_root'))), + url(r'^hyperkitty/', include('hyperkitty.urls')), + url(r'^postorius/', include('postorius.urls')), + url(r'', include('django_mailman3.urls')), + url(r'^accounts/', include('allauth.urls')), + # Django admin + url(r'^admin/', admin.site.urls), +] diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix new file mode 100644 index 00000000000..da352ed3482 --- /dev/null +++ b/pkgs/servers/mail/mailman/web.nix @@ -0,0 +1,27 @@ +{ stdenv +, serverEMail ? "postmaster@example.org" +, archiverKey ? "SecretArchiverAPIKey" +, allowedHosts ? [] +}: + +let + + allowedHostsString = stdenv.lib.concatMapStringsSep ", " (x: "\""+x+"\"") allowedHosts; + +in + +stdenv.mkDerivation { + name = "mailman-web-0"; + + unpackPhase = ":"; + + installPhase = '' + install -D -m 444 ${./urls.py} $out/urls.py + install -D -m 444 ${./wsgi.py} $out/wsgi.py + substitute ${./settings.py} $out/settings.py \ + --subst-var-by SERVER_EMAIL '${serverEMail}' \ + --subst-var-by ARCHIVER_KEY '${archiverKey}' \ + --subst-var-by ALLOWED_HOSTS '${allowedHostsString}' + chmod 444 $out/settings.py + ''; +} diff --git a/pkgs/servers/mail/mailman/wsgi.py b/pkgs/servers/mail/mailman/wsgi.py new file mode 100644 index 00000000000..5bdbc511473 --- /dev/null +++ b/pkgs/servers/mail/mailman/wsgi.py @@ -0,0 +1,17 @@ +""" +WSGI config for meh project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") + +application = get_wsgi_application() diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7183f7a793..f3c687b820a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -719,6 +719,8 @@ in { mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/core.nix { }); + mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { }); + mailmanclient = callPackage ../development/python-modules/mailmanclient { }; mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; From bcce960d7d042503ec8cad1b5544dd9d55a8ec63 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 21 Aug 2018 01:43:47 +0200 Subject: [PATCH 099/159] nixos/prometheus-exporters: add rspamd-exporter This adds a module that configures the json exporter, which then acts as an exporter for rspamd. --- .../monitoring/prometheus/exporters.nix | 3 + .../prometheus/exporters/rspamd.nix | 92 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index b69310c34ff..84486aa98a4 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -34,6 +34,7 @@ let "node" "postfix" "postgres" + "rspamd" "snmp" "surfboard" "tor" @@ -193,6 +194,8 @@ in services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000"; services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey; services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey; + })] ++ [(mkIf config.services.rspamd.enable { + services.prometheus.exporters.rspamd.url = mkDefault "http://localhost:11334/stat"; })] ++ (mapAttrsToList (name: conf: mkExporterConf { inherit name; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix new file mode 100644 index 00000000000..1f02ae20724 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.rspamd; + + prettyJSON = conf: + pkgs.runCommand "rspamd-exporter-config.yml" { } '' + echo '${builtins.toJSON conf}' | ${pkgs.buildPackages.jq}/bin/jq '.' > $out + ''; + + generateConfig = extraLabels: (map (path: { + name = "rspamd_${replaceStrings [ "." " " ] [ "_" "_" ] path}"; + path = "$.${path}"; + labels = extraLabels; + }) [ + "actions.'add header'" + "actions.'no action'" + "actions.'rewrite subject'" + "actions.'soft reject'" + "actions.greylist" + "actions.reject" + "bytes_allocated" + "chunks_allocated" + "chunks_freed" + "chunks_oversized" + "connections" + "control_connections" + "ham_count" + "learned" + "pools_allocated" + "pools_freed" + "read_only" + "scanned" + "shared_chunks_allocated" + "spam_count" + "total_learns" + ]) ++ [{ + name = "rspamd_statfiles"; + type = "object"; + path = "$.statfiles[*]"; + labels = recursiveUpdate { + symbol = "$.symbol"; + type = "$.type"; + } extraLabels; + values = { + revision = "$.revision"; + size = "$.size"; + total = "$.total"; + used = "$.used"; + languages = "$.languages"; + users = "$.users"; + }; + }]; +in +{ + port = 7980; + extraOpts = { + listenAddress = {}; # not used + + url = mkOption { + type = types.str; + description = '' + URL to the rspamd metrics endpoint. + Defaults to http://localhost:11334/stat when + is true. + ''; + }; + + extraLabels = mkOption { + type = types.attrsOf types.str; + default = { + host = config.networking.hostName; + }; + defaultText = "{ host = config.networking.hostName; }"; + example = literalExample '' + { + host = config.networking.hostName; + custom_label = "some_value"; + } + ''; + description = "Set of labels added to each metric."; + }; + }; + serviceOpts.serviceConfig.ExecStart = '' + ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \ + --port ${toString cfg.port} \ + ${cfg.url} ${prettyJSON (generateConfig cfg.extraLabels)} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; +} From ccf00bce125d54ebc6d79b7e9b97ef3952620e1f Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 11 Sep 2019 14:03:33 +0200 Subject: [PATCH 100/159] nixos/tests: add prometheus-rspamd-exporter test --- nixos/tests/prometheus-exporters.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 02d83f82f33..9826b56b74d 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -297,6 +297,22 @@ let ''; }; + rspamd = { + exporterConfig = { + enable = true; + }; + metricProvider = { + services.rspamd.enable = true; + }; + exporterTest = '' + waitForUnit("rspamd.service"); + waitForUnit("prometheus-rspamd-exporter.service"); + waitForOpenPort(11334); + waitForOpenPort(7980); + waitUntilSucceeds("curl -sSf localhost:7980/metrics | grep -q 'rspamd_scanned{host=\"rspamd\"} 0'"); + ''; + }; + snmp = { exporterConfig = { enable = true; From a4ace375d27cee8d3286de2a5d97b4a08a6d96bd Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Wed, 11 Sep 2019 13:12:35 +0100 Subject: [PATCH 101/159] qt511.qtscript: fix error due to gcc8.3 --- pkgs/development/libraries/qt-5/5.11/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 7f0937db30f..296db2eab2d 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper, + stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, llvmPackages_5, @@ -55,7 +55,15 @@ let ./qtbase-fixguicmake.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; - qtscript = [ ./qtscript.patch ]; + qtscript = [ + ./qtscript.patch + # needed due to changes in gcc 8.3, see https://bugreports.qt.io/browse/QTBUG-74196 + # fixed in qtscript 5.12.2 + (fetchpatch { + url = "https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.diff"; + sha256 = "0khrapq13xzvxckzc9l7gqyjwibyd98vyqy6gmyhvsbm2kq8n6wi"; + }) + ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; qtwebengine = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd36574e124..c9af01e631a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13176,7 +13176,7 @@ in qt511 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.11) { inherit newScope; - inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; + inherit stdenv fetchurl fetchFromGitHub fetchpatch makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzzFull; From 4535178a3774b6e8c45fc541b9cb04207f283fc7 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Wed, 11 Sep 2019 13:12:43 +0100 Subject: [PATCH 102/159] qt59.qtscript: fix error due to gcc8.3 --- pkgs/development/libraries/qt-5/5.9/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index b27c5d3eb58..a872f212ff7 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -42,7 +42,15 @@ let ./qtbase-openssl_1_1.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; - qtscript = [ ./qtscript.patch ]; + qtscript = [ + ./qtscript.patch + # needed due to changes in gcc 8.3, see https://bugreports.qt.io/browse/QTBUG-74196 + # fixed in qtscript 5.12.2 + (fetchpatch { + url = "https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.diff"; + sha256 = "0khrapq13xzvxckzc9l7gqyjwibyd98vyqy6gmyhvsbm2kq8n6wi"; + }) + ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; qtwebengine = [ ./qtwebengine-no-build-skip.patch ] From 86f8895abbfdb3ce118e0ca971f56c7f72871e29 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Sep 2019 14:48:51 +0200 Subject: [PATCH 103/159] python-mailman-web: turn these Djando configuration files into a make-shift Python library Suggested in https://github.com/NixOS/nixpkgs/pull/67951#issuecomment-530309702. --- nixos/modules/services/mail/mailman.nix | 11 +++++++---- pkgs/servers/mail/mailman/web.nix | 22 ++++++++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 93f4d889955..a3c007a55c9 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -62,6 +62,12 @@ let installPhase = "install -D ${djangoPyEnv}/bin/django-admin $out/bin/mailman-django-admin"; }; + mailmanWeb = pkgs.python3Packages.mailman-web.override { + serverEMail = cfg.siteOwner; + archiverKey = cfg.hyperkittyApiKey; + allowedHosts = cfg.webHosts; + }; + in { ###### interface @@ -88,10 +94,7 @@ in { webRoot = mkOption { type = types.path; - default = pkgs.python3Packages.mailman-web.override { serverEMail = cfg.siteOwner; - archiverKey = cfg.hyperkittyApiKey; - allowedHosts = cfg.webHosts; - }; + default = "${mailmanWeb}/${pkgs.python3.sitePackages}"; defaultText = "pkgs.python3Packages.mailman-web"; description = '' The web root for the Hyperkity + Postorius apps provided by Mailman. diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index da352ed3482..b0ead765a60 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenv, python, hyperkitty, postorius, buildPythonPackage , serverEMail ? "postmaster@example.org" , archiverKey ? "SecretArchiverAPIKey" , allowedHosts ? [] @@ -10,18 +10,28 @@ let in -stdenv.mkDerivation { +# We turn those Djando configuration files into a make-shift Python library so +# that Nix users can use this package as a part of their buildInputs to import +# the code. Also, this package implicitly provides an environment in which the +# Django app can be run. + +buildPythonPackage { name = "mailman-web-0"; + propagatedBuildInputs = [ hyperkitty postorius ]; + unpackPhase = ":"; + buildPhase = ":"; + setuptoolsCheckPhase = ":"; installPhase = '' - install -D -m 444 ${./urls.py} $out/urls.py - install -D -m 444 ${./wsgi.py} $out/wsgi.py - substitute ${./settings.py} $out/settings.py \ + d=$out/${python.sitePackages} + install -D -m 444 ${./urls.py} $d/urls.py + install -D -m 444 ${./wsgi.py} $d/wsgi.py + substitute ${./settings.py} $d/settings.py \ --subst-var-by SERVER_EMAIL '${serverEMail}' \ --subst-var-by ARCHIVER_KEY '${archiverKey}' \ --subst-var-by ALLOWED_HOSTS '${allowedHostsString}' - chmod 444 $out/settings.py + chmod 444 $d/settings.py ''; } From 0cc37b3cfa64ffca70347566f0823010d48bbd97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Sep 2019 14:52:47 +0200 Subject: [PATCH 104/159] nixos/mailman: httpd.services requires mailman-web in the systemd sense When mailman-web restarts, it removes the generated "static" directory. This breaks a currently running httpd process, which needs a re-start, too, to obtain a new handle for the newly generated path. --- nixos/modules/services/mail/mailman.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index a3c007a55c9..5ed07d7deb3 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -184,7 +184,7 @@ in { systemd.services.mailman-web = { description = "Init Postorius DB"; before = [ "httpd.service" ]; - wantedBy = [ "httpd.service" ]; + requiredBy = [ "httpd.service" ]; script = '' ${djangoExe}/bin/mailman-django-admin migrate --pythonpath ${cfg.webRoot} --settings settings rm -rf static From 1cb5cff61138cafe3ce6a4651251c16d42fca93e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Sep 2019 14:58:16 +0200 Subject: [PATCH 105/159] nixos/mailman: clean up our variable names --- nixos/modules/services/mail/mailman.nix | 39 +++++++++++++------------ 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 5ed07d7deb3..f30689e4e0a 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -54,20 +54,21 @@ let api_key: ${cfg.hyperkittyApiKey} ''; - djangoPyEnv = pkgs.python3.withPackages (x: with x; [postorius hyperkitty]); - - djangoExe = with pkgs; stdenv.mkDerivation { - name = "mailman-django-" + python3Packages.mailman.version; - unpackPhase = ":"; - installPhase = "install -D ${djangoPyEnv}/bin/django-admin $out/bin/mailman-django-admin"; - }; - mailmanWeb = pkgs.python3Packages.mailman-web.override { serverEMail = cfg.siteOwner; archiverKey = cfg.hyperkittyApiKey; allowedHosts = cfg.webHosts; }; + mailmanWebPyEnv = pkgs.python3.withPackages (x: with x; [mailman-web]); + + mailmanWebExe = with pkgs; stdenv.mkDerivation { + name = "mailman-django-" + python3Packages.mailman.version; + unpackPhase = ":"; + installPhase = "install -D ${mailmanWebPyEnv}/bin/django-admin $out/bin/mailman-web"; + }; + + in { ###### interface @@ -151,7 +152,7 @@ in { users.users.mailman = { description = "GNU Mailman"; isSystemUser = true; }; environment = { - systemPackages = [ mailmanExe djangoExe pkgs.sassc ]; + systemPackages = [ mailmanExe mailmanWebExe pkgs.sassc ]; etc."mailman.cfg".text = mailmanCfg; }; @@ -186,10 +187,10 @@ in { before = [ "httpd.service" ]; requiredBy = [ "httpd.service" ]; script = '' - ${djangoExe}/bin/mailman-django-admin migrate --pythonpath ${cfg.webRoot} --settings settings + ${mailmanWebExe}/bin/mailman-web migrate --pythonpath ${cfg.webRoot} --settings settings rm -rf static - ${djangoExe}/bin/mailman-django-admin collectstatic --pythonpath ${cfg.webRoot} --settings settings - ${djangoExe}/bin/mailman-django-admin compress --pythonpath ${cfg.webRoot} --settings settings + ${mailmanWebExe}/bin/mailman-web collectstatic --pythonpath ${cfg.webRoot} --settings settings + ${mailmanWebExe}/bin/mailman-web compress --pythonpath ${cfg.webRoot} --settings settings ''; serviceConfig = { User = config.services.httpd.user; @@ -215,7 +216,7 @@ in { after = [ "network.target" ]; wantedBy = [ "mailman.service" "multi-user.target" ]; serviceConfig = { - ExecStart = "${djangoExe}/bin/mailman-django-admin qcluster --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web qcluster --pythonpath ${cfg.webRoot} --settings settings"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -226,7 +227,7 @@ in { description = "Trigger minutely Hyperkitty events"; startAt = "minutely"; serviceConfig = { - ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs minutely --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs minutely --pythonpath ${cfg.webRoot} --settings settings"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -237,7 +238,7 @@ in { description = "Trigger quarter-hourly Hyperkitty events"; startAt = "*:00/15"; serviceConfig = { - ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs quarter_hourly --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs quarter_hourly --pythonpath ${cfg.webRoot} --settings settings"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -248,7 +249,7 @@ in { description = "Trigger hourly Hyperkitty events"; startAt = "hourly"; serviceConfig = { - ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs hourly --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs hourly --pythonpath ${cfg.webRoot} --settings settings"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -259,7 +260,7 @@ in { description = "Trigger daily Hyperkitty events"; startAt = "daily"; serviceConfig = { - ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs daily --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs daily --pythonpath ${cfg.webRoot} --settings settings"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -270,7 +271,7 @@ in { description = "Trigger weekly Hyperkitty events"; startAt = "weekly"; serviceConfig = { - ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs weekly --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs weekly --pythonpath ${cfg.webRoot} --settings settings"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -281,7 +282,7 @@ in { description = "Trigger yearly Hyperkitty events"; startAt = "yearly"; serviceConfig = { - ExecStart = "${djangoExe}/bin/mailman-django-admin runjobs yearly --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs yearly --pythonpath ${cfg.webRoot} --settings settings"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; From d2333beb86fc6b5abbeeecccf7d441dad9b9c37f Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 23 Jul 2019 10:32:11 +0000 Subject: [PATCH 106/159] stdenv: fix misspellings of dontPatchELF --- pkgs/applications/office/mendeley/default.nix | 2 +- pkgs/games/neverball/default.nix | 2 +- pkgs/tools/security/bitwarden/default.nix | 2 +- pkgs/tools/security/keybase/gui.nix | 2 +- pkgs/tools/security/metasploit/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 655a10d3a94..a7b0afe0754 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation { ''; dontStrip = true; - dontPatchElf = true; + dontPatchELF = true; updateScript = import ./update.nix { inherit writeScript runtimeShell; }; diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 50f96a7ee2c..daba54ce810 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng SDL2 libGL libjpeg SDL2_ttf libvorbis gettext physfs ]; - dontPatchElf = true; + dontPatchELF = true; patchPhase = '' sed -i -e 's@\./data@'$out/share/neverball/data@ share/base_config.h Makefile diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index e6874d085d2..eb67cfdaf8d 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -51,7 +51,7 @@ let dontBuild = true; dontConfigure = true; - dontPatchElf = true; + dontPatchELF = true; dontWrapGApps = true; buildInputs = [ libsecret ] ++ atomEnv.packages; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 3954ec818b1..944e73dd46c 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - dontPatchElf = true; + dontPatchELF = true; unpackPhase = '' ar xf $src diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 50341e873fa..18569d62032 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - dontPatchelf = true; # stay away from exploit executables + dontPatchELF = true; # stay away from exploit executables installPhase = '' mkdir -p $out/{bin,share/msf} From a7941fe21044a2c7656270111a78d9c23746611e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Sep 2019 15:11:34 +0200 Subject: [PATCH 107/159] nixos/mailman: create "mailman" executable as a proper wrapper script --- nixos/modules/services/mail/mailman.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index f30689e4e0a..2e41bd885e9 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -6,17 +6,17 @@ let cfg = config.services.mailman; - mailmanPyEnv = pkgs.python3.withPackages (ps: [ps.mailman ps.mailman-hyperkitty]); + mailmanPyEnv = pkgs.python3.withPackages (ps: with ps; [mailman mailman-hyperkitty]); mailmanExe = with pkgs; stdenv.mkDerivation { name = "mailman-" + python3Packages.mailman.version; + buildInputs = [makeWrapper]; unpackPhase = ":"; installPhase = '' mkdir -p $out/bin - sed >"$out/bin/mailman" <"${mailmanPyEnv}/bin/mailman" \ - -e "2 iexport MAILMAN_CONFIG_FILE=/etc/mailman.cfg" - chmod +x $out/bin/mailman - ''; + makeWrapper ${mailmanPyEnv}/bin/mailman $out/bin/mailman \ + --set MAILMAN_CONFIG_FILE /etc/mailman.cfg + ''; }; mailmanCfg = '' From d0dba96e1d9365ce3a161a7feda50266fe4bcce8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Sep 2019 15:22:37 +0200 Subject: [PATCH 108/159] nixos/mailman: properly wrap the mailman-web script --- nixos/modules/services/mail/mailman.nix | 54 +++++++++++++------------ 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 2e41bd885e9..15f5d75df8a 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -19,6 +19,25 @@ let ''; }; + mailmanWeb = pkgs.python3Packages.mailman-web.override { + serverEMail = cfg.siteOwner; + archiverKey = cfg.hyperkittyApiKey; + allowedHosts = cfg.webHosts; + }; + + mailmanWebPyEnv = pkgs.python3.withPackages (x: with x; [mailman-web]); + + mailmanWebExe = with pkgs; stdenv.mkDerivation { + inherit (mailmanWeb) name; + buildInputs = [makeWrapper]; + unpackPhase = ":"; + installPhase = '' + mkdir -p $out/bin + makeWrapper ${mailmanWebPyEnv}/bin/django-admin $out/bin/mailman-web \ + --set DJANGO_SETTINGS_MODULE settings + ''; + }; + mailmanCfg = '' [mailman] site_owner: ${cfg.siteOwner} @@ -54,21 +73,6 @@ let api_key: ${cfg.hyperkittyApiKey} ''; - mailmanWeb = pkgs.python3Packages.mailman-web.override { - serverEMail = cfg.siteOwner; - archiverKey = cfg.hyperkittyApiKey; - allowedHosts = cfg.webHosts; - }; - - mailmanWebPyEnv = pkgs.python3.withPackages (x: with x; [mailman-web]); - - mailmanWebExe = with pkgs; stdenv.mkDerivation { - name = "mailman-django-" + python3Packages.mailman.version; - unpackPhase = ":"; - installPhase = "install -D ${mailmanWebPyEnv}/bin/django-admin $out/bin/mailman-web"; - }; - - in { ###### interface @@ -187,10 +191,10 @@ in { before = [ "httpd.service" ]; requiredBy = [ "httpd.service" ]; script = '' - ${mailmanWebExe}/bin/mailman-web migrate --pythonpath ${cfg.webRoot} --settings settings + ${mailmanWebExe}/bin/mailman-web migrate rm -rf static - ${mailmanWebExe}/bin/mailman-web collectstatic --pythonpath ${cfg.webRoot} --settings settings - ${mailmanWebExe}/bin/mailman-web compress --pythonpath ${cfg.webRoot} --settings settings + ${mailmanWebExe}/bin/mailman-web collectstatic + ${mailmanWebExe}/bin/mailman-web compress ''; serviceConfig = { User = config.services.httpd.user; @@ -216,7 +220,7 @@ in { after = [ "network.target" ]; wantedBy = [ "mailman.service" "multi-user.target" ]; serviceConfig = { - ExecStart = "${mailmanWebExe}/bin/mailman-web qcluster --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web qcluster"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -227,7 +231,7 @@ in { description = "Trigger minutely Hyperkitty events"; startAt = "minutely"; serviceConfig = { - ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs minutely --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs minutely"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -238,7 +242,7 @@ in { description = "Trigger quarter-hourly Hyperkitty events"; startAt = "*:00/15"; serviceConfig = { - ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs quarter_hourly --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs quarter_hourly"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -249,7 +253,7 @@ in { description = "Trigger hourly Hyperkitty events"; startAt = "hourly"; serviceConfig = { - ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs hourly --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs hourly"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -260,7 +264,7 @@ in { description = "Trigger daily Hyperkitty events"; startAt = "daily"; serviceConfig = { - ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs daily --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs daily"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -271,7 +275,7 @@ in { description = "Trigger weekly Hyperkitty events"; startAt = "weekly"; serviceConfig = { - ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs weekly --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs weekly"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; @@ -282,7 +286,7 @@ in { description = "Trigger yearly Hyperkitty events"; startAt = "yearly"; serviceConfig = { - ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs yearly --pythonpath ${cfg.webRoot} --settings settings"; + ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs yearly"; User = config.services.httpd.user; WorkingDirectory = "/var/lib/mailman-web"; }; From b0326145da9697821bc16bf0d8c758f2699ad66a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 5 Sep 2019 22:24:31 +0100 Subject: [PATCH 109/159] mirrorbits: Fix build with go 1.12 --- pkgs/servers/mirrorbits/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 48817f76bda..0761468bd1f 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -24,6 +24,11 @@ buildGoPackage rec { rm -rf testing ''; + # Fix build with go >=1.12 + preBuild = '' + sed -i s/"_Ctype_struct_GeoIPRecordTag"/"C.struct_GeoIPRecordTag"/ ./go/src/github.com/etix/geoip/geoip.go + ''; + goPackagePath = "github.com/etix/mirrorbits"; goDeps = ./deps.nix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9af01e631a..827b185adec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4798,11 +4798,7 @@ in miredo = callPackage ../tools/networking/miredo { }; - mirrorbits = callPackage ../servers/mirrorbits { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + mirrorbits = callPackage ../servers/mirrorbits { }; mitmproxy = callPackage ../tools/networking/mitmproxy { }; From a26a274a681dd32927926365f316a2d06d599ccf Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 5 Sep 2019 22:27:09 +0100 Subject: [PATCH 110/159] mongodb-tools: 3.7.2 -> 4.2.0 Fix build with latest Go --- pkgs/tools/misc/mongodb-tools/default.nix | 41 ++++++++++++++--------- pkgs/top-level/all-packages.nix | 6 +--- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index dc7a64bdcf7..fd95faa40e1 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -1,27 +1,38 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, openssl_1_0_2, pkgconfig, libpcap }: +{ stdenv +, lib +, buildGoPackage +, fetchFromGitHub +, openssl_1_0_2 +, pkgconfig +, libpcap +}: let tools = [ - "bsondump" "mongodump" "mongoexport" "mongofiles" "mongoimport" - "mongoreplay" "mongorestore" "mongostat" "mongotop" + "bsondump" + "mongoimport" + "mongoexport" + "mongodump" + "mongorestore" + "mongostat" + "mongofiles" + "mongotop" + "mongoreplay" ]; -in + version = "4.2.0"; -with stdenv.lib; - -buildGoPackage rec { +in buildGoPackage { pname = "mongo-tools"; - version = "3.7.2"; - rev = "r${version}"; + inherit version; goPackagePath = "github.com/mongodb/mongo-tools"; - subPackages = map (t: t + "/main") tools; + subPackages = tools; src = fetchFromGitHub { - inherit rev; + rev = "r${version}"; owner = "mongodb"; repo = "mongo-tools"; - sha256 = "1y5hd4qw7422sqkj8vmy4agscvin3ck54r515bjrzn69iw73nhfl"; + sha256 = "0mjwvx0cxvb6zam6jyr3753xjnwcygxcjzqhhlsq0b3xnwws9yh7"; }; nativeBuildInputs = [ pkgconfig ]; @@ -31,18 +42,18 @@ buildGoPackage rec { # Let's work around this with our own installer buildPhase = '' # move vendored codes so nixpkgs go builder could find it - mv go/src/github.com/mongodb/mongo-tools/vendor/src/* go/src/github.com/mongodb/mongo-tools/vendor/ - runHook preBuild + ${stdenv.lib.concatMapStrings (t: '' go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main '') tools} + runHook postBuild ''; meta = { homepage = https://github.com/mongodb/mongo-tools; description = "Tools for the MongoDB"; - license = licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 827b185adec..ca62b5705f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1993,11 +1993,7 @@ in mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - mongodb-tools = callPackage ../tools/misc/mongodb-tools { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; moosefs = callPackage ../tools/filesystems/moosefs { }; From 3e501fe16811faae70e541f66a70893622a77aa4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 5 Sep 2019 22:31:55 +0100 Subject: [PATCH 111/159] go_1_11: Drop package It's unsupported by upstream. --- pkgs/development/compilers/go/1.11.nix | 232 ------------------------- pkgs/top-level/all-packages.nix | 11 -- 2 files changed, 243 deletions(-) delete mode 100644 pkgs/development/compilers/go/1.11.nix diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix deleted file mode 100644 index 32847a2671c..00000000000 --- a/pkgs/development/compilers/go/1.11.nix +++ /dev/null @@ -1,232 +0,0 @@ -{ stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation -, mailcap, runtimeShell -, buildPackages, pkgsTargetTarget -}: - -let - - inherit (stdenv.lib) optionals optionalString; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - i686 = "386"; - x86_64 = "amd64"; - aarch64 = "arm64"; - arm = "arm"; - armv5tel = "arm"; - armv6l = "arm"; - armv7l = "arm"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.11.13"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0xj0pbviikdf8g0sfz5hwxf7hwz8b8g5akqnrvyclhgnsdghjcjh"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; - buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - substituteInPlace src/mime/type_unix.go \ - --replace '/etc/mime.types' '${mailcap}/etc/mime.types' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/areturn' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/areturn' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - '' + optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.12.1.patch - ./remove-test-pie.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./remove-fhs-test-references.patch - ./skip-external-network-tests.patch - ./skip-nohup-tests.patch - # breaks under load: https://github.com/golang/go/issues/25628 - ./skip-test-extra-files-on-386.patch - ]; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" - else - null; - - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - # Independent from host/target, CC should produce code for the building system. - export CC=${buildPackages.stdenv.cc}/bin/cc - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/{bootstrap,obj} - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ goBootstrap ]; - - meta = with stdenv.lib; { - branch = "1.11"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca62b5705f4..ad045f9eb3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7900,10 +7900,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_11 = callPackage ../development/compilers/go/1.11.nix { - inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; - go_1_12 = callPackage ../development/compilers/go/1.12.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; }; @@ -14341,19 +14337,12 @@ in ### DEVELOPMENT / GO MODULES - buildGo111Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_11; - }; buildGo112Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_12; }; buildGoPackage = buildGo112Package; - buildGo111Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_11; - }; - buildGo112Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_12; }; From 9fd90aa8254398af8a248cfc9da932d9f227b9dc Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 11 Sep 2019 15:48:28 +0200 Subject: [PATCH 112/159] prometheus-blackbox-exporter: 0.14.0 -> 0.15.0 --- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 970f49713a3..983eb6bf6c8 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "blackbox_exporter"; - version = "0.14.0"; + version = "0.15.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1v5n59p9jl6y1ka9mqp0ibx1kpcb3gbpl0i6bhqpbr154frmqm4x"; + sha256 = "06llb37xpn5zjnqkw526vbk4mfdiwrv3yg7aw4365p3gz5dk085i"; }; doCheck = true; From f42258c54dff29adbf38d0883ff4ecf081a30f54 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 11 Sep 2019 15:50:39 +0200 Subject: [PATCH 113/159] terraform: default to version 0.12 (#68497) --- 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 c9af01e631a..43c5f603bab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24336,7 +24336,7 @@ in terraform_plugins_test ; - terraform = terraform_0_11; + terraform = terraform_0_12; # deprecated terraform-full = terraform.full; From c8802e1aed466fc35940f4f9b668c42ad84c6e0d Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 11 Sep 2019 22:59:24 +0900 Subject: [PATCH 114/159] flashplayer: add maintainer --- .../networking/browsers/mozilla-plugins/flashplayer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 2f90736a8d7..fb3a6723817 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; license = stdenv.lib.licenses.unfree; - maintainers = []; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } From 1593d9169266bc4893f7ed04887ba259f8f385cc Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 5 Sep 2019 17:06:19 +0200 Subject: [PATCH 115/159] buildah: 1.10.1 -> 1.11.0 Signed-off-by: Sascha Grunert --- pkgs/development/tools/buildah/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3e6d6604885..4286e37ebef 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ }: let - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "buildah"; - sha256 = "0dki2v8j2jzbw49sdzcyjqbalbh70m0lgzrldgj6cc92mj896pxk"; + sha256 = "114dmjqacz5hairl1s8qhndzr52lcvh99g565cq5ydscblnzpw1b"; }; goPackagePath = "github.com/containers/buildah"; @@ -32,7 +32,6 @@ in buildGoPackage { buildPhase = '' pushd go/src/${goPackagePath} - patchShebangs . make GIT_COMMIT="unknown" install -Dm755 buildah $bin/bin/buildah ''; From 27b459ce1e8b69cd545b9b32f00b1a84392fdcd9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 11 Sep 2019 14:06:37 +0000 Subject: [PATCH 116/159] nixos/mailman: types.string -> types.str --- nixos/modules/services/mail/mailman.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 15f5d75df8a..e917209f3d1 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -109,7 +109,7 @@ in { }; webHosts = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; description = '' The list of hostnames and/or IP addresses from which the Mailman Web From 5c5fc136028a0cac83397f8b58ae3096074b2e34 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 9 Sep 2019 15:23:42 +0200 Subject: [PATCH 117/159] wt3: 3.4.0 -> 3.4.1, include harfbuzz --- pkgs/development/libraries/wt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 958257ffe76..d38e191080e 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu , pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl -, pcre +, pcre, harfbuzz }: let @@ -31,6 +31,7 @@ let "-DWT_CPP_11_MODE=-std=c++11" "-DGM_PREFIX=${graphicsmagick}" "-DMYSQL_PREFIX=${mysql.connector-c}" + "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include" "--no-warn-unused-cli" ]; @@ -44,8 +45,8 @@ let }; in { wt3 = generic { - version = "3.4.0"; - sha256 = "0y0b2h9jf5cg1gdh48dj32pj5nsvipab1cgygncxf98c46ikhysg"; + version = "3.4.1"; + sha256 = "1bsx7hmy6g2x9p3vl5xw9lv1xk891pnvs93a87s15g257gznkjmj"; }; wt4 = generic { From 823e8accb945ab449c082c179e6ca755439c9c59 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 9 Sep 2019 15:26:22 +0200 Subject: [PATCH 118/159] wt4: 4.1.0 -> 4.1.1 --- pkgs/development/libraries/wt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index d38e191080e..319b0effc57 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -50,7 +50,7 @@ in { }; wt4 = generic { - version = "4.1.0"; - sha256 = "1a9nl5gs8m8pssf2l3z6kbl2rc9fw5ad7lfslw5yr3gzi0zqn05x"; + version = "4.1.1"; + sha256 = "1f1imx5kbpqlysrqx5h75hf2f8pkq972rz42x0pl6cxbnsyzngid"; }; } From 982b85b578ee58f1b157cca42ee5a7ba7a160796 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 2 Jul 2019 14:20:24 +0000 Subject: [PATCH 119/159] plyplus: enable for python3 --- pkgs/development/python-modules/plyplus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/plyplus/default.nix b/pkgs/development/python-modules/plyplus/default.nix index 2b18d114f3f..41327c6fc48 100644 --- a/pkgs/development/python-modules/plyplus/default.nix +++ b/pkgs/development/python-modules/plyplus/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ply ]; - disabled = isPy3k; + doCheck = !isPy3k; meta = { homepage = https://github.com/erezsh/plyplus; From 3ec8bc5ef2bfa3c9610e45fbcf678a8de2c4a412 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 31 Dec 2018 16:49:19 +0800 Subject: [PATCH 120/159] pythonPackages.tvnamer: pytest belongs in checkInputs --- pkgs/development/python-modules/tvnamer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix index bc2f8807eaa..b0df4008992 100644 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "75e38454757c77060ad3782bd071682d6d316de86f9aec1c2042d236f93aec7b"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ tvdb_api ]; # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or .. From 4c38d83e63c9632e8f5a73c8672146d9efee8991 Mon Sep 17 00:00:00 2001 From: ivegotasthma Date: Wed, 11 Sep 2019 19:27:11 +0200 Subject: [PATCH 121/159] electrum.ltc: 3.1.3.1 -> 3.3.8.1 --- pkgs/applications/misc/electrum/ltc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index a5e4bd74a6e..0a28efbc28c 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "electrum-ltc"; - version = "3.1.3.1"; + version = "3.3.8.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; From c82b347947052216c9203425d7970293a586a28a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Sep 2019 19:53:44 +0200 Subject: [PATCH 122/159] lib: fix typo in 'zipAttrsWith' documentation --- lib/attrsets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index d374d229f59..086c3d746fc 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -354,7 +354,7 @@ rec { => { a = ["x" "y"]; b = ["z"] } */ zipAttrsWith = f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets; - /* Like `zipAttrsWith' with `(name: values: value)' as the function. + /* Like `zipAttrsWith' with `(name: values: values)' as the function. Example: zipAttrs [{a = "x";} {a = "y"; b = "z";}] From 7eb6027aa47693d261d623b5a2abfa2fa1be4afc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 11 Sep 2019 22:06:37 +0300 Subject: [PATCH 123/159] lutris: add fribidi as winetricks dependency --- pkgs/applications/misc/lutris/chrootenv.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index ab40dfc8131..2334221f926 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -104,6 +104,9 @@ in buildFHSUserEnv { # WINE cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap ocl-icd utillinux + + # Winetricks + fribidi ] ++ xorgDeps pkgs; extraInstallCommands = '' From 264369254c46199b244cc54e8993280c1f83ca3f Mon Sep 17 00:00:00 2001 From: Roosembert Palacios Date: Wed, 11 Sep 2019 21:24:32 +0200 Subject: [PATCH 124/159] youtube-dl: 2019.09.01 -> 2019.09.12 Signed-off-by: Roosembert Palacios --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d378e541b50..46c009d9bfd 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.09.01"; + version = "2019.09.12"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0jbby0x5krww1acc8qxhmmwg0dsqmj6yjnynfm7r6k3rxbvlydqr"; + sha256 = "0wmc0rl4l08hnz3agh69ld1pcmjs7czg0d2k7mnnlxhwlwi38w56"; }; nativeBuildInputs = [ makeWrapper ]; From bcaa3e702f099d5dfc0b04f8b4478119b4549c29 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 11 Sep 2019 22:04:45 +0200 Subject: [PATCH 125/159] scdoc: 1.9.7 -> 1.10.0 --- pkgs/tools/typesetting/scdoc/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 9b695100150..011a8f24ece 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,19 +2,17 @@ stdenv.mkDerivation rec { pname = "scdoc"; - version = "1.9.7"; + version = "1.10.0"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "0y9p03dzdaszx02jbkdf3vcs52fqml591cmic5jdch5yznrg03ky"; + sha256 = "0lk8wpz95ld1fnpnc3xkhvnd58px1vbhvlpkr8labi2ck65y10il"; }; postPatch = '' substituteInPlace Makefile \ --replace "-static" "" \ --replace "/usr/local" "$out" - # It happens from time to time that the version wasn't updated: - sed -iE 's/VERSION=[0-9]\.[0-9]\.[0-9]/VERSION=${version}/' Makefile ''; doCheck = true; From 99ec6416c549c1fb0e64d76fa2c99da3c9d11792 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Wed, 11 Sep 2019 22:14:33 +0200 Subject: [PATCH 126/159] youtube-dl: 2019.09.12 -> 2019.09.12.1 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 46c009d9bfd..98449f8f554 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.09.12"; + version = "2019.09.12.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0wmc0rl4l08hnz3agh69ld1pcmjs7czg0d2k7mnnlxhwlwi38w56"; + sha256 = "0h7v81kcxcpy82wq9b1aiz2zg6hg7rnlcfmzd13j6k8yhr7ah9yf"; }; nativeBuildInputs = [ makeWrapper ]; From 991360fe105ec2ab8e141acca91b1186b109d32e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 11 Sep 2019 22:35:48 +0200 Subject: [PATCH 127/159] androidStudioPackages.{dev,canary}: 3.6.0.10 -> 3.6.0.11 --- 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 b5381983240..2a9129cfebf 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.10"; # "Android Studio 3.6 Canary 10" - build = "192.5842447"; - sha256Hash = "0qyvqm0ihp6czx77skia87qnz87wrsp1a6la04dr4b0xln2c8m5b"; + version = "3.6.0.11"; # "Android Studio 3.6 Canary 11" + build = "192.5863777"; + sha256Hash = "1wz4vcdj4225vffsq0ji4zgg9qaqlfd21x7c6nczhqvydbyrjzg8"; }; in { # Attributes are named by their corresponding release channels From 9273a22c48ac67ee9cee32809f61504840573359 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 11 Sep 2019 23:43:27 +0000 Subject: [PATCH 128/159] =?UTF-8?q?insomnia:=206.5.3=20=E2=86=92=206.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/web/insomnia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 81417f6287b..675564b789b 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -18,11 +18,11 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "6.5.3"; + version = "6.6.2"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "0km7anw5xpcfr6j7pwqhv26pk7nxv1jywqlz0lpvgj6w85aafcm3"; + sha256 = "0hlny3lac7whdbpp0pcyaa30h6x9536jsg95gj9irw2qjsx74xa7"; }; nativeBuildInputs = [ From 7644e883348383aa9b9c164c25790f9e71557044 Mon Sep 17 00:00:00 2001 From: Jason Carr Date: Wed, 11 Sep 2019 23:12:39 -0400 Subject: [PATCH 129/159] lesspass: fix src --- pkgs/tools/security/lesspass-cli/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix index afcdf0c0a07..76732170079 100644 --- a/pkgs/tools/security/lesspass-cli/default.nix +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -2,14 +2,15 @@ let inherit (python3.pkgs) buildPythonApplication pytest mock pexpect; + repo = "lesspass"; in buildPythonApplication rec { pname = "lesspass-cli"; version = "9.0.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = repo; + repo = repo; rev = version; sha256 = "1mdv0c0fn4d72iigy8hz4s7kf7q3pg4gjjadxwxyjwsalapnsapk"; }; From 428a58ad7f109280356985d84f78c157fecbfd53 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 12 Sep 2019 11:56:37 +0800 Subject: [PATCH 130/159] kdepim-addons: add missing dependency --- pkgs/applications/kde/kdepim-addons.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index 75c1bf5be8b..0fe33ea017d 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -5,7 +5,7 @@ incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, - kitinerary + kitinerary, kontactinterface }: mkDerivation { @@ -20,6 +20,6 @@ mkDerivation { incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar libksieve mailcommon mailimporter messagelib poppler prison kpkpass - kitinerary + kitinerary kontactinterface ]; } From d526e331f82cf8f9592994c20ec4cc7214ca9b7f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 12 Sep 2019 00:18:11 +0300 Subject: [PATCH 131/159] xchm: 1.23 -> 1.30 --- pkgs/applications/misc/xchm/default.nix | 30 ++++++++++++++++--------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index a7a6500fd22..6a5e62f54e1 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -1,22 +1,30 @@ -{stdenv, fetchurl, wxGTK, chmlib}: +{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }: -stdenv.mkDerivation { - name = "xchm-1.23"; - src = fetchurl { - url = mirror://sourceforge/xchm/xchm-1.23.tar.gz; - sha256 = "0qn0fyxcrn30ndq2asx31k0qkx3grbm16fb1y580wd2gjmh5r3wg"; +stdenv.mkDerivation rec { + pname = "xchm"; + version = "1.30"; + + src = fetchFromGitHub { + owner = "rzvncj"; + repo = "xCHM"; + rev = version; + sha256 = "1sjvh06m8jbb28k6y3knas3nkh1dfvff4mlwjs33x12ilhddhr8v"; }; - buildInputs = [wxGTK chmlib]; - postConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS $(${wxGTK}/lib/wx/config/* --libs | sed -e s@-pthread@@)" - echo $NIX_LDFLAGS + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ wxGTK30 chmlib ]; + + configureFlags = [ "--with-wx-prefix=${wxGTK30}" ]; + + preConfigure = '' + export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0" ''; meta = with stdenv.lib; { description = "A viewer for Microsoft HTML Help files"; - homepage = http://xchm.sourceforge.net; + homepage = "https://github.com/rzvncj/xCHM"; license = licenses.gpl2; + maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; }; } From 54752cd3c4da5a2505bae328702b15c4541816d4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Sep 2019 11:21:26 +0200 Subject: [PATCH 132/159] mautrix-telegram: fix startup `setuptools` isn't propagated automatically anymore, see also #68314. --- pkgs/servers/mautrix-telegram/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 7499f203136..5ee491a0b8a 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { telethon-session-sqlalchemy pillow lxml + setuptools ]; # `alembic` (a database migration tool) is only needed for the initial setup, From 5f649b2a10e7bb40607fe98cee67a499ea227ef6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 12 Sep 2019 17:23:14 +0800 Subject: [PATCH 133/159] crun: init at 0.8 --- .../virtualization/crun/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/virtualization/crun/default.nix diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix new file mode 100644 index 00000000000..7dddc3b533b --- /dev/null +++ b/pkgs/applications/virtualization/crun/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, go-md2man, pkgconfig +, libcap, libseccomp, python3, systemd, yajl }: + +stdenv.mkDerivation rec { + pname = "crun"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = version; + sha256 = "1anvlgw373031w0pp0b28l10yrnyhbj192n60bbbjahw487dk2fi"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ autoreconfHook go-md2man pkgconfig python3 ]; + + buildInputs = [ libcap libseccomp systemd yajl ]; + + enableParallelBuilding = true; + + # the tests require additional permissions + doCheck = false; + + meta = with lib; { + description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; + license = licenses.gpl3; + platforms = platforms.linux; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca37025f7f3..763ceed7bb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17690,6 +17690,8 @@ in cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; + crun = callPackage ../applications/virtualization/crun {}; + csdp = callPackage ../applications/science/math/csdp { }; ctop = callPackage ../tools/system/ctop { }; From 0f95f6922de9fcc7e8ca055090f410caca6c4cd6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 12 Sep 2019 17:19:02 +0800 Subject: [PATCH 134/159] buildah: minor cleanups Was meant to be a part of 1.10.1 -> 1.11.0 but somebody else beat me to that. --- pkgs/development/tools/buildah/default.nix | 25 +++++++--------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 4286e37ebef..9885dce04b2 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -2,31 +2,22 @@ , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp }: -let +buildGoPackage rec { + pname = "buildah"; version = "1.11.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "containers"; repo = "buildah"; + rev = "v${version}"; sha256 = "114dmjqacz5hairl1s8qhndzr52lcvh99g565cq5ydscblnzpw1b"; }; - goPackagePath = "github.com/containers/buildah"; - -in buildGoPackage { - pname = "buildah"; - inherit version; - inherit src; - outputs = [ "bin" "man" "out" ]; - inherit goPackagePath; + goPackagePath = "github.com/containers/buildah"; excludedPackages = [ "tests" ]; - # Optimizations break compilation of libseccomp c bindings - hardeningDisable = [ "fortify" ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ]; @@ -40,10 +31,10 @@ in buildGoPackage { make -C docs install PREFIX="$man" ''; - meta = { + meta = with stdenv.lib; { description = "A tool which facilitates building OCI images"; - homepage = https://github.com/containers/buildah; - maintainers = with stdenv.lib.maintainers; [ Profpatsch vdemeester ]; - license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/containers/buildah"; + license = licenses.asl20; + maintainers = with maintainers; [ Profpatsch vdemeester ]; }; } From 82b7e9baf3c5367df0c4d80decfdef1551aa3b18 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 12 Sep 2019 12:48:40 +0200 Subject: [PATCH 135/159] CODEOWNERS: add myself for prometheus exporters --- .github/CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 58834f4597e..60fcf520ac1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -150,3 +150,8 @@ /pkgs/applications/editors/emacs-modes @adisbladis /pkgs/applications/editors/emacs @adisbladis /pkgs/top-level/emacs-packages.nix @adisbladis + +# Prometheus exporter modules and tests +/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz +/nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz +/nixos/tests/prometheus-exporters.nix @WilliButz From 383d3a43e565f7107959e4065336ae90cbad257f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Thu, 12 Sep 2019 13:03:49 +0200 Subject: [PATCH 136/159] rtmidi: add PulseAudio support --- pkgs/development/libraries/audio/rtaudio/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index dad36209ed8..3c1b744af75 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, rtmidi }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pulseaudio, rtmidi }: stdenv.mkDerivation rec { version = "5.1.0"; @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ]; + buildInputs = [ autoconf automake libtool libjack2 alsaLib pulseaudio rtmidi ]; preConfigure = '' ./autogen.sh --no-configure ./configure ''; - meta = { + meta = with stdenv.lib; { description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; homepage = http://www.music.mcgill.ca/~gary/rtaudio/; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = licenses.mit; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; }; } From dad77d59cb6aaaee503cb3d3469acc6db29dddf4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 12 Sep 2019 08:06:57 -0400 Subject: [PATCH 137/159] ammonite: 1.6.9 -> 1.7.1 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 8b44203a7d2..ff630242c93 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "ammonite"; - version = "1.6.9"; + version = "1.7.1"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "1fi5j0kcndq00x72d8bkx6qiy9nh2i6c6m29gzfqql52qgbq1fd0"; + sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0"; }; propagatedBuildInputs = [ jre ] ; From 0e879bfe8d0313df1a3b5455d4e46c8c16776000 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 12 Sep 2019 14:13:26 +0200 Subject: [PATCH 138/159] v8: fix build on aarch64 --- pkgs/development/libraries/v8/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index e367d8242de..ff0a599c3e9 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -73,6 +73,11 @@ stdenv.mkDerivation rec { chmod u+w -R . ''; + postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' + substituteInPlace build/toolchain/linux/BUILD.gn \ + --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + ''; + gnFlags = [ "use_custom_libcxx=false" "is_clang=${if stdenv.cc.isClang then "true" else "false"}" From ee9e7ef1deead35faf0c4a66fdc984b975bdccec Mon Sep 17 00:00:00 2001 From: Henrik Jonsson Date: Mon, 12 Aug 2019 11:59:40 +0400 Subject: [PATCH 139/159] maintainers: Add hkjn --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fe6b51c0259..f28161573dd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2602,6 +2602,15 @@ email = "t@larkery.com"; name = "Tom Hinton"; }; + hkjn = { + email = "me@hkjn.me"; + name = "Henrik Jonsson"; + github = "hkjn"; + keys = [{ + longkeyid = "rsa4096/0x03EFBF839A5FDC15"; + fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15"; + }]; + }; hlolli = { email = "hlolli@gmail.com"; github = "hlolli"; From ac975ddd8f7dea78f8e7288356c399233e96bc7b Mon Sep 17 00:00:00 2001 From: Henrik Jonsson Date: Thu, 12 Sep 2019 16:38:18 +0200 Subject: [PATCH 140/159] tor-browser-bundle-bin: 8.5.4 -> 8.5.5 --- .../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 c0cb85eb177..739315917d4 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.5.4"; + version = "8.5.5"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z"; + sha256 = "00r5k9bbfpv3s6shxqypl13psr1zz51xiyz3vmm4flhr2qa4ycsz"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1b34skl3hwvpy0r4l5ykgnnwhbz7cvly2gi9ib4h7lijjfafiys1"; + sha256 = "1nxvw5kiggfr4n5an436ass84cvwjviaa894kfm72yf2ls149f29"; }; }; in From 2a7c0f2ab953226ab65a89600be1f20cb3776dcf Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 10 Sep 2019 21:15:34 +0200 Subject: [PATCH 141/159] conftest: 0.7.0 -> 0.12.0, ensure go 1.13 compatibility --- pkgs/development/tools/conftest/default.nix | 12 ++- .../tools/conftest/go-1.13-deps.patch | 99 +++++++++++++++++++ 2 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/conftest/go-1.13-deps.patch diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 192938473e0..4c8792cc6aa 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,21 +2,27 @@ buildGoModule rec { pname = "conftest"; - version = "0.7.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "instrumenta"; repo = "conftest"; rev = "v${version}"; - sha256 = "0qq2kp9h91rirlhml5vyzmi7rd4v3pkqjk2bn7mvdn578jnwww24"; + sha256 = "0blrbbnvnnxyw0idhglqdz16i7g6g86a6kw2iw707bg0yfdl1ncq"; }; + patches = [ + # Version 0.12.0 does not build with go 1.13. See https://github.com/instrumenta/conftest/pull/85. + # TODO: Remove once https://github.com/instrumenta/conftest/pull/85 is merged and lands in a release. + ./go-1.13-deps.patch + ]; + buildFlagsArray = '' -ldflags= -X main.version=${version} ''; - modSha256 = "0c9phka7n2cfi8lf0a3prks2pjna5dgf5lj6az82iklnq4p7177y"; + modSha256 = "11999ywy73ng45gl1qypky8342jvishcp11bdxbigvqhwl2zbpav"; meta = with lib; { description = "Write tests against structured configuration data"; diff --git a/pkgs/development/tools/conftest/go-1.13-deps.patch b/pkgs/development/tools/conftest/go-1.13-deps.patch new file mode 100644 index 00000000000..d03d4ed742a --- /dev/null +++ b/pkgs/development/tools/conftest/go-1.13-deps.patch @@ -0,0 +1,99 @@ +diff --git a/go.mod b/go.mod +index a552a6b..a39703d 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,6 @@ + module github.com/instrumenta/conftest + +-go 1.12 ++go 1.13 + + require ( + cloud.google.com/go v0.39.0 // indirect +@@ -43,12 +43,16 @@ require ( + golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect + golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0 // indirect + golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09 // indirect ++ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect + google.golang.org/appengine v1.6.0 // indirect + google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601 // indirect + ) + + replace ( ++ git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 + github.com/containerd/containerd => github.com/containerd/containerd v1.2.6 + github.com/docker/docker => github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd + github.com/golang/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422 ++ github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e => github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e ++ golang.org/x/crypto v0.0.0-20190129210102-0709b304e793 => golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 + ) +diff --git a/go.sum b/go.sum +index 2441c4e..212ac69 100644 +--- a/go.sum ++++ b/go.sum +@@ -10,7 +10,6 @@ dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl + dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= + dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= + dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= +-git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= + github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +@@ -43,6 +42,7 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU + github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= + github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod h1:LzD22aAzDP8/dyiCKFp31He4m2GPjl0AFyzDtZzUu9M= + github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= ++github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= + github.com/apparentlymart/go-cidr v1.0.0 h1:lGDvXx8Lv9QHjrAVP7jyzleG4F9+FkRhJcEsDFxeb8w= + github.com/apparentlymart/go-cidr v1.0.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= + github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= +@@ -132,13 +132,8 @@ github.com/docker/cli v0.0.0-20190511004558-53fc257292ad/go.mod h1:JLrzqnKDaYBop + github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= + github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= + github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +-github.com/docker/docker v0.0.0-20180531152204-71cd53e4a197/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= + github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd h1:h98Vus5/NAC3I4k243/B/KgCdpjCUK4lfxNEw2p/HAc= + github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +-github.com/docker/docker v1.14.0-0.20190131205458-8a43b7bb99cd h1:adRHD5aU4yFK0L4yZwjY3SyWapVmPdq1h19eJdgYUfs= +-github.com/docker/docker v1.14.0-0.20190131205458-8a43b7bb99cd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +-github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c h1:rZ+3jNsgjvYgdZ0Nrd4Udrv8rneDbWBohAPuXsTsvGU= +-github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= + github.com/docker/docker-credential-helpers v0.6.0/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= + github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= + github.com/docker/docker-credential-helpers v0.6.2 h1:CrW9H1VMf3a4GrtyAi7IUJjkJVpwBBpX0+mvkvYJaus= +@@ -214,6 +209,7 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg + github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= + github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= + github.com/google/shlex v0.0.0-20150127133951-6f45313302b9/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE= ++github.com/googleapis/gax-go v2.0.0+incompatible h1:j0GKcs05QVmm7yesiZq2+9cxHkNK9YM6zKx4D2qucQU= + github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= + github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= + github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc= +@@ -407,8 +403,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM + github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y= + github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= + github.com/opencontainers/runc v1.0.0-rc6/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +-github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e h1:+uPGJuuDl61O9GKN/rLHkUCf597mpxmJI06RqMQX81A= +-github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= ++github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e h1:9wcty7nGPPNkY8/VsiZkjmMB8x7SydrklJE+vCr4uDg= ++github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= + github.com/opencontainers/runtime-spec v0.0.0-20180909173843-eba862dc2470/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= + github.com/opentracing-contrib/go-stdlib v0.0.0-20171029140428-b1a47cfbdd75/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= + github.com/opentracing/opentracing-go v0.0.0-20171003133519-1361b9cd60be/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +@@ -587,7 +583,6 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf + golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= + golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= + golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +-golang.org/x/crypto v0.0.0-20190129210102-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= + golang.org/x/crypto v0.0.0-20190129210102-ccddf3741a0c/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= + golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= + golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +@@ -679,6 +674,8 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262 h1:qsl9y/CJx34tuA7QCPNp86J + golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= + golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg= + golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= ++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= + google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= + google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= From f6517742dfc74956a2d61fe798825fcd3e63ddeb Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 12 Sep 2019 11:58:38 -0400 Subject: [PATCH 142/159] viking: fix broken build --- pkgs/applications/misc/viking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index cda3b1a6f85..2d8a860e7e8 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme -, geoclue2, liboauth }: +, geoclue2, liboauth, nettle }: stdenv.mkDerivation rec { pname = "viking"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme - geoclue2 liboauth + geoclue2 liboauth nettle ]; configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ]; From 1fca7a89617dc880ac4274b2a3c6a75257581384 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 12 Sep 2019 11:23:35 -0400 Subject: [PATCH 143/159] prayer: fix broken build --- pkgs/servers/prayer/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 7997d0ebcd8..d1351afa0b3 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, html-tidy, pam}: +{ stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}: let ssl = stdenv.lib.optionals uwimap.withSSL @@ -12,7 +12,20 @@ stdenv.mkDerivation rec { sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda"; }; - patches = [ ./install.patch ]; + patches = [ + ./install.patch + + # fix build errors which result from openssl changes + (fetchpatch { + url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/disable_ssl3.patch"; + sha256 = "1rx4bidc9prh4gffipykp144cyi3zd6qzd990s2aad3knzv5bkdd"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/openssl1.1.patch"; + sha256 = "0zinylvq3bcifdmki867gir49pbjx6qb5h019hawwif2l4jmlxw1"; + }) + ]; + postPatch = '' sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \ ${ssl} \ From 26a48bb0375fb9f0f8a5797e08c08550ec892fdb Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 12 Sep 2019 12:28:56 -0400 Subject: [PATCH 144/159] liquidwar5: fix broken build --- pkgs/games/liquidwar/5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index 0bd90f77b24..a4bd39f9998 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = [ "-lm" ]; + meta = with stdenv.lib; { description = ''The classic version of a quick tactics game LiquidWar''; maintainers = [ maintainers.raskin ]; From a61e94329fd1698e31ffb798b7ed50e882249d49 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 1 Dec 2018 12:49:16 -0600 Subject: [PATCH 145/159] nixos: shuffle all ntp services into their own dir This is reckless, ill-advised, pointless, and I will be scorned for it, but it makes me feel a lot better. Signed-off-by: Austin Seipp --- nixos/modules/module-list.nix | 6 +++--- nixos/modules/services/networking/{ => ntp}/chrony.nix | 0 nixos/modules/services/networking/{ => ntp}/ntpd.nix | 0 nixos/modules/services/networking/{ => ntp}/openntpd.nix | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename nixos/modules/services/networking/{ => ntp}/chrony.nix (100%) rename nixos/modules/services/networking/{ => ntp}/ntpd.nix (100%) rename nixos/modules/services/networking/{ => ntp}/openntpd.nix (100%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5b7f391ed5a..fb8453f1d53 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -567,7 +567,6 @@ ./services/networking/bird.nix ./services/networking/bitlbee.nix ./services/networking/charybdis.nix - ./services/networking/chrony.nix ./services/networking/cjdns.nix ./services/networking/cntlm.nix ./services/networking/connman.nix @@ -650,14 +649,15 @@ ./services/networking/nntp-proxy.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix - ./services/networking/ntpd.nix + ./services/networking/ntp/chrony.nix + ./services/networking/ntp/ntpd.nix + ./services/networking/ntp/openntpd.nix ./services/networking/nullidentdmod.nix ./services/networking/nylon.nix ./services/networking/ocserv.nix ./services/networking/ofono.nix ./services/networking/oidentd.nix ./services/networking/openfire.nix - ./services/networking/openntpd.nix ./services/networking/openvpn.nix ./services/networking/ostinato.nix ./services/networking/owamp.nix diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix similarity index 100% rename from nixos/modules/services/networking/chrony.nix rename to nixos/modules/services/networking/ntp/chrony.nix diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix similarity index 100% rename from nixos/modules/services/networking/ntpd.nix rename to nixos/modules/services/networking/ntp/ntpd.nix diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/ntp/openntpd.nix similarity index 100% rename from nixos/modules/services/networking/openntpd.nix rename to nixos/modules/services/networking/ntp/openntpd.nix From f0ad5ebdfb545cafd1df1c4c9b0d19f6bdec23ae Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 1 Dec 2018 12:55:31 -0600 Subject: [PATCH 146/159] nixos/{chrony,ntpd,openntpd}: add myself as maintainer Signed-off-by: Austin Seipp --- nixos/modules/services/networking/ntp/chrony.nix | 2 ++ nixos/modules/services/networking/ntp/ntpd.nix | 1 + nixos/modules/services/networking/ntp/openntpd.nix | 1 + pkgs/tools/networking/chrony/default.nix | 3 +-- pkgs/tools/networking/ntp/default.nix | 2 +- pkgs/tools/networking/openntpd/default.nix | 1 + 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index 77f70257700..4736069fd37 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -76,6 +76,8 @@ in }; config = mkIf cfg.enable { + meta.maintainers = with lib.maintainers; [ thoughtpolice ]; + environment.systemPackages = [ pkgs.chrony ]; users.groups = singleton diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 588d1c6edb0..1197c84f045 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -96,6 +96,7 @@ in ###### implementation config = mkIf config.services.ntp.enable { + meta.maintainers = with lib.maintainers; [ thoughtpolice ]; # Make tools such as ntpq available in the system path. environment.systemPackages = [ pkgs.ntp ]; diff --git a/nixos/modules/services/networking/ntp/openntpd.nix b/nixos/modules/services/networking/ntp/openntpd.nix index f3920aa8064..471d15b1687 100644 --- a/nixos/modules/services/networking/ntp/openntpd.nix +++ b/nixos/modules/services/networking/ntp/openntpd.nix @@ -52,6 +52,7 @@ in ###### implementation config = mkIf cfg.enable { + meta.maintainers = with lib.maintainers; [ thoughtpolice ]; services.timesyncd.enable = mkForce false; # Add ntpctl to the environment for status checking diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index bbc0cac0551..69c4f897c93 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -5,7 +5,6 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { pname = "chrony"; - version = "3.5"; src = fetchurl { @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz thoughtpolice ]; longDescription = '' Chronyd is a daemon which runs in background on the system. It obtains diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index a990cb1ee92..b890e07845e 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # very close to isc and bsd2 url = https://www.eecis.udel.edu/~mills/ntp/html/copyright.html; }; - maintainers = [ maintainers.eelco ]; + maintainers = with maintainers; [ eelco thoughtpolice ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 9ef8c75b728..9cfb24ce95d 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "OpenBSD NTP daemon (Debian port)"; platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice ]; }; } From 0aee12e0b3d4fdaca6a06b1e694b4a79f72e3240 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 1 Dec 2018 13:01:09 -0600 Subject: [PATCH 147/159] CODEOWNERS: add myself as owner of ntp packages Signed-off-by: Austin Seipp --- .github/CODEOWNERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 60fcf520ac1..247af50dd39 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -130,6 +130,12 @@ /nixos/tests/hardened.nix @joachifm /pkgs/os-specific/linux/kernel/hardened-config.nix @joachifm +# Network Time Daemons +/pkgs/tools/networking/chrony @thoughtpolice +/pkgs/tools/networking/ntp @thoughtpolice +/pkgs/tools/networking/openntpd @thoughtpolice +/nixos/modules/services/networking/ntp @thoughtpolice + # Dhall /pkgs/development/dhall-modules @Gabriel439 @Profpatsch /pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch From 83180ea41f79f38d4f91923ff2480fa69393cb19 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 01:19:06 -0600 Subject: [PATCH 148/159] nixos/chrony: set iburst for ntp servers 'iburst' allows chrony to make very quick adjustments to the clock by doing a couple rapid measurements outside of the default 'minpoll' option. This helps improve rapid time adjustment at boot, and is enabled by default. Signed-off-by: Austin Seipp --- nixos/modules/services/networking/ntp/chrony.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index 4736069fd37..08e58873aca 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -9,7 +9,7 @@ let keyFile = "${stateDir}/chrony.keys"; configFile = pkgs.writeText "chrony.conf" '' - ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers} + ${concatMapStringsSep "\n" (server: "server " + server + " iburst") cfg.servers} ${optionalString (cfg.initstepslew.enabled && (cfg.servers != [])) From b8bda8cb4ff889d8f94b89adac2a884838f8cb09 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 01:21:18 -0600 Subject: [PATCH 149/159] nixos/chrony: remove redundant 'initstepslew.servers' option This option was added in 6336048c5843ffcbd9fb010e47386adda2cdb913 but it is essentially a complete duplicate of the existing cfg.servers and there seems to be no reason to keep maintaining it. Furthermore, it requires annoying duplication if you try to do option merging, e.g. merging in sets into your configuration.nix that add `services.chrony.initstepslew` options will overwrite the servers option unless you keep it, but that means you just have to duplicate config.networking.timeServers again anyway which is an implementation detail! Signed-off-by: Austin Seipp --- nixos/modules/services/networking/ntp/chrony.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index 08e58873aca..e2309ef46bc 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -13,7 +13,7 @@ let ${optionalString (cfg.initstepslew.enabled && (cfg.servers != [])) - "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}" + "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.servers}" } driftfile ${stateDir}/chrony.drift @@ -48,7 +48,6 @@ in default = { enabled = true; threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s) - servers = cfg.servers; }; description = '' Allow chronyd to make a rapid measurement of the system clock error at From 5a1ae55bbc1032ab872619ac4537d36deaa33db9 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 09:04:26 -0600 Subject: [PATCH 150/159] nixos/chrony: keep in foreground Signed-off-by: Austin Seipp --- nixos/modules/services/networking/ntp/chrony.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index e2309ef46bc..c74476c7a15 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -24,7 +24,7 @@ let ${cfg.extraConfig} ''; - chronyFlags = "-m -u chrony -f ${configFile} ${toString cfg.extraFlags}"; + chronyFlags = "-n -m -u chrony -f ${configFile} ${toString cfg.extraFlags}"; in { options = { @@ -116,7 +116,7 @@ in unitConfig.ConditionCapability = "CAP_SYS_TIME"; serviceConfig = - { Type = "forking"; + { Type = "simple"; ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}"; ProtectHome = "yes"; From cf3e491cefbf2544a4ca0bf4acfa0da26f009bcf Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Thu, 12 Sep 2019 15:25:24 +0200 Subject: [PATCH 151/159] nginx: remove gzip_disable directive IE6 is long gone and this directive is not useful anymore. We can spare a few CPU cycles (and maybe skip some bugs) by not trying to disable gzip for MSIE6. --- nixos/modules/services/web-apps/restya-board.nix | 1 - nixos/modules/services/web-servers/nginx/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index f220669c910..1e7882488ac 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -216,7 +216,6 @@ in index index.html index.php; gzip on; - gzip_disable "msie6"; gzip_comp_level 6; gzip_min_length 1100; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index b94b338fd4a..e597f34700a 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -94,7 +94,6 @@ let ${optionalString (cfg.recommendedGzipSettings) '' gzip on; - gzip_disable "msie6"; gzip_proxied any; gzip_comp_level 5; gzip_types From dc6447812b508c7857ed6419168ef068c98cdc58 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Thu, 12 Sep 2019 09:30:13 +0100 Subject: [PATCH 152/159] kdbplus: 3.3 -> 3.6 --- pkgs/applications/misc/kdbplus/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index 2af091b0df3..ce20c2812f0 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -8,17 +8,17 @@ let in stdenv.mkDerivation rec { pname = "kdbplus"; - version = "3.3"; + version = "3.6"; - src = requireFile { + src = requireFile rec { message = '' Nix can't download kdb+ for you automatically. Go to http://kx.com and download the free, 32-bit version for - Linux. Then run "nix-prefetch-url file://\$PWD/linux.zip" in - the directory where you saved it. Note you need version 3.3. + Linux. Then run "nix-prefetch-url file://\$PWD/${name}" in + the directory where you saved it. Note you need version ${version}. ''; - name = "linux.zip"; - sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940"; + name = "linuxx86.zip"; + sha256 = "0w6znd9warcqx28vf648n0vgmxyyy9kvsfpsfw37d1kp5finap4p"; }; dontStrip = true; From b918bb9e5d204fbdb83a4b82c520461cc6cd155c Mon Sep 17 00:00:00 2001 From: Matthew Harm Bekkema Date: Mon, 9 Sep 2019 00:28:24 +1000 Subject: [PATCH 153/159] lyx: use qt5's mkDerivation Fixes the error: qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in "" This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem. See #65399 --- pkgs/applications/misc/lyx/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 744d124f84d..f7964e4e5c6 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,8 +1,8 @@ -{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch +{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc, fetchpatch , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "2.3.0"; pname = "lyx"; @@ -30,10 +30,9 @@ stdenv.mkDerivation rec { doCheck = true; # python is run during runtime to do various tasks - postFixup = '' - wrapProgram "$out/bin/lyx" \ - --prefix PATH : '${python}/bin' - ''; + qtWrapperArgs = [ + " --prefix PATH : ${python}/bin" + ]; patches = [ (fetchpatch { @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = http://www.lyx.org; license = licenses.gpl2Plus; From f12dcceb47b48e15db9ee09e345a4f68eda7aa41 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Tue, 10 Sep 2019 10:12:35 -0400 Subject: [PATCH 154/159] rtl8812au: 5.2.20.2_28373.20180619 -> 5.2.20.2_28373.20190903 --- pkgs/os-specific/linux/rtl8812au/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index f524bee3521..81c1f8ab0f5 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; - version = "5.2.20.2_28373.20180619"; + version = "5.2.20.2_28373.20190903"; src = fetchFromGitHub { owner = "zebulon2"; repo = "rtl8812au-driver-5.2.20"; - rev = "ac063a4b1a87855e10f6cd1f358aaccbeee9b9c1"; - sha256 = "1cmsv22q4k6p2wzm73k60kxbjhcgx4hqr0x3djvqrlv4rzz75l92"; + rev = "30d47a0a3f43ccb19e8fd59fe93d74a955147bf2"; + sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr"; }; nativeBuildInputs = [ bc ]; From 2769d610ac7a19706302b16f9b451af4e3d65a08 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 12 Sep 2019 17:15:22 +0000 Subject: [PATCH 155/159] anki: fix startup Related: #68314 This fixes startup of anki, which currently shows this in a dialog: Error during startup: Traceback (most recent call last): File "/nix/store/0h395dwc6b80n5xg93p86ywaz6kpz6ck-anki-2.1.15/lib/python3.7/site-packages/aqt/main.py", line 46, in __init__ self.setupAddons() File "/nix/store/0h395dwc6b80n5xg93p86ywaz6kpz6ck-anki-2.1.15/lib/python3.7/site-packages/aqt/main.py", line 657, in setupAddons import aqt.addons File "/nix/store/0h395dwc6b80n5xg93p86ywaz6kpz6ck-anki-2.1.15/lib/python3.7/site-packages/aqt/addons.py", line 9, in import markdown File "/nix/store/knq8798kl0xzzr7ii4bchskg1c8mq6pj-python3.7-Markdown-3.1.1/lib/python3.7/site-packages/markdown/__init__.py", line 25, in from .core import Markdown, markdown, markdownFromFile File "/nix/store/knq8798kl0xzzr7ii4bchskg1c8mq6pj-python3.7-Markdown-3.1.1/lib/python3.7/site-packages/markdown/core.py", line 29, in import pkg_resources ModuleNotFoundError: No module named 'pkg_resources' --- pkgs/games/anki/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index ebfdc0e1373..c3caf9105d0 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -19,6 +19,7 @@ , glibcLocales , nose , jsonschema +, setuptools , send2trash , CoreAudio # This little flag adds a huge number of dependencies, but we assume that @@ -87,7 +88,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyqtwebengine sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator - markdown jsonschema + markdown jsonschema setuptools ] ++ lib.optional plotsSupport matplotlib ++ lib.optional stdenv.isDarwin [ CoreAudio ] From 274b8654f580bf46b51b8b2753a5e414bfa68f5b Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 7 Sep 2019 15:47:17 +0200 Subject: [PATCH 156/159] dehydrated: move to pname syntax, handle docs/manpage. --- pkgs/tools/admin/dehydrated/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index 699c86b5fe3..6cc69c2290d 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,10 +1,7 @@ -{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: -let - pkgName = "dehydrated"; - version = "0.6.5"; -in +{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub, installShellFiles }: stdenv.mkDerivation rec { - name = pkgName + "-" + version; + pname = "dehydrated"; + version = "0.6.5"; src = fetchFromGitHub { owner = "lukas2511"; @@ -13,9 +10,16 @@ stdenv.mkDerivation rec { sha256 = "14k7ykry16zp09i0bqb5pqaclvnjcb6p3x8knm9v5q0bdvlplkjv"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' + installManPage docs/man/dehydrated.1 + + mkdir -p "$out/share/docs/dehydrated" + cp docs/*.md "$out/share/docs/dehydrated" + cp -r docs/examples "$out/share/docs/dehydrated" + cp {CHANGELOG,LICENSE,README.md} "$out/share/docs/dehydrated" + mkdir -p $out/bin cp -a dehydrated $out/bin wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}" From ca9c4d29e91e2b45b8a47c8dc27de06464f22767 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 12 Sep 2019 14:11:24 -0400 Subject: [PATCH 157/159] gst_all_1.gst-vaapi: patch to Remove Mesa from drivers white list See https://mail.gnome.org/archives/distributor-list/2019-September/msg00000.html Users can re-add it with GST_VAAPI_ALL_DRIVERS. --- .../development/libraries/gstreamer/vaapi/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 7e64636d96d..bc53597656e 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland , libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm -, libvpx, python +, libvpx, python, fetchpatch }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "07qpynamiz0lniqajcaijh3n7ixs4lfk9a5mfk50sng0dricwzsf"; }; + patches = [ + # See: https://mail.gnome.org/archives/distributor-list/2019-September/msg00000.html + # Note that the patch has now been actually accepted upstream. + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/commit/a90daabb84f983d2fa05ff3159f7ad59aa648b55.patch"; + sha256 = "0p2qygq6b5h6nxjdfnlzbsyih43hjq5c94ag8sbyyb8pmnids9rb"; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ meson ninja pkgconfig bzip2 ]; From dc5d1aa4747dbc35f733c599154a5591264ddee5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 12 Sep 2019 14:12:02 -0400 Subject: [PATCH 158/159] gst_all_1: auto_features already enabled --- pkgs/development/libraries/gstreamer/vaapi/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index bc53597656e..adb495689e3 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Dexamples=disabled" # requires many dependencies and probably not useful for our users ]; From 31ff9f5d416b02cfce8e72b0be1780a3851e2d7d Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Thu, 12 Sep 2019 18:02:03 +0100 Subject: [PATCH 159/159] kdbplus: add zlib to libPath Necessary for https://github.com/kxcontrib/websocket to run --- pkgs/applications/misc/kdbplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index ce20c2812f0..4c4b461303f 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -1,10 +1,10 @@ -{ stdenv, requireFile, unzip, rlwrap, bash }: +{ stdenv, requireFile, unzip, rlwrap, bash, zlib }: assert (stdenv.hostPlatform.system == "i686-linux"); let libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc ]; + [ stdenv.cc.libc stdenv.cc.cc zlib ]; in stdenv.mkDerivation rec { pname = "kdbplus";