From d15818f55a2d82ccbb591d2f9356a2c00671d22b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 07:53:18 -0600 Subject: ffmpeg: 4.0.2 -> 4.0.3 https://www.ffmpeg.org/download.html#releases https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.0.3 --- pkgs/development/libraries/ffmpeg/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index b470d45ba43..6d559f5511b 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.0.2"; - sha256 = "0mnh41j3kzi3x3clai1yhqasr1kc8zvd5cz0283pxhs2bxrm2v1l"; + branch = "4.0.3"; + sha256 = "0v40nygrv79inyvzcnv9zi75jya63n033j4gpm2r3hwnma40hr39"; darwinFrameworks = [ Cocoa CoreMedia ]; }) -- cgit 1.4.1 From 842e9184a955ccf307ff00b2a671330a65ce0013 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 08:01:45 -0600 Subject: ffmpeg-full: 4.0.2 -> 4.0.3 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 4c1ad34f6da..9f34c86107c 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -232,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "15rgzcmdccy4flajs63gkz4n3k24wkkg50r13l1r83lrxg4hqp59"; + sha256 = "1vg229mxcrm415cq6q1nfm891hm4x56mb5p4cqjnlqnky7ikfg15"; }; prePatch = '' -- cgit 1.4.1 From 6ba05c7dac6dbba27f997ceff0ad400da6bb7854 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 08:07:59 -0600 Subject: ffmpeg_3_4: 3.4.4 -> 3.4.5 --- pkgs/development/libraries/ffmpeg/3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index b99c7240dae..f8343e668a6 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4.4"; - sha256 = "0xmcijcpa7b59ws5ycmnp0a3pjmnpgly0zv8yff6if4p7pw7406f"; + branch = "3.4.5"; + sha256 = "0cbzysj9pskxh1kfdwmq2848fn6gi4pvh5y3insv10pdhpcjp8a3"; darwinFrameworks = [ Cocoa CoreMedia ]; }) -- cgit 1.4.1 From 2420e969905ff1afccef94745055f2a4d7cefa04 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 08:13:09 -0600 Subject: ffmpeg{_4,-full}: 4.0.3 -> 4.1 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/4.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 9f34c86107c..6ec08e1111f 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -232,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.0.3"; + version = "4.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "1vg229mxcrm415cq6q1nfm891hm4x56mb5p4cqjnlqnky7ikfg15"; + sha256 = "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3"; }; prePatch = '' diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 6d559f5511b..9821357de3b 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.0.3"; - sha256 = "0v40nygrv79inyvzcnv9zi75jya63n033j4gpm2r3hwnma40hr39"; + branch = "4.1"; + sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n"; darwinFrameworks = [ Cocoa CoreMedia ]; }) -- cgit 1.4.1 From 8ac99ab1f4691ed50a65258b2424d4cd0ba8ff72 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 09:48:54 -0600 Subject: ffmpeg-full: added missing libXext dep, needed for 'xlib' support --- pkgs/development/libraries/ffmpeg-full/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 6ec08e1111f..d20d7a9e6b2 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -95,6 +95,7 @@ , libxcbxfixesExtlib ? true # X11 grabbing mouse rendering , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support +, libXext ? null # Xlib support , lzma ? null # xz-utils , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support , callPackage # needed for NVENC to access external ffmpeg nvidia headers @@ -357,7 +358,7 @@ stdenv.mkDerivation rec { (enableFeature (libvorbis != null) "libvorbis") (enableFeature (libvpx != null) "libvpx") (enableFeature (libwebp != null) "libwebp") - (enableFeature (libX11 != null && libXv != null) "xlib") + (enableFeature (libX11 != null && libXv != null && libXext != null) "xlib") (enableFeature (libxcb != null) "libxcb") (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") @@ -410,7 +411,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr + libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib libGLU_combined -- cgit 1.4.1 From d9c1dd28027343ff8ebc145f809d42f969836e59 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 29 Dec 2018 17:51:06 -0600 Subject: libaom: 1.0.0 -> 1.0.0.errata.1 --- pkgs/development/libraries/libaom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index f6ff7e75895..43916d27d24 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "libaom-${version}"; - version = "1.0.0"; + version = "1.0.0.errata.1"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; rev = "v${version}"; - sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82"; + sha256 = "090phh4jl9z6m2pwpfpwcjh6iyw0byngb2n112qxkg6a3gsaa62f"; }; nativeBuildInputs = [ -- cgit 1.4.1 From d349cfee88384b4cc353dba8d1154f230520bcc4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 29 Dec 2018 23:17:58 -0600 Subject: libaom: go back to building libraries however upstream decides Presently this means static, instead of the shared we started building after a recent change (my blame). Darwin build breaks with this, and it was introduced on a whim so instead of making this platform-specific, go back to how things were previously. --- pkgs/development/libraries/libaom/default.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 43916d27d24..6ce84bef15e 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { yasm perl cmake pkgconfig python3 ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - preConfigure = '' # build uses `git describe` to set the build version cat > $NIX_BUILD_TOP/git << "EOF" -- cgit 1.4.1 From 471804736d2187b41b3e49cdefa1dadf11b423ed Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 31 Dec 2018 11:00:03 -0600 Subject: ffmpeg-full: use cf-private to fix Darwin build --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index d20d7a9e6b2..202ca502d68 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -140,7 +140,7 @@ * Darwin frameworks */ , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration, CF +, VideoDecodeAcceleration, cf-private }: /* Maintainer notes: @@ -434,7 +434,7 @@ stdenv.mkDerivation rec { FILES+=($(ls $out/lib/*.dylib)) for f in ''${FILES[@]}; do if [ ! -h "$f" ]; then - install_name_tool -change ${CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" + install_name_tool -change ${cf-private}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" fi done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0ccf05902d..5170802e046 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9731,7 +9731,7 @@ in vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; xavs = if stdenv.isDarwin then null else xavs; - inherit (darwin) CF; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; -- cgit 1.4.1 From 2122baf8f6a1f930c8bfabd6da5516d10dcd4503 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Jan 2019 23:02:46 +0100 Subject: glib: depend on Darwin libraries To support GNextstepSettingsBackend and Cocoa notifications, certain libraries need to be added on Darwin. --- pkgs/development/libraries/glib/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 37275489cc3..024ccf2a453 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -8,6 +8,7 @@ , doCheck ? stdenv.config.doCheckByDefault or false , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info +, darwin }: with stdenv.lib; @@ -44,6 +45,7 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; + binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; version = "2.58.2"; in @@ -83,7 +85,12 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ libselinux utillinuxMinimal # for libmount - ]; + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit Carbon Cocoa CoreFoundation CoreServices Foundation + # Needed for CFURLCreateFromFSRef, etc. which have deen deprecated + # since 10.9 and are not part of swift-corelibs CoreFoundation. + darwin.cf-private + ]); nativeBuildInputs = [ meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales @@ -121,15 +128,17 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $bin/bin - for app in gapplication gdbus gio gsettings; do + for app in ${concatStringsSep " " binPrograms}; do mv "$dev/bin/$app" "$bin/bin" done + '' + optionalString (!stdenv.isDarwin) '' # Add gio-launch-desktop to $out so we can refer to it from $dev mkdir $out/bin mv "$dev/bin/gio-launch-desktop" "$out/bin/" ln -s "$out/bin/gio-launch-desktop" "$bin/bin/" + '' + '' moveToOutput "share/glib-2.0" "$dev" substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" -- cgit 1.4.1 From 2f4e167156b8e9f5852010f63e0a4067c7237d39 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Jan 2019 05:44:58 +0100 Subject: meson: Fix linking ObjC objects on Darwin https://github.com/NixOS/nixpkgs/pull/54007#issuecomment-454693658 --- .../tools/build-managers/meson/default.nix | 7 +++++++ .../build-managers/meson/fix-objc-linking.patch | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/build-managers/meson/fix-objc-linking.patch (limited to 'pkgs/development') diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 17938ab47b3..96e04407325 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -44,6 +44,13 @@ python3Packages.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) + ] ++ lib.optionals stdenv.isDarwin [ + # We use custom Clang, which makes Meson think *not Apple*, while still + # relying on system linker. When it detects standard Clang, Meson will + # pass it `-Wl,-O1` flag but optimizations are not recognized by + # Mac linker. + # https://github.com/mesonbuild/meson/issues/4784 + ./fix-objc-linking.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch b/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch new file mode 100644 index 00000000000..60a205828f5 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch @@ -0,0 +1,20 @@ +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -795,7 +795,7 @@ + compiler_type = self.get_gnu_compiler_type(defines) + version = self.get_gnu_version_from_defines(defines) + return GnuObjCCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines) +- if out.startswith('Apple LLVM'): ++ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self): + return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap) + if out.startswith('clang'): + return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) +@@ -822,7 +822,7 @@ + compiler_type = self.get_gnu_compiler_type(defines) + version = self.get_gnu_version_from_defines(defines) + return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines) +- if out.startswith('Apple LLVM'): ++ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self): + return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap) + if out.startswith('clang'): + return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) -- cgit 1.4.1 From e25f34968b8efbe5fc8eb0705a5dca947c964025 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jan 2019 12:31:43 -0800 Subject: freetds: 1.00.109 -> 1.00.110 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/freetds/versions --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 7ad5680c75c..616394c6a08 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.109"; + version = "1.00.110"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "0d00ixf78jzkyhccxjsaspz7yvlwk0xvrfcqfca4cwnwvnyb54ry"; + sha256 = "1zxgvc9ikw34fsbkn9by7hwqz0p6m3f178zmj2s0qqpi84qq1vw2"; }; buildInputs = [ -- cgit 1.4.1 From 05c8d5c88fbf4f08c5a30ae2ad195b35dac13e18 Mon Sep 17 00:00:00 2001 From: Sergei Maximov Date: Fri, 18 Jan 2019 13:48:48 +0300 Subject: gem-config: add digest-sha3 `digest-sha3` is a C-extension gem which fails to build on Nix because it uses non-literals as format strings which is forbidden by the default Nix hardening settings. There is a pull request to fix that ([1]), but the gem seems to be abandoned. This PR disables the "format" hardening for `digest-sha3`. [1]: https://github.com/phusion/digest-sha3-ruby/pull/8 --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index fd841563005..cde0b90d6fe 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -94,6 +94,10 @@ in ''; }; + digest-sha3 = attrs: { + hardeningDisable = [ "format" ]; + }; + ethon = attrs: { dontBuild = false; postPatch = '' -- cgit 1.4.1 From 11fbd8299da0f4405bc0dd589a06261809f7b5ae Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 18 Jan 2019 21:28:24 +0900 Subject: oraclejdk: 8u191 -> 8u201, 8u202 --- pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 4 ++-- pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 51ff77758a5..81f4ef3c7db 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -6,8 +6,8 @@ import ./jdk-linux-base.nix { buildVersion = "09"; sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac"; sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b"; - sha256.armv7l-linux = "0p82d2vah63a6r2rip9v17lbjam39kgqp0584q3cnljgr5p9gyhz"; - sha256.aarch64-linux = "1qm4b3aj5wi0hp9q6gy1da4bz5k9ky4shgiqa4zxrib4kjp9yf0k"; + sha256.armv7l-linux = "0y6bvq93lsf21v6ca536dpfhkk5ljsj7c6di0qzkban37bivj0si"; + sha256.aarch64-linux = "1bybysgg9llqzllsmdszmmb73v5az2l1shxn6lxwv3wwiazpf47q"; releaseToken = "42970487e3af4f5aa5bca3f542482c60"; jceName = "jce_policy-8.zip"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 51ff77758a5..0263bdde8d2 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -2,12 +2,12 @@ # jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "201"; + patchVersion = "202"; buildVersion = "09"; - sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac"; - sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b"; - sha256.armv7l-linux = "0p82d2vah63a6r2rip9v17lbjam39kgqp0584q3cnljgr5p9gyhz"; - sha256.aarch64-linux = "1qm4b3aj5wi0hp9q6gy1da4bz5k9ky4shgiqa4zxrib4kjp9yf0k"; + sha256.i686-linux = "19np392dwdqdq39lmm10607w2h042lrm5953fnsfh1bb9jli1pgj"; + sha256.x86_64-linux = "1q4l8pymjvsvxfwaw0rdcnhryh1la2bvg5f4d4my41ka390k4p4s"; + sha256.armv7l-linux = "06aljl7dqmmhmp7xswgvkcgh9mam71wnqydg9yb3hkcc443cm581"; + sha256.aarch64-linux = "12v9ndv7a2c9zqq6ai2vsgwad0lzmf4c6jxy4p9miapmhjzx5vii"; releaseToken = "42970487e3af4f5aa5bca3f542482c60"; jceName = "jce_policy-8.zip"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; -- cgit 1.4.1 From 2c78b87f5eb4ac22434505326c5c411673709fcb Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 10 Jan 2019 17:05:25 +0000 Subject: pythonPackages.pprintpp: init at 0.4.0 --- .../python-modules/pprintpp/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/pprintpp/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix new file mode 100644 index 00000000000..daf9d0062fb --- /dev/null +++ b/pkgs/development/python-modules/pprintpp/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchpatch, buildPythonPackage, fetchPypi, python, nose, parameterized }: + +buildPythonPackage rec { + pname = "pprintpp"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "00v4pkyiqc0y9qjnp3br58a4k5zwqdrjjxbcsv39vx67w84630pa"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/wolever/pprintpp/commit/873217674cc824b4c1cfdad4867c560c60e8d806.patch"; + sha256 = "0rqxzxawr83215s84mfzh1gnjwjm2xv399ywwcl4q7h395av5vb3"; + }) + ]; + + checkInputs = [ nose parameterized ]; + checkPhase = '' + ${python.interpreter} test.py + ''; + + meta = with lib; { + homepage = https://github.com/wolever/pprintpp; + description = "A drop-in replacement for pprint that's actually pretty"; + license = licenses.bsd2; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 657e1cb4330..157aaa27af6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -510,6 +510,8 @@ in { poetry = callPackage ../development/python-modules/poetry { }; + pprintpp = callPackage ../development/python-modules/pprintpp { }; + progress = callPackage ../development/python-modules/progress { }; pymysql = callPackage ../development/python-modules/pymysql { }; -- cgit 1.4.1 From bffc32260ffeb455db62c320d4ceca71b21265c9 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 10 Jan 2019 17:08:31 +0000 Subject: pythonPackages.bidict: init at 0.17.5 --- pkgs/development/python-modules/bidict/default.nix | 42 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/bidict/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix new file mode 100644 index 00000000000..ed99686ed27 --- /dev/null +++ b/pkgs/development/python-modules/bidict/default.nix @@ -0,0 +1,42 @@ +{ lib, buildPythonPackage, fetchPypi +, setuptools_scm +, sphinx +, hypothesis +, py +, pytest +, pytest-benchmark +, sortedcollections +, sortedcontainers +}: + +buildPythonPackage rec { + pname = "bidict"; + version = "0.17.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1icj0fnfx47n6i33pj5gfrmd1rzpvah1jihhdhqiqx2cy9rs6x4c"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ sphinx ]; + + checkInputs = [ + hypothesis + py + pytest + pytest-benchmark + sortedcollections + sortedcontainers + ]; + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + homepage = https://github.com/jab/bidict; + description = "Efficient, Pythonic bidirectional map data structures and related functionality"; + license = licenses.mpl20; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 157aaa27af6..26433721dc0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -998,6 +998,8 @@ in { bibtexparser = callPackage ../development/python-modules/bibtexparser { }; + bidict = callPackage ../development/python-modules/bidict { }; + binwalk = callPackage ../development/python-modules/binwalk { }; binwalk-full = appendToName "full" (self.binwalk.override { -- cgit 1.4.1 From 41b69023daa89604303168a8c5737b27467bae22 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 10 Jan 2019 17:09:35 +0000 Subject: pythonPackages.bitstruct: init at 6.0.0 --- pkgs/development/python-modules/bitstruct/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/bitstruct/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix new file mode 100644 index 00000000000..2bc4a5bbb61 --- /dev/null +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "bitstruct"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1znqgy2ikdqn6n6mv1ccfbl0q7x65bh3i9ph0yjl4rihwvxyg9fg"; + }; + + meta = with lib; { + homepage = https://github.com/eerimoq/bitstruct; + description = "Python bit pack/unpack package"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26433721dc0..faa16d81ba8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1008,6 +1008,8 @@ in { bitmath = callPackage ../development/python-modules/bitmath { }; + bitstruct = callPackage ../development/python-modules/bitstruct { }; + caldavclientlibrary-asynk = callPackage ../development/python-modules/caldavclientlibrary-asynk { }; biopython = callPackage ../development/python-modules/biopython { }; -- cgit 1.4.1 From ec669e2ca343d75752b12e0ad696cd32a0722d2f Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 10 Jan 2019 17:10:39 +0000 Subject: pythonPackages.audio-metadata: init at 0.3.0 --- .../python-modules/audio-metadata/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/audio-metadata/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix new file mode 100644 index 00000000000..633daab7d4e --- /dev/null +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, attrs +, bidict +, bitstruct +, more-itertools +, pprintpp +}: + +buildPythonPackage rec { + pname = "audio-metadata"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jd0wzhh9as2qyiwggqmvsbsm5nlb73qnxix2mcar53cddvwrvj7"; + }; + + propagatedBuildInputs = [ + attrs + bidict + bitstruct + more-itertools + pprintpp + ]; + + # No tests + doCheck = false; + + disabled = pythonOlder "3.6"; + + meta = with lib; { + homepage = https://github.com/thebigmunch/audio-metadata; + description = "A library for reading and, in the future, writing metadata from audio files"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index faa16d81ba8..c2aa4b77b7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -935,6 +935,8 @@ in { atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; + audio-metadata = callPackage ../development/python-modules/audio-metadata { }; + audioread = callPackage ../development/python-modules/audioread { }; audiotools = callPackage ../development/python-modules/audiotools { }; -- cgit 1.4.1 From e27bef23f1339895bb0140b80ce0abe98702a728 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 10 Jan 2019 17:12:52 +0000 Subject: pythonPackages.google-music-proto: init at 2.2.0 --- .../python-modules/google-music-proto/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/google-music-proto/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix new file mode 100644 index 00000000000..b2196c8748c --- /dev/null +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, attrs +, audio-metadata +, marshmallow +, pendulum +, protobuf +}: + +buildPythonPackage rec { + pname = "google-music-proto"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "008nap32hcrlnkkqkf462vwnm6xzrn6fj71lbryfmrakad7rz7bc"; + }; + + propagatedBuildInputs = [ + attrs + audio-metadata + marshmallow + pendulum + protobuf + ]; + + # No tests + doCheck = false; + + disabled = pythonOlder "3.6"; + + meta = with lib; { + homepage = https://github.com/thebigmunch/google-music-proto; + description = "Sans-I/O wrapper of Google Music API calls"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2aa4b77b7e..e52f3d53824 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1793,6 +1793,8 @@ in { google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + google-music-proto = callPackage ../development/python-modules/google-music-proto { }; + gpapi = callPackage ../development/python-modules/gpapi { }; gplaycli = callPackage ../development/python-modules/gplaycli { }; -- cgit 1.4.1 From 355d49cebbcbcf4393d80a26174d7d35db26ac99 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 10 Jan 2019 17:14:03 +0000 Subject: pythonPackages.click-default-group: init at 1.2 --- .../python-modules/click-default-group/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/click-default-group/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix new file mode 100644 index 00000000000..673a570c61f --- /dev/null +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, click, pytest }: + +buildPythonPackage rec { + pname = "click-default-group"; + version = "1.2"; + + # No tests in Pypi tarball + src = fetchFromGitHub { + owner = "click-contrib"; + repo = "click-default-group"; + rev = "v${version}"; + sha256 = "0lm2k4jvy4ilvv91niawklfnp5mp7wa8c1bicsqdfzrxmw7jliwp"; + }; + + propagatedBuildInputs = [ click ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + homepage = https://github.com/click-contrib/click-default-group; + description = "Group to invoke a command without explicit subcommand name"; + license = licenses.bsd3; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e52f3d53824..eb70dd620a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1254,6 +1254,8 @@ in { click-completion = callPackage ../development/python-modules/click-completion {}; + click-default-group = callPackage ../development/python-modules/click-default-group { }; + click-didyoumean = callPackage ../development/python-modules/click-didyoumean {}; click-log = callPackage ../development/python-modules/click-log {}; -- cgit 1.4.1 From 13d5fa67205c4db0d165ae7aaaa3b075872c73d9 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 10 Jan 2019 17:14:54 +0000 Subject: pythonPackages.tenacity: init at 5.0.2 --- .../python-modules/tenacity/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/tenacity/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix new file mode 100644 index 00000000000..596fa6b825f --- /dev/null +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, pbr, six, futures, monotonic +, pytest, sphinx, tornado +}: + +buildPythonPackage rec { + pname = "tenacity"; + version = "5.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rjbj9wks7b7n75mbm01y0g2ngyai8yi05ck9gicmcdyix7vw42c"; + }; + + nativeBuildInputs = [ pbr ]; + propagatedBuildInputs = [ six ] + ++ lib.optionals isPy27 [ futures monotonic ]; + + checkInputs = [ pytest sphinx tornado ]; + checkPhase = (if isPy27 then '' + pytest --ignore='tenacity/tests/test_asyncio.py' + '' else '' + pytest + '') + '' + sphinx-build -a -E -W -b doctest doc/source doc/build + ''; + + meta = with lib; { + homepage = https://github.com/jd/tenacity; + description = "Retrying library for Python"; + license = licenses.asl20; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb70dd620a7..164c0b99d88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -772,6 +772,8 @@ in { sniffio = callPackage ../development/python-modules/sniffio { }; + tenacity = callPackage ../development/python-modules/tenacity { }; + tokenserver = callPackage ../development/python-modules/tokenserver {}; toml = callPackage ../development/python-modules/toml { }; -- cgit 1.4.1 From e9e7c08ca6b0c77a35154e16e2cf4b0bf82263fb Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 10 Jan 2019 17:16:58 +0000 Subject: pythonPackages.google-music-utils: init at 2.0.0 --- .../python-modules/google-music-utils/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/google-music-utils/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix new file mode 100644 index 00000000000..d7fb8a91707 --- /dev/null +++ b/pkgs/development/python-modules/google-music-utils/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, audio-metadata, multidict, wrapt +, pytest +}: + +buildPythonPackage rec { + pname = "google-music-utils"; + version = "2.0.0"; + + # Pypi tarball doesn't contain tests + src = fetchFromGitHub { + owner = "thebigmunch"; + repo = "google-music-utils"; + rev = version; + sha256 = "0i5zcr1ypnxizi41s3lrplz9m9rmb56s5iihjx61kbybxcq2b6gk"; + }; + + propagatedBuildInputs = [ + audio-metadata multidict wrapt + ]; + + checkInputs = [ pytest ]; + checkPhase = '' + pytest + ''; + + disabled = pythonOlder "3.6"; + + meta = with lib; { + homepage = https://github.com/thebigmunch/google-music-utils; + description = "A set of utility functionality for google-music and related projects"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 164c0b99d88..c7a513acc26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1799,6 +1799,8 @@ in { google-music-proto = callPackage ../development/python-modules/google-music-proto { }; + google-music-utils = callPackage ../development/python-modules/google-music-utils { }; + gpapi = callPackage ../development/python-modules/gpapi { }; gplaycli = callPackage ../development/python-modules/gplaycli { }; -- cgit 1.4.1 From a323466604fc84c8694e87402143c7096cab4603 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 10 Jan 2019 17:18:21 +0000 Subject: pythonPackages.google-music: init at 3.0.1 --- .../python-modules/google-music/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/google-music/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix new file mode 100644 index 00000000000..b0fe0f8a254 --- /dev/null +++ b/pkgs/development/python-modules/google-music/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, appdirs +, audio-metadata +, google-music-proto +, protobuf +, requests_oauthlib +, tenacity +}: + +buildPythonPackage rec { + pname = "google-music"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "13i9nd62wqfg0f5r7ykr15q83397vdpw0js50fy5nbgs33sbf6b7"; + }; + + propagatedBuildInputs = [ + appdirs + audio-metadata + google-music-proto + protobuf + requests_oauthlib + tenacity + ]; + + # No tests + doCheck = false; + + disabled = pythonOlder "3.6"; + + meta = with lib; { + homepage = https://github.com/thebigmunch/google-music; + description = "A Google Music API wrapper"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7a513acc26..0ca14480093 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1797,6 +1797,8 @@ in { google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + google-music = callPackage ../development/python-modules/google-music { }; + google-music-proto = callPackage ../development/python-modules/google-music-proto { }; google-music-utils = callPackage ../development/python-modules/google-music-utils { }; -- cgit 1.4.1 From fe4f244c195de29111e2f51181d6fbb09036c667 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 10 Jan 2019 17:19:22 +0000 Subject: pythonPackages.logzero: init at 1.5.0 --- .../development/python-modules/logzero/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/logzero/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix new file mode 100644 index 00000000000..098d9f3e06d --- /dev/null +++ b/pkgs/development/python-modules/logzero/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "logzero"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hli2wgwxxackrk1ybmlpdd0rzms6blm11zzwlvrzykd8cp1xyil"; + }; + + checkInputs = [ pytest ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = https://github.com/metachris/logzero; + description = "Robust and effective logging for Python 2 and 3"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ca14480093..fe5a6a2ad51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -428,6 +428,8 @@ in { logster = callPackage ../development/python-modules/logster { }; + logzero = callPackage ../development/python-modules/logzero { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; manhole = callPackage ../development/python-modules/manhole { }; -- cgit 1.4.1 From 5812580bf6d3b949dc671f2291e2fbb2222268fe Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 18 Jan 2019 10:16:48 -0600 Subject: spin: 6.4.8 -> 6.4.9 --- pkgs/development/tools/analysis/spin/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index a59b452b432..82efb7a1a8a 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -7,15 +7,12 @@ let in stdenv.mkDerivation rec { name = "spin-${version}"; - version = "6.4.8"; + version = "6.4.9"; url-version = stdenv.lib.replaceChars ["."] [""] version; src = fetchurl { - # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. - # Dropbox mirror from developers: - # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa - url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADya1lOBJZDbgWGrUSq-dfHa/spin${url-version}.tar.gz?raw=1"; - sha256 = "1rvamdsf0igzpndlr4ck7004jw9x1bg4xyf78zh5k9sp848vnd80"; + url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz"; + sha256 = "07b7wk3qyfnp4pgwicqd33l7i1krzyihx0cf9zkv81ywaklf5vll"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit 1.4.1 From c869590dea86590fc60558a150dc9c8d3ed34ebc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 18 Jan 2019 10:23:44 -0600 Subject: spin: install manpage --- pkgs/development/tools/analysis/spin/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 82efb7a1a8a..8717c99cb46 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -21,6 +21,8 @@ in stdenv.mkDerivation rec { sourceRoot = "Spin/Src${version}"; installPhase = '' + install -Dm644 ../Man/spin.1 $out/share/man/man1/spin.1 + install -Dm755 spin $out/bin/spin wrapProgram $out/bin/spin \ --prefix PATH : ${binPath} -- cgit 1.4.1 From 56f3fbf9f2921f050521527f207bb6e322b0178c Mon Sep 17 00:00:00 2001 From: Matthew Piziak Date: Fri, 18 Jan 2019 21:24:42 -0500 Subject: nodePackages_10_x.textlint: init at 11.2.1 --- .../node-packages/node-packages-v10.json | 1 + .../node-packages/node-packages-v10.nix | 1123 +++++++++++++++----- 2 files changed, 857 insertions(+), 267 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 35dea57d4e6..995981d18ed 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -102,6 +102,7 @@ , "svgo" , "swagger" , "tern" +, "textlint" , "three" , "tiddlywiki" , "triton" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index ca3cc096b1a..3384ccf854e 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -31,6 +31,24 @@ let sha512 = "lqK94b+caNtmKFs5oUVXlSpN3sm5IXZ+KfhMxOtr0LR2SqErzkoJilitjDvJ1WbjHlxLI7WtCjRmOLdOGJqtMQ=="; }; }; + "@azu/format-text-1.0.1" = { + name = "_at_azu_slash_format-text"; + packageName = "@azu/format-text"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azu/format-text/-/format-text-1.0.1.tgz"; + sha1 = "6967350a94640f6b02855169bd897ce54d6cebe2"; + }; + }; + "@azu/style-format-1.0.0" = { + name = "_at_azu_slash_style-format"; + packageName = "@azu/style-format"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azu/style-format/-/style-format-1.0.0.tgz"; + sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; + }; + }; "@babel/code-frame-7.0.0" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; @@ -913,40 +931,40 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.10.5" = { + "@lerna/add-3.10.6" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.10.5.tgz"; - sha512 = "T3d9FnSyBOYnM/a1j5Sa65SGOTgnv04HG7Y2lRWJcF6PvOoTsozYW0izi/vLAnAt/DvGhYf2morXkWS8AbIeDg=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.10.6.tgz"; + sha512 = "FxQ5Bmyb5fF+3BQiNffM6cTeGCrl4uaAuGvxFIWF6Pgz6U14tUc1e16xgKDvVb1CurzJgIV5sLOT5xmCOqv1kA=="; }; }; - "@lerna/batch-packages-3.10.0" = { + "@lerna/batch-packages-3.10.6" = { name = "_at_lerna_slash_batch-packages"; packageName = "@lerna/batch-packages"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.10.0.tgz"; - sha512 = "ERvnpmmfV8H+3B+9FmHqmzfgz0xVe3ktW/e4WZZXYMGpqSGToILZlai4PsBrW5gUtnXA77LSskME+aRdkZaKsQ=="; + url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.10.6.tgz"; + sha512 = "sInr3ZQJFMh9Zq+ZUoVjX8R67j9ViRkVy0uEMsOfG+jZlXj1lRPRMPRiRgU0jXSYEwCdwuAB5pTd9tTx0VCJUw=="; }; }; - "@lerna/bootstrap-3.10.5" = { + "@lerna/bootstrap-3.10.6" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.10.5.tgz"; - sha512 = "WMUfysmX2WFkOzWcpv0mW6Kw91Zsuq9Ecz/TIT4q3FywvABD0mrWbcDXSyrxMspxDEOtPqM/Lk9nm6F9M98kbg=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.10.6.tgz"; + sha512 = "qbGjAxRpV/eiI9CboUIpsPPGpSogs8mN2/iDaAUBTaWVFVz/YyU64nui84Gll0kbdaHOyPput+kk2S8NCSCCdg=="; }; }; - "@lerna/changed-3.10.5" = { + "@lerna/changed-3.10.6" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.10.5.tgz"; - sha512 = "Uy3VWzjmGg2CjKRTW9os+R6Itg3LVJ6CjczeOsOFwSN4JMdNoObUnCTSdCCTUF/+hQNAoSnkw3+C8dC5FPL1Zw=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.10.6.tgz"; + sha512 = "nZDVq/sKdhgoAg1BVnpqjqUUz5+zedG+AnU+6mjEN2f23YVtRCsW55N4I9eEdW2pxXUaCY85Hj/HPSA74BYaFg=="; }; }; "@lerna/check-working-tree-3.10.0" = { @@ -967,22 +985,22 @@ let sha512 = "q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g=="; }; }; - "@lerna/clean-3.10.1" = { + "@lerna/clean-3.10.6" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "3.10.1"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.10.1.tgz"; - sha512 = "eYSNSD4xD//OIDe0r4r/HhEMEXriIuKqp4BMDhrO7pJmYhk7FvznJUSc4jc85wdA4Y0ooqSs9gF/w2lgLGgUxw=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.10.6.tgz"; + sha512 = "MuL8HOwnyvVtr6GOiAN/Ofjbx+BJdCrtjrM1Uuh8FFnbnZTPVf+0MPxL2jVzPMo0PmoIrX3fvlwvzKNk/lH0Ug=="; }; }; - "@lerna/cli-3.10.0" = { + "@lerna/cli-3.10.6" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.10.0.tgz"; - sha512 = "OTO8GlD6Rf298hxml3/Y3OE8yMDuW3NNqumbroiUb/KdkrnyjZl5F6aSMXJEySq+OSoBboZJMwj2IWglc/7fuw=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.10.6.tgz"; + sha512 = "GtmzJztjrcb5k1Qi/GKNs8xbQBgRpEBoPpt1Udgo23GkepVrQQo45QjM9hyqOhJ6LrV/lfXAv111kDBN/43jLw=="; }; }; "@lerna/collect-updates-3.10.1" = { @@ -994,13 +1012,13 @@ let sha512 = "vb0wEJ8k63G+2CR/ud1WeVHNJ21Fs6Ew6lbdGZXnF4ZvaFWxWJZpoHeWwzjhMdJ75QdTzUaIhTG1hnH9faQNMw=="; }; }; - "@lerna/command-3.10.0" = { + "@lerna/command-3.10.6" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-3.10.0.tgz"; - sha512 = "TTtCDQ5+bDdA/RnBuDtkfqzUV8Mr61KBHxEZL8YLAmHZtY/HsnNpZzbAZ0STPxcFB96dhxVWbRDGP+yBgRfemQ=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-3.10.6.tgz"; + sha512 = "jPZswMZXOpAaIuSF5hrz+eaWQzbDrvwbrkCoRJKfiAHx7URAkE6MQe9DeAnqrTKMqwfg0RciSrZLc8kWYfrzCQ=="; }; }; "@lerna/conventional-commits-3.10.0" = { @@ -1012,13 +1030,13 @@ let sha512 = "8FvO0eR8g/tEgkb6eRVYaD39TsqMKsOXp17EV48jciciEqcrF/d1Ypu6ilK1GDp6R/1m2mbjt/b52a/qrO+xaw=="; }; }; - "@lerna/create-3.10.0" = { + "@lerna/create-3.10.6" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.10.0.tgz"; - sha512 = "1EQbhyGx/J+gwlxFPecpmrztyEfBRm/sNei95UJlJWLuturSv2Ax2nCa49tcerbPlYhhlJ6lyintukL5STOzdg=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.10.6.tgz"; + sha512 = "OddQtGBHM2/eJONggLWoTE6275XGbnJ6dIVF+fLsKS93o4GC6g+qcc6Y7lUWHm5bfpeOwNOVKwj0tvqBZ6MgoA=="; }; }; "@lerna/create-symlink-3.6.0" = { @@ -1039,31 +1057,31 @@ let sha512 = "fouh3FQS07QxJJp/mW8LkGnH0xMRAzpBlejtZaiRwfDkW2kd6EuHaj8I/2/p21Wsprcvuu4dqmyia2YS1xFb/w=="; }; }; - "@lerna/diff-3.10.0" = { + "@lerna/diff-3.10.6" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.10.0.tgz"; - sha512 = "MU6P9uAND+dZ15Cm4onJakEYMC6xXZApLuPpWJf0kZtVoF2Feoo3mvQASdb17fe0jvvmWDS0RLCzq9Zhzrgm0A=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.10.6.tgz"; + sha512 = "0MqFhosjrqsIdXiKIu7t3CiJELqiU9mkjFBhYPB7JruAzpPwjMXJnC6/Ur5/7LXJYYVpqGQwZI9ZaZlOYJhhrw=="; }; }; - "@lerna/exec-3.10.1" = { + "@lerna/exec-3.10.6" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "3.10.1"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.10.1.tgz"; - sha512 = "MM5/OMP4FrVH4PIlG+3xk3jpKq+trgu/eAPttaYZBHAumCOjrDVYdyk5O68+YLz+uLkM31ixTmsiAP9f77HTsg=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.10.6.tgz"; + sha512 = "cdHqaRBMYceJu8rZLO8b4ZeR27O+xKPHgzi13OOOfBJQjrTuacjMWyHgmpy8jWc/0f7QnTl4VsHks7VJ3UK+vw=="; }; }; - "@lerna/filter-options-3.10.1" = { + "@lerna/filter-options-3.10.6" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "3.10.1"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.10.1.tgz"; - sha512 = "34q7P0/AA+omVk9uwv99i+4qmj5uGuj383RzqIcK8JDYL0JSzlmW0+c4IkxunCfRrWft8OFhSwZdOOmXtDSDYg=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.10.6.tgz"; + sha512 = "r/dQbqN+RGFKZNn+DyWehswFmAkny/fkdMB2sRM2YVe7zRTtSl95YxD9DtdYnpJTG/jbOVICS/L5QJakrI6SSw=="; }; }; "@lerna/filter-packages-3.10.0" = { @@ -1093,13 +1111,13 @@ let sha512 = "yuFtjsUZIHjeIvIYQ/QuytC+FQcHwo3peB+yGBST2uWCLUCR5rx6knoQcPzbxdFDCuUb5IFccFGd3B1fHFg3RQ=="; }; }; - "@lerna/global-options-3.1.3" = { + "@lerna/global-options-3.10.6" = { name = "_at_lerna_slash_global-options"; packageName = "@lerna/global-options"; - version = "3.1.3"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.1.3.tgz"; - sha512 = "LVeZU/Zgc0XkHdGMRYn+EmHfDmmYNwYRv3ta59iCVFXLVp7FRFWF7oB1ss/WRa9x/pYU0o6L8as/5DomLUGASA=="; + url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.10.6.tgz"; + sha512 = "k5Xkq1M/uREFC2R9uwN5gcvIgjj4iOXo0YyeEXCMWBiW3j2GL9xN4d1MmAIcrYlAzVYh6kLlWaFWl/rNIneHIw=="; }; }; "@lerna/has-npm-version-3.10.0" = { @@ -1111,49 +1129,49 @@ let sha512 = "N4RRYxGeivuaKgPDzrhkQOQs1Sg4tOnxnEe3akfqu1wDA4Ng5V6Y2uW3DbkAjFL3aNJhWF5Vbf7sBsGtfgDQ8w=="; }; }; - "@lerna/import-3.10.0" = { + "@lerna/import-3.10.6" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-3.10.0.tgz"; - sha512 = "c8/s/ldaNVGuKnu600B3nbkwJTNElp1duJiZQ7EBChF+szbQBAiQUGNLvBbwClLBzVJhKTw6E4ku17HafQ4vqg=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-3.10.6.tgz"; + sha512 = "LlGxhfDhovoNoBJLF3PYd3j/G2GFTnfLh0V38+hBQ6lomMNJbjkACfiLVomQxPWWpYLk0GTlpWYR8YGv6L7Ifw=="; }; }; - "@lerna/init-3.10.0" = { + "@lerna/init-3.10.6" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-3.10.0.tgz"; - sha512 = "+zU1A870OOOqy3MPLcEoicN6dnIGZv/q0aqCVRRfCHAICciaswuIvdX0uDJx0NrUe0sW40dzIllxuUA39nPqcw=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-3.10.6.tgz"; + sha512 = "RIlEx+ofWLYRNjxCkkV3G0XQPM+/KA5RXRDb5wKQLYO1f+tZAaHoUh8fHDIvxGf/ohY/OIjYYGSsU+ysimfwiQ=="; }; }; - "@lerna/link-3.10.0" = { + "@lerna/link-3.10.6" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.10.0.tgz"; - sha512 = "uZvLxTSekqV8Kx0zMPgcxpTWyRkjnqnUzRiff9HQtOq+gBBifX079jGT7X73CO5eXFzp2TkOJtI1KNL0BNoNtA=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.10.6.tgz"; + sha512 = "dwD6qftRWitgLDYbqtDrgO7c8uF5C0fHVew5M6gU5m9tBJidqd7cDwHv/bXboLEI63U7tt5y6LY+wEpYUFsBRw=="; }; }; - "@lerna/list-3.10.1" = { + "@lerna/list-3.10.6" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "3.10.1"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-3.10.1.tgz"; - sha512 = "y2VwTeJ8tcQ0dmJJNhloGfhmCBUG3RXafqNkUVUG/ItoJlfzVniQOMdIDlkre86ZtnQv9yrB2vFaC2Vg++PklQ=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-3.10.6.tgz"; + sha512 = "3ElQBj2dOB4uUkpsjC1bxdeZwEzRBuV1pBBs5E1LncwsZf7D9D99Z32fuZsDaCHpEMgHAD4/j8juI3/7m5dkaQ=="; }; }; - "@lerna/listable-3.10.0" = { + "@lerna/listable-3.10.6" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.10.0.tgz"; - sha512 = "95EwogHBqJxrXOCkf3DAZQAzJes+I668Lg5BJDotfp9eZeJAbgGl6GPz5U+szPq0PrYfK+2kJv9xNXVnbfCZAw=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.10.6.tgz"; + sha512 = "F7ZuvesSgeuMiJf99eOum5p1MQGQStykcmHH1ek+LQRMiGGF1o3PkBxPvHTZBADGOFarek8bFA5TVmRAMX7NIw=="; }; }; "@lerna/log-packed-3.6.0" = { @@ -1237,13 +1255,13 @@ let sha512 = "8A5hN2CekM1a0Ix4VUO/g+REo+MsnXb8lnQ0bGjr1YGWzSL5NxYJ0Z9+0pwTfDpvRDYlFYO0rMVwBUW44b4dUw=="; }; }; - "@lerna/package-graph-3.10.0" = { + "@lerna/package-graph-3.10.6" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.10.0.tgz"; - sha512 = "9LX8I8KxzCMjfNPWvN/CxHW51s89S3Mnx2EYsbo8c8Gh8I6InA6e+Xur6uuCyZ6/0LKqQ/cXwrP3J81A4nIDSQ=="; + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.10.6.tgz"; + sha512 = "mpIOJbhi+xLqT9BcUrLVD4We8WUdousQf/QndbEWl8DWAW1ethtRHVsCm9ufdBB3F9nj4PH/hqnDWWwqE+rS4w=="; }; }; "@lerna/project-3.10.0" = { @@ -1264,13 +1282,13 @@ let sha512 = "nyAjPMolJ/ZRAAVcXrUH89C4n1SiWvLh4xWNvWYKLcf3PI5yges35sDFP/HYrM4+cEbkNFuJCRq6CxaET4PRsg=="; }; }; - "@lerna/publish-3.10.5" = { + "@lerna/publish-3.10.6" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.10.5.tgz"; - sha512 = "26wjTtRbcUXlG8Na7goI0X1trMYivbuLT1bAXHNvuDaHYs7iE6LRjU4NCTNAmrdVnqagHkTxMuGRFn3r1NgcKg=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.10.6.tgz"; + sha512 = "Wrmgf82rtZWdHSrTzZGOi1/QbkPJduUSmVMhZsdnLC814WHrNGYKbayvFBOo1RAAJ4EKggZ2ReOWXKhg/IZYUw=="; }; }; "@lerna/pulse-till-done-3.7.1" = { @@ -1300,13 +1318,13 @@ let sha512 = "RSKSfxPURc58ERCD/PuzorR86lWEvIWNclXYGvIYM76yNGrWiDF44pGHQvB4J+Lxa5M+52ZtZC/eOC7A7YCH4g=="; }; }; - "@lerna/run-3.10.1" = { + "@lerna/run-3.10.6" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "3.10.1"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-3.10.1.tgz"; - sha512 = "g9YIcpk87Gok+zjicru/KsuZ1lcyuG5oERyAii3RSmpLaiwTh/SOSnxilrvDOYWwxYU5rPzvaCalkQI/i31Itw=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-3.10.6.tgz"; + sha512 = "KS2lWbu/8WUUscQPi9U8sPO6yYpzf/0GmODjpruR1nRi1u/tuncdjTiG+hjGAeFC1BD7YktT9Za6imIpE8RXmA=="; }; }; "@lerna/run-lifecycle-3.10.5" = { @@ -1363,13 +1381,13 @@ let sha512 = "MWltncGO5VgMS0QedTlZCjFUMF/evRjDMMHrtVorkIB2Cp5xy0rkKa8iDBG43qpUWeG1giwi58yUlETBcWfILw=="; }; }; - "@lerna/version-3.10.5" = { + "@lerna/version-3.10.6" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.10.5.tgz"; - sha512 = "I6KynsrWvtusylggw+XmlfUud26ncfUctbn8hUQsofkxiouuElx1fUU4rEsOaonxvNk09bwlsGmfbIFsPeN6Hg=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.10.6.tgz"; + sha512 = "77peW2ROlHHl1e/tHBUmhpb8tsO6CIdlx34XapZhUuIVykrkOuqVFFxqMecrGG8SJe0e3l1G+Fah7bJTQcG0kw=="; }; }; "@lerna/write-log-file-3.6.0" = { @@ -1579,6 +1597,105 @@ let sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; + "@textlint/ast-node-types-4.2.1" = { + name = "_at_textlint_slash_ast-node-types"; + packageName = "@textlint/ast-node-types"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.1.tgz"; + sha512 = "Pqg1LTJpF929Ovi/lCaPqlyz8yDwBFbQulC0jyQcbRAoTxYS4AZMc48Ug2yk0so5hISQXKrlAxyVBmBVl9EKGA=="; + }; + }; + "@textlint/ast-traverse-2.1.2" = { + name = "_at_textlint_slash_ast-traverse"; + packageName = "@textlint/ast-traverse"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.2.tgz"; + sha512 = "0VIx7Ql8OVHPOWKqHvgUDfyNlhZdG+0sn5bOhHJcbJs8HiSIdErO5pV1fPc2Apro3G15v6gq1rmjUR36ScwwdQ=="; + }; + }; + "@textlint/feature-flag-3.1.2" = { + name = "_at_textlint_slash_feature-flag"; + packageName = "@textlint/feature-flag"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.1.2.tgz"; + sha512 = "vtD/LXZoUHx++ExUvnUZKvl76+6kFHlHl0XLnyP6ZQSVoXF9ElVdFvvRaptPrpXu8SZYqCN2Hcz5iamXZP0hLQ=="; + }; + }; + "@textlint/fixer-formatter-3.1.2" = { + name = "_at_textlint_slash_fixer-formatter"; + packageName = "@textlint/fixer-formatter"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.2.tgz"; + sha512 = "Z+OHngp9dKN5zP5Yqerj//UYnhGPYjf6tYx/LcUT1eMZMk3JQMX6jENBVzO9cEVDbrARmV1zAtM0yO4x5UrpIQ=="; + }; + }; + "@textlint/kernel-3.1.2" = { + name = "_at_textlint_slash_kernel"; + packageName = "@textlint/kernel"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.1.2.tgz"; + sha512 = "dTeYpVUqUX7CPaZKFEMZzHiDUrbMrJnwreLTML820t9/nAHq4CL+Gvh+3FutWLu8vs65ek1R86rBjmD5SjRdCA=="; + }; + }; + "@textlint/linter-formatter-3.1.2" = { + name = "_at_textlint_slash_linter-formatter"; + packageName = "@textlint/linter-formatter"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.2.tgz"; + sha512 = "yYMh8ZrMJpNS1wTc4fuYz/urfD/ooe1sHE8aLIJkYX6ND09oRWi3gsx/fsdsy6KIwscadzetudK61FmWPr6nSg=="; + }; + }; + "@textlint/markdown-to-ast-6.1.2" = { + name = "_at_textlint_slash_markdown-to-ast"; + packageName = "@textlint/markdown-to-ast"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.2.tgz"; + sha512 = "we9n29GfopUUA0j91xRVQ75ME5YhdnWQZcjfpXQK98DQ//xwVzteMuZe1Og8CArA/aDoTRq0EYFkN2oGu3v20Q=="; + }; + }; + "@textlint/text-to-ast-3.1.2" = { + name = "_at_textlint_slash_text-to-ast"; + packageName = "@textlint/text-to-ast"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.1.2.tgz"; + sha512 = "ge8O9p3HYLy2vni0k4Qh12fRKsJySp/wiuJlvGqemA+hJvSC0164N8I61aHBqgTWTciHHhKBH4ofqCOdSbwKTg=="; + }; + }; + "@textlint/textlint-plugin-markdown-5.1.2" = { + name = "_at_textlint_slash_textlint-plugin-markdown"; + packageName = "@textlint/textlint-plugin-markdown"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.2.tgz"; + sha512 = "J7lyu1FY17EyMna5ouioK3wxhly4D9CPKmsIZnKFYKKBPfb/Prmz7iONbR0h0RCf4GSiKwCuttl0BkOv1eWFXA=="; + }; + }; + "@textlint/textlint-plugin-text-4.1.2" = { + name = "_at_textlint_slash_textlint-plugin-text"; + packageName = "@textlint/textlint-plugin-text"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.2.tgz"; + sha512 = "jELCMWVWxxegeY5oy3GmP7eWT5G/6lfG1bpEFUGvcVz70l4GAtV9mvZ0SV4344w4qzk0fgahlS0ZJ/0EAsmEig=="; + }; + }; + "@textlint/types-1.1.2" = { + name = "_at_textlint_slash_types"; + packageName = "@textlint/types"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/types/-/types-1.1.2.tgz"; + sha512 = "XNsS9GTi3lrhKYbqrZZIaYOXxi1DUeMdNyg9bbcRG9yZUD6T6TVEFI0s2fCvPpUFk31JSsOyWpEBLcd/TwrsNQ=="; + }; + }; "@types/accepts-1.3.5" = { name = "_at_types_slash_accepts"; packageName = "@types/accepts"; @@ -1588,13 +1705,13 @@ let sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; }; }; - "@types/async-2.0.50" = { - name = "_at_types_slash_async"; - packageName = "@types/async"; - version = "2.0.50"; + "@types/bluebird-3.5.25" = { + name = "_at_types_slash_bluebird"; + packageName = "@types/bluebird"; + version = "3.5.25"; src = fetchurl { - url = "https://registry.npmjs.org/@types/async/-/async-2.0.50.tgz"; - sha512 = "VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q=="; + url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.25.tgz"; + sha512 = "yfhIBix+AIFTmYGtkC0Bi+XGjSkOINykqKvO/Wqdz/DuXlAKK7HmhLAXdPIGsV4xzKcL3ev/zYc4yLNo+OvGaw=="; }; }; "@types/body-parser-1.17.0" = { @@ -3010,13 +3127,13 @@ let sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; }; }; - "apollo-cache-1.1.22" = { + "apollo-cache-1.1.25" = { name = "apollo-cache"; packageName = "apollo-cache"; - version = "1.1.22"; + version = "1.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.22.tgz"; - sha512 = "8PoxhQLISj2oHwT7i/r4l+ly4y3RKZls+dtXzAewu3U77P9dNZKhYkRNAhx9iEfsrNoHgXBV8vMp64hb1uYh+g=="; + url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.25.tgz"; + sha512 = "9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA=="; }; }; "apollo-cache-control-0.4.0" = { @@ -3028,22 +3145,22 @@ let sha512 = "WuriaNQIugTE8gYwfBWWCbbQTSKul/cV4JMi5UgqNIUvjHvnKZQLKbt5uYWow6QQNMkLT9hey8QPYkWpogkeSA=="; }; }; - "apollo-cache-inmemory-1.3.12" = { + "apollo-cache-inmemory-1.4.2" = { name = "apollo-cache-inmemory"; packageName = "apollo-cache-inmemory"; - version = "1.3.12"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.12.tgz"; - sha512 = "jxWcW64QoYQZ09UH6v3syvCCl3MWr6bsxT3wYYL6ORi8svdJUpnNrHTcv5qXqJYVg/a+NHhfEt+eGjJUG2ytXA=="; + url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.2.tgz"; + sha512 = "fDVmj5j1e3W+inyuSwjIcMgbQ4edcFgmiKTBMFAEKAq0jg33X7FrbDX8JT2t5Vuf75Mva50JDlt5wXdu7C6WuA=="; }; }; - "apollo-client-2.4.8" = { + "apollo-client-2.4.12" = { name = "apollo-client"; packageName = "apollo-client"; - version = "2.4.8"; + version = "2.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.8.tgz"; - sha512 = "OAFbCTnGPtaIv0j+EZYzY20d+MD2JNbJ/YXZ4s0/oZlSg87bb0gjcIbccw2lnytipymZcZNr5ArFFeh0saGEwA=="; + url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.12.tgz"; + sha512 = "E5ClFSB9btJLYibLKwLDSCg+w9tI+25eZgXOM+DClawu7of4d/xhuV/xvpuZpsMP3qwrp0QPacBnfG4tUJs3/w=="; }; }; "apollo-codegen-0.20.2" = { @@ -3289,13 +3406,13 @@ let sha512 = "ZN5gsbBjImEZTWWTUHpCEGDasnoBGbaODpznQ5EawyNHceuFYSNJbbft+ZZ841vZAcj9XZdKUKoaLBlMZ/r7nw=="; }; }; - "apollo-utilities-1.0.27" = { + "apollo-utilities-1.1.2" = { name = "apollo-utilities"; packageName = "apollo-utilities"; - version = "1.0.27"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.27.tgz"; - sha512 = "nzrMQ89JMpNmYnVGJ4t8zN75gQbql27UDhlxNi+3OModp0Masx5g+fQmQJ5B4w2dpRuYOsdwFLmj3lQbwOKV1Q=="; + url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.2.tgz"; + sha512 = "EjDx8vToK+zkWIxc76ZQY/irRX52puNg04xf/w8R0kVTDAgHuVfnFVC01O5vE25kFnIaa5em0pFI0p9b6YMkhQ=="; }; }; "app-builder-5.2.0" = { @@ -4180,13 +4297,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.389.0" = { + "aws-sdk-2.391.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.389.0"; + version = "2.391.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.389.0.tgz"; - sha512 = "4KBH2o4f/ncTJfKzUsMNxxPNWkF7eFVZlYLRpeFAYEgw+r8xE//0YBReNnySS5Y5oQTOtg376bOlQSWtFhKv1g=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.391.0.tgz"; + sha512 = "2xL59xW/bosjccZdrPwV9MfMJ7vkg2dn83m4LTgk+p+y8IOE4DdCP9dE+toz0frtVatriPDIXCA0dyOVYFt8EA=="; }; }; "aws-sign2-0.6.0" = { @@ -5557,13 +5674,22 @@ let sha1 = "55fa64920d9670087d44150404525d59f9511c20"; }; }; - "bower-1.8.4" = { + "boundary-1.0.1" = { + name = "boundary"; + packageName = "boundary"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boundary/-/boundary-1.0.1.tgz"; + sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; + }; + }; + "bower-1.8.7" = { name = "bower"; packageName = "bower"; - version = "1.8.4"; + version = "1.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; - sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.7.tgz"; + sha512 = "M0yrA0IkpXP4v2taRkmowyUHTCFAvtfTVtRDAXBnhZM02xh8fP3wlrdOiXPs/5CYBCdj20WyGKZuYA0g3h3Y1w=="; }; }; "bower-endpoint-parser-0.2.1" = { @@ -5863,13 +5989,13 @@ let sha1 = "0bd76704258be829b2398bb50e4b62d1a166b0b9"; }; }; - "browserslist-4.4.0" = { + "browserslist-4.4.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.4.0.tgz"; - sha512 = "tQkHS8VVxWbrjnNDXgt7/+SuPJ7qDvD0Y2e6bLtoQluR2SPvlmPUcfcU75L1KAalhqULlIFJlJ6BDfnYyJxJsw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz"; + sha512 = "pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A=="; }; }; "buffer-3.6.0" = { @@ -8680,13 +8806,13 @@ let sha512 = "NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g=="; }; }; - "core-js-3.0.0-beta.8" = { + "core-js-3.0.0-beta.9" = { name = "core-js"; packageName = "core-js"; - version = "3.0.0-beta.8"; + version = "3.0.0-beta.9"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.8.tgz"; - sha512 = "ex9wpitprNDuK6bPRljFW0z0IBatqtmqeuZ1HpcFcSkdOQSGNu3XdZSTshEuAIeYgLarHpw55P3SQlKAnXmpuQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.9.tgz"; + sha512 = "OGLbGro2f0s8UXVyu2s9kIW42pcuRoNEqJsmn8a4rAOO9G5A2t96l++rf+4mHNw9GKrbdozZ9G5ieDKOBl68zQ=="; }; }; "core-util-is-1.0.2" = { @@ -10057,13 +10183,13 @@ let sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; }; }; - "defer-to-connect-1.0.1" = { + "defer-to-connect-1.0.2" = { name = "defer-to-connect"; packageName = "defer-to-connect"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.1.tgz"; - sha512 = "2e0FJesseUqQj671gvZWfUyxpnFx/5n4xleamlpCD3U6Fm5dh5qzmmLNxNhtmHF06+SYVHH8QU6FACffYTnj0Q=="; + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz"; + sha512 = "k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw=="; }; }; "deferred-leveldown-0.2.0" = { @@ -10417,6 +10543,15 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; + "diff-2.2.3" = { + name = "diff"; + packageName = "diff"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; + sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; + }; + }; "diff-3.5.0" = { name = "diff"; packageName = "diff"; @@ -11174,13 +11309,13 @@ let sha512 = "NYXzzaJT/zw8v7jzDWGXuvX3/soj+5NTLHxX0n/T6DICbmyDj8kO7rlI2wSKs9UTNjXhZ7quFQEKcgcf/SZksw=="; }; }; - "elmi-to-json-0.19.0" = { + "elmi-to-json-0.19.1" = { name = "elmi-to-json"; packageName = "elmi-to-json"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-0.19.0.tgz"; - sha512 = "qNrxc1m2KAYbxT22rHyWBjzhYjJkENYgl6Ya7XVL1uxcZPiaINwFEJ7OdpGnLsM79xsWPT0z9yesQtYXKrWE7w=="; + url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-0.19.1.tgz"; + sha512 = "O0Z3YsYU9OTb1hTDGORWxi69QjQFEIPfZVq/oc1D5lhL3swduHKY8vdKGuo+WlKVdTas99oNIsgL7yojWdYcsQ=="; }; }; "email-validator-2.0.4" = { @@ -11868,13 +12003,13 @@ let sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.12.0" = { + "eslint-5.12.1" = { name = "eslint"; packageName = "eslint"; - version = "5.12.0"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.12.0.tgz"; - sha512 = "LntwyPxtOHrsJdcSwyQKVtHofPHdv+4+mFwEe91r2V13vqpM8yLr7b1sW+Oo/yheOPkWYsYlYJCkzlFAt8KV7g=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.12.1.tgz"; + sha512 = "54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -12192,6 +12327,15 @@ let sha512 = "3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg=="; }; }; + "events-3.0.0" = { + name = "events"; + packageName = "events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz"; + sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="; + }; + }; "events.node-0.4.9" = { name = "events.node"; packageName = "events.node"; @@ -12867,6 +13011,15 @@ let sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; }; }; + "fault-1.0.2" = { + name = "fault"; + packageName = "fault"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz"; + sha512 = "o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw=="; + }; + }; "faye-websocket-0.11.1" = { name = "faye-websocket"; packageName = "faye-websocket"; @@ -13434,13 +13587,13 @@ let sha1 = "36ce06abe2e0e01c44dd69f2a165305a2320649b"; }; }; - "flumedb-1.0.1" = { + "flumedb-1.0.4" = { name = "flumedb"; packageName = "flumedb"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/flumedb/-/flumedb-1.0.1.tgz"; - sha512 = "mT0v0dY9EkWRGwDtTfavYNv2Z6nrMNlVZCNJD7qxjfPJymfv8kNYB4UvDdBHleHegvzjufjnE73IkRG5DgMjww=="; + url = "https://registry.npmjs.org/flumedb/-/flumedb-1.0.4.tgz"; + sha512 = "zTB3OI8RxFe2AtDlEXZtvDCJkw02/MSdKMYYnr9bYWuwQ4fYcnInGkDwxQU5L7OQswzM/brhdl3XYNGWpMxF1w=="; }; }; "flumelog-offset-3.3.2" = { @@ -13632,6 +13785,15 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; + "format-0.2.2" = { + name = "format"; + packageName = "format"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/format/-/format-0.2.2.tgz"; + sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b"; + }; + }; "format-util-1.0.3" = { name = "format-util"; packageName = "format-util"; @@ -13947,13 +14109,13 @@ let sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg=="; }; }; - "fsevents-1.2.6" = { + "fsevents-1.2.7" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.6.tgz"; - sha512 = "BalK54tfK0pMC0jQFb2oHn1nz7JNQD/2ex5pBnCHgBi2xG7VV0cAOGy2RS2VbCqUXx5/6obMrMcQTJ8yjcGzbg=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz"; + sha512 = "Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw=="; }; }; "fsevents-2.0.1" = { @@ -14858,13 +15020,13 @@ let sha512 = "C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q=="; }; }; - "graphql-anywhere-4.1.24" = { + "graphql-anywhere-4.1.27" = { name = "graphql-anywhere"; packageName = "graphql-anywhere"; - version = "4.1.24"; + version = "4.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.24.tgz"; - sha512 = "g81K7FqXSF3q1iqFWlwiwD+g0SDkPUUa9+Wa+7BOrAe5+7R4BdNWL4dw9BRsJxt0Xx6nOaI2E+VM7QMAucQFvA=="; + url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.27.tgz"; + sha512 = "ErASfs9siEMrmroHU0V4heh6cIdA8K/SoYpahJFgEM6YDAwUZuycTAKIrMaK8XJI37sHZWcujF/ySuYnIkP5vw=="; }; }; "graphql-cli-prepare-1.4.19" = { @@ -14993,13 +15155,13 @@ let sha512 = "+ytmryoHF1LVf58NKEaNPRUzYyXplm120ntxfPcgOBC7TnK7Tv/4VRHeh4FAR9iL+O1bqhZs4nkibxQ+OA5cDQ=="; }; }; - "graphql-tag-2.10.0" = { + "graphql-tag-2.10.1" = { name = "graphql-tag"; packageName = "graphql-tag"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.0.tgz"; - sha512 = "9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w=="; + url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz"; + sha512 = "jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="; }; }; "graphql-tools-4.0.3" = { @@ -16208,13 +16370,13 @@ let sha512 = "5s6NiCGbtWc+OQA60jrre54w12U7tynIyUNjO5LJjNA5lWwvCv6640roq8Wk/wIuaqnd4Pgtp453OyJ7hbONkQ=="; }; }; - "immutable-tuple-0.4.9" = { + "immutable-tuple-0.4.10" = { name = "immutable-tuple"; packageName = "immutable-tuple"; - version = "0.4.9"; + version = "0.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/immutable-tuple/-/immutable-tuple-0.4.9.tgz"; - sha512 = "LWbJPZnidF8eczu7XmcnLBsumuyRBkpwIRPCZxlojouhBo5jEBO4toj6n7hMy6IxHU/c+MqDSWkvaTpPlMQcyA=="; + url = "https://registry.npmjs.org/immutable-tuple/-/immutable-tuple-0.4.10.tgz"; + sha512 = "45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q=="; }; }; "import-fresh-2.0.0" = { @@ -16604,6 +16766,15 @@ let sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q=="; }; }; + "interop-require-1.0.0" = { + name = "interop-require"; + packageName = "interop-require"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interop-require/-/interop-require-1.0.0.tgz"; + sha1 = "e53103679944c88d7e6105b62a9f4475c783971e"; + }; + }; "interpret-1.1.0" = { name = "interpret"; packageName = "interpret"; @@ -17594,6 +17765,15 @@ let sha1 = "110f9ff74c37f663e1ec7915eb451f2db93ac9df"; }; }; + "is-whitespace-character-1.0.2" = { + name = "is-whitespace-character"; + packageName = "is-whitespace-character"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz"; + sha512 = "SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ=="; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -17603,6 +17783,15 @@ let sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; + "is-word-character-1.0.2" = { + name = "is-word-character"; + packageName = "is-word-character"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.2.tgz"; + sha512 = "T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA=="; + }; + }; "is-wsl-1.1.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -20772,6 +20961,15 @@ let sha512 = "p+NIGQbEBxlw/qWwG+NME98G/9kjOQI70hmaH8QEZtIWfTmfMYLKQW4PJChP4izPHNAxlOfv/qefP0+2ZXn84A=="; }; }; + "map-like-2.0.0" = { + name = "map-like"; + packageName = "map-like"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-like/-/map-like-2.0.0.tgz"; + sha1 = "94496d49ad333c0dc3234b27adbbd1e8535953b4"; + }; + }; "map-merge-1.1.0" = { name = "map-merge"; packageName = "map-merge"; @@ -20826,6 +21024,15 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; + "markdown-escapes-1.0.2" = { + name = "markdown-escapes"; + packageName = "markdown-escapes"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz"; + sha512 = "lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA=="; + }; + }; "markdown-it-8.4.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -22819,13 +23026,13 @@ let sha512 = "FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w=="; }; }; - "node-libs-browser-2.1.0" = { + "node-libs-browser-2.2.0" = { name = "node-libs-browser"; packageName = "node-libs-browser"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz"; - sha512 = "5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg=="; + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz"; + sha512 = "5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA=="; }; }; "node-modules-regexp-1.0.0" = { @@ -24035,13 +24242,13 @@ let sha512 = "YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw=="; }; }; - "optimism-0.6.8" = { + "optimism-0.6.9" = { name = "optimism"; packageName = "optimism"; - version = "0.6.8"; + version = "0.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/optimism/-/optimism-0.6.8.tgz"; - sha512 = "bN5n1KCxSqwBDnmgDnzMtQTHdL+uea2HYFx1smvtE+w2AMl0Uy31g0aXnP/Nt85OINnMJPRpJyfRQLTCqn5Weg=="; + url = "https://registry.npmjs.org/optimism/-/optimism-0.6.9.tgz"; + sha512 = "xoQm2lvXbCA9Kd7SCx6y713Y7sZ6fUc5R6VYpoL5M6svKJbTuvtNopexK8sO8K4s0EOUYHuPN2+yAEsNyRggkQ=="; }; }; "optimist-0.2.8" = { @@ -24656,13 +24863,13 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.1" = { + "parse-asn1-5.1.3" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.1"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; - sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.3.tgz"; + sha512 = "VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg=="; }; }; "parse-entities-1.2.0" = { @@ -25124,6 +25331,15 @@ let sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; }; }; + "path-to-glob-pattern-1.0.2" = { + name = "path-to-glob-pattern"; + packageName = "path-to-glob-pattern"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-glob-pattern/-/path-to-glob-pattern-1.0.2.tgz"; + sha1 = "473e6a3a292a9d13fbae3edccee72d3baba8c619"; + }; + }; "path-to-regexp-0.1.3" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -25592,6 +25808,15 @@ let sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; }; }; + "pluralize-2.0.0" = { + name = "pluralize"; + packageName = "pluralize"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-2.0.0.tgz"; + sha1 = "72b726aa6fac1edeee42256c7d8dc256b335677f"; + }; + }; "pluralize-7.0.0" = { name = "pluralize"; packageName = "pluralize"; @@ -27258,13 +27483,13 @@ let sha1 = "437344aeb2189f65e678ed1af37f0f760a5453ef"; }; }; - "pull-ws-3.3.1" = { + "pull-ws-3.3.2" = { name = "pull-ws"; packageName = "pull-ws"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/pull-ws/-/pull-ws-3.3.1.tgz"; - sha512 = "kJodbLQT+oKjcRIQO+vQNw6xWBuEo7Kxp51VMOvb6cvPvHYA+aNLzm+NmkB/5dZwbuTRYGMal9QPvH52tzM1ZA=="; + url = "https://registry.npmjs.org/pull-ws/-/pull-ws-3.3.2.tgz"; + sha512 = "Bn4bcJsSzJGOQl4RBulDhG1FkcbDHSCXteI8Jg5k4X6X5TxVzZzKilWJ1WV2v4OnRXl2eYbtHFGsPl8Cr1xJzw=="; }; }; "pump-0.3.5" = { @@ -28338,6 +28563,15 @@ let sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f"; }; }; + "remark-frontmatter-1.3.1" = { + name = "remark-frontmatter"; + packageName = "remark-frontmatter"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.1.tgz"; + sha512 = "Zj/fDMYnSVgMCeKp8fXIhtMoZq4G6E1dnwfMoO8fVXrm/+oVSiN8YMREtwN2cctgK9EsnYSeS1ExX2hcX/fE1A=="; + }; + }; "remark-html-2.0.2" = { name = "remark-html"; packageName = "remark-html"; @@ -28347,6 +28581,15 @@ let sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; }; }; + "remark-parse-5.0.0" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz"; + sha512 = "b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA=="; + }; + }; "remove-array-items-1.1.1" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -31227,13 +31470,13 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; - "ssb-blobs-1.1.8" = { + "ssb-blobs-1.1.9" = { name = "ssb-blobs"; packageName = "ssb-blobs"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.8.tgz"; - sha512 = "WcYjqv8F383QvgCTdNdYp+xzJACLL+OiVLD8Got5qmcevbwv2nrUNtQOhe5zJ5Qfl4o+Y/RYqEFGrUUq9oTCvg=="; + url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.9.tgz"; + sha512 = "CkI12tt5looI54X2dhsMNwoVqVcff471ZgEhew69g2EPByfejryuoOnAZUuQhgYDBLISQj5oID2R+7wCH6yOyQ=="; }; }; "ssb-client-4.6.0" = { @@ -31524,6 +31767,15 @@ let sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; }; }; + "state-toggle-1.0.1" = { + name = "state-toggle"; + packageName = "state-toggle"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz"; + sha512 = "Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og=="; + }; + }; "static-eval-2.0.0" = { name = "static-eval"; packageName = "static-eval"; @@ -32271,6 +32523,15 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; + "structured-source-3.0.2" = { + name = "structured-source"; + packageName = "structured-source"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/structured-source/-/structured-source-3.0.2.tgz"; + sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5"; + }; + }; "stylehacks-4.0.1" = { name = "stylehacks"; packageName = "stylehacks"; @@ -33667,6 +33928,15 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; + "trough-1.0.3" = { + name = "trough"; + packageName = "trough"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/trough/-/trough-1.0.3.tgz"; + sha512 = "fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw=="; + }; + }; "truncate-2.0.1" = { name = "truncate"; packageName = "truncate"; @@ -33685,6 +33955,15 @@ let sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; }; }; + "try-resolve-1.0.1" = { + name = "try-resolve"; + packageName = "try-resolve"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/try-resolve/-/try-resolve-1.0.1.tgz"; + sha1 = "cfde6fabd72d63e5797cfaab873abbe8e700e912"; + }; + }; "ts-node-7.0.1" = { name = "ts-node"; packageName = "ts-node"; @@ -34261,6 +34540,15 @@ let sha1 = "14bc6cd40d98ffff75b405506bad873ecbbac3ba"; }; }; + "unified-6.2.0" = { + name = "unified"; + packageName = "unified"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-6.2.0.tgz"; + sha512 = "1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA=="; + }; + }; "union-0.4.6" = { name = "union"; packageName = "union"; @@ -34297,6 +34585,15 @@ let sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; }; }; + "unique-concat-0.2.2" = { + name = "unique-concat"; + packageName = "unique-concat"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-concat/-/unique-concat-0.2.2.tgz"; + sha1 = "9210f9bdcaacc5e1e3929490d7c019df96f18712"; + }; + }; "unique-filename-1.1.1" = { name = "unique-filename"; packageName = "unique-filename"; @@ -34351,6 +34648,24 @@ let sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw=="; }; }; + "unist-util-remove-position-1.1.2" = { + name = "unist-util-remove-position"; + packageName = "unist-util-remove-position"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; + sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q=="; + }; + }; + "unist-util-stringify-position-1.1.2" = { + name = "unist-util-stringify-position"; + packageName = "unist-util-stringify-position"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz"; + sha512 = "pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="; + }; + }; "unist-util-visit-1.4.0" = { name = "unist-util-visit"; packageName = "unist-util-visit"; @@ -34810,6 +35125,15 @@ let sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="; }; }; + "util-0.11.1" = { + name = "util"; + packageName = "util"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz"; + sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; + }; + }; "util-0.4.9" = { name = "util"; packageName = "util"; @@ -35179,6 +35503,15 @@ let sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7"; }; }; + "vfile-2.3.0" = { + name = "vfile"; + packageName = "vfile"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz"; + sha512 = "ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w=="; + }; + }; "vfile-find-down-1.0.0" = { name = "vfile-find-down"; packageName = "vfile-find-down"; @@ -35197,6 +35530,24 @@ let sha1 = "5604da6fe453b34350637984eb5fe4909e280390"; }; }; + "vfile-location-2.0.4" = { + name = "vfile-location"; + packageName = "vfile-location"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.4.tgz"; + sha512 = "KRL5uXQPoUKu+NGvQVL4XLORw45W62v4U4gxJ3vRlDfI9QsT4ZN1PNXn/zQpKUulqGDpYuT0XDfp5q9O87/y/w=="; + }; + }; + "vfile-message-1.1.1" = { + name = "vfile-message"; + packageName = "vfile-message"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz"; + sha512 = "1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA=="; + }; + }; "vfile-reporter-1.5.0" = { name = "vfile-reporter"; packageName = "vfile-reporter"; @@ -36115,6 +36466,15 @@ let sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; }; }; + "x-is-string-0.1.0" = { + name = "x-is-string"; + packageName = "x-is-string"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz"; + sha1 = "474b50865af3a49a9c4657f05acd145458f77d82"; + }; + }; "xcode-1.1.0" = { name = "xcode"; packageName = "xcode"; @@ -36169,6 +36529,15 @@ let sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"; }; }; + "xml-escape-1.1.0" = { + name = "xml-escape"; + packageName = "xml-escape"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-escape/-/xml-escape-1.1.0.tgz"; + sha1 = "3904c143fa8eb3a0030ec646d2902a2f1b706c44"; + }; + }; "xml-name-validator-2.0.1" = { name = "xml-name-validator"; packageName = "xml-name-validator"; @@ -36910,10 +37279,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.4"; + version = "1.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; - sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.7.tgz"; + sha512 = "M0yrA0IkpXP4v2taRkmowyUHTCFAvtfTVtRDAXBnhZM02xh8fP3wlrdOiXPs/5CYBCdj20WyGKZuYA0g3h3Y1w=="; }; buildInputs = globalBuildInputs; meta = { @@ -36936,7 +37305,7 @@ in sources."argparse-1.0.4" sources."array-find-index-1.0.2" sources."balanced-match-1.0.0" - sources."bower-1.8.4" + sources."bower-1.8.7" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" @@ -37165,7 +37534,7 @@ in sources."os-browserify-0.3.0" sources."pako-1.0.8" sources."parents-1.0.1" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -38134,7 +38503,7 @@ in sources."package-json-4.0.1" sources."pako-0.2.9" sources."parents-1.0.1" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."parseurl-1.3.2" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" @@ -39588,7 +39957,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.389.0" + sources."aws-sdk-2.391.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -39796,7 +40165,7 @@ in sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-base-0.3.0" @@ -40125,10 +40494,10 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.0-rev3"; + version = "0.19.0-rev4"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev3.tgz"; - sha512 = "+zcutibM0LOG6uT48bMsSGzyPnptgenxBUjNMJFRYuddTrOFVH1dFCKUu512lsvihBUJixaxjIG+DjQbWlpO/Q=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev4.tgz"; + sha512 = "PWRg9rOc7R2W1lREG5ZaVDywORXO9TYCJzfkK3KEcyiqBr+NpBONp25VhPQKm5mfQvXEtiCWVvqn54/q0bKx9g=="; }; dependencies = [ sources."ajv-6.7.0" @@ -40208,7 +40577,7 @@ in }) sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."elmi-to-json-0.19.0" + sources."elmi-to-json-0.19.1" sources."escape-string-regexp-1.0.5" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -40812,10 +41181,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.12.0"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.12.0.tgz"; - sha512 = "LntwyPxtOHrsJdcSwyQKVtHofPHdv+4+mFwEe91r2V13vqpM8yLr7b1sW+Oo/yheOPkWYsYlYJCkzlFAt8KV7g=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.12.1.tgz"; + sha512 = "54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" @@ -40984,7 +41353,7 @@ in sources."deep-is-0.1.3" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - sources."eslint-5.12.0" + sources."eslint-5.12.1" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -41594,7 +41963,7 @@ in sources."forever-monitor-1.7.1" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-value-2.0.6" sources."glob-7.1.3" sources."glob-base-0.3.0" @@ -42044,7 +42413,7 @@ in sources."looper-3.0.0" ]; }) - sources."pull-ws-3.3.1" + sources."pull-ws-3.3.2" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" sources."rc-1.2.8" @@ -43151,7 +43520,7 @@ in sources."fragment-cache-0.2.1" sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-value-2.0.6" @@ -45579,7 +45948,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-value-2.0.6" sources."glob-7.1.3" (sources."glob-parent-3.1.0" // { @@ -46183,43 +46552,43 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.10.5.tgz"; - sha512 = "rJ67oqEiF8AVw+9phKbGkC0k0oqu1rdnmzrIfVS40EQCwEtzBC1ABX1886PBV0N40Pt9wCy6a0Jhrd+PV4IiIQ=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.10.6.tgz"; + sha512 = "qdoyEpozHKQQnrpaDWbhiFG85/CBAyz2rkcj78JQVl2g400n9FFqS2Zweol5wusRnUzmpQKxFFll4P9DzIzSIA=="; }; dependencies = [ - sources."@lerna/add-3.10.5" - sources."@lerna/batch-packages-3.10.0" - sources."@lerna/bootstrap-3.10.5" - sources."@lerna/changed-3.10.5" + sources."@lerna/add-3.10.6" + sources."@lerna/batch-packages-3.10.6" + sources."@lerna/bootstrap-3.10.6" + sources."@lerna/changed-3.10.6" sources."@lerna/check-working-tree-3.10.0" sources."@lerna/child-process-3.3.0" - sources."@lerna/clean-3.10.1" - sources."@lerna/cli-3.10.0" + sources."@lerna/clean-3.10.6" + sources."@lerna/cli-3.10.6" sources."@lerna/collect-updates-3.10.1" - sources."@lerna/command-3.10.0" + sources."@lerna/command-3.10.6" sources."@lerna/conventional-commits-3.10.0" - (sources."@lerna/create-3.10.0" // { + (sources."@lerna/create-3.10.6" // { dependencies = [ sources."camelcase-4.1.0" ]; }) sources."@lerna/create-symlink-3.6.0" sources."@lerna/describe-ref-3.10.0" - sources."@lerna/diff-3.10.0" - sources."@lerna/exec-3.10.1" - sources."@lerna/filter-options-3.10.1" + sources."@lerna/diff-3.10.6" + sources."@lerna/exec-3.10.6" + sources."@lerna/filter-options-3.10.6" sources."@lerna/filter-packages-3.10.0" sources."@lerna/get-npm-exec-opts-3.6.0" sources."@lerna/get-packed-3.7.0" - sources."@lerna/global-options-3.1.3" + sources."@lerna/global-options-3.10.6" sources."@lerna/has-npm-version-3.10.0" - sources."@lerna/import-3.10.0" - sources."@lerna/init-3.10.0" - sources."@lerna/link-3.10.0" - sources."@lerna/list-3.10.1" - sources."@lerna/listable-3.10.0" + sources."@lerna/import-3.10.6" + sources."@lerna/init-3.10.6" + sources."@lerna/link-3.10.6" + sources."@lerna/list-3.10.6" + sources."@lerna/listable-3.10.6" sources."@lerna/log-packed-3.6.0" sources."@lerna/npm-conf-3.7.0" sources."@lerna/npm-dist-tag-3.8.5" @@ -46229,21 +46598,21 @@ in sources."@lerna/output-3.6.0" sources."@lerna/pack-directory-3.10.5" sources."@lerna/package-3.7.2" - sources."@lerna/package-graph-3.10.0" + sources."@lerna/package-graph-3.10.6" sources."@lerna/project-3.10.0" sources."@lerna/prompt-3.6.0" - sources."@lerna/publish-3.10.5" + sources."@lerna/publish-3.10.6" sources."@lerna/pulse-till-done-3.7.1" sources."@lerna/resolve-symlink-3.6.0" sources."@lerna/rimraf-dir-3.10.0" - sources."@lerna/run-3.10.1" + sources."@lerna/run-3.10.6" sources."@lerna/run-lifecycle-3.10.5" sources."@lerna/run-parallel-batches-3.0.0" sources."@lerna/symlink-binary-3.10.0" sources."@lerna/symlink-dependencies-3.10.0" sources."@lerna/timer-3.5.0" sources."@lerna/validation-error-3.6.0" - sources."@lerna/version-3.10.5" + sources."@lerna/version-3.10.6" sources."@lerna/write-log-file-3.6.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -47238,7 +47607,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from-0.1.7" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -47587,7 +47956,7 @@ in sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.2.1" @@ -48226,7 +48595,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.4.0" + sources."browserslist-4.4.1" sources."buffer-3.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -48367,7 +48736,7 @@ in sources."clone-1.0.4" ]; }) - sources."defer-to-connect-1.0.1" + sources."defer-to-connect-1.0.2" sources."define-properties-1.1.3" (sources."define-property-2.0.2" // { dependencies = [ @@ -48409,7 +48778,7 @@ in sources."estraverse-4.2.0" sources."estree-walker-0.5.2" sources."esutils-2.0.2" - sources."events-1.1.1" + sources."events-3.0.0" sources."evp_bytestokey-1.0.3" (sources."execa-1.0.0" // { dependencies = [ @@ -48550,7 +48919,7 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-proxy-2.1.0" @@ -48756,7 +49125,7 @@ in }) sources."nice-try-1.0.5" sources."node-fetch-2.3.0" - (sources."node-libs-browser-2.1.0" // { + (sources."node-libs-browser-2.2.0" // { dependencies = [ sources."base64-js-1.3.0" sources."buffer-4.9.1" @@ -48826,7 +49195,7 @@ in sources."pako-1.0.8" sources."parallel-transform-1.1.0" sources."paredit.js-0.3.4" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."parse-glob-3.0.4" sources."parse-json-2.2.0" sources."parse-passwd-1.0.0" @@ -49165,7 +49534,7 @@ in sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" - sources."util-0.10.4" + sources."util-0.11.1" sources."util-deprecate-1.0.2" sources."util.promisify-1.0.0" sources."v8-compile-cache-2.0.2" @@ -51011,7 +51380,7 @@ in }) sources."for-in-1.0.2" sources."fragment-cache-0.2.1" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-stream-3.0.0" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { @@ -51681,10 +52050,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.5.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.5.0.tgz"; - sha512 = "SPq8zG2Kto+Xrq55E97O14Jla13PmQT5kSnvwBj88BmJZ5Nvw++OmlWfhjkB67pcgP5UEXljEtnGFKZtOgt6MQ=="; + url = "https://registry.npmjs.org/npm/-/npm-6.6.0.tgz"; + sha512 = "Q6Lb4YPWIGsyVzfxcZrTu6VQcMEvCHOBlSE0fbuNHj6CYCUuanMUf6HgNyj4QekWTORxQpOgOgaca2YEQ721Ug=="; }; buildInputs = globalBuildInputs; meta = { @@ -52810,10 +53179,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.25.1"; + version = "2.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.1.tgz"; - sha512 = "VlDIaWSEQJuIQOFzhcg4YQ7enQMrJHb11eUclMj1VxIOxCZX51e/EDu+PZ0IO/4iQsgifiVoQcBbacBKi55jDA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.2.tgz"; + sha512 = "DB1IFfFf4bxb2nVveQ+Xi4KXO/5uR/53w6GCBRWaej0SZnrHeK+6Lp+/dh0S3THMnX88TJLniTOkAUBco2AItA=="; }; buildInputs = globalBuildInputs; meta = { @@ -53000,7 +53369,7 @@ in sources."pako-1.0.8" ]; }) - sources."browserslist-4.4.0" + sources."browserslist-4.4.1" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -53154,7 +53523,7 @@ in sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."etag-1.8.1" - sources."events-1.1.1" + sources."events-3.0.0" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -53179,7 +53548,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."function-bind-1.1.1" sources."get-port-3.2.0" sources."get-value-2.0.6" @@ -53391,7 +53760,7 @@ in sources."nice-try-1.0.5" sources."node-addon-api-1.6.2" sources."node-forge-0.7.6" - sources."node-libs-browser-2.1.0" + sources."node-libs-browser-2.2.0" sources."node-releases-1.1.3" sources."nopt-4.0.1" sources."normalize-path-2.1.1" @@ -53418,7 +53787,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."pako-0.2.9" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."parse-json-4.0.0" sources."parseurl-1.3.2" sources."pascalcase-0.1.1" @@ -53749,7 +54118,7 @@ in ]; }) sources."use-3.1.1" - sources."util-0.10.4" + sources."util-0.11.1" sources."util-deprecate-1.0.2" sources."util.promisify-1.0.0" sources."v8-compile-cache-2.0.2" @@ -53965,7 +54334,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" sources."get-value-2.0.6" @@ -54086,7 +54455,7 @@ in sources."os-tmpdir-1.0.2" sources."pako-0.2.9" sources."parents-1.0.1" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" @@ -54684,7 +55053,7 @@ in sources."level-codec-6.2.0" ]; }) - (sources."flumedb-1.0.1" // { + (sources."flumedb-1.0.4" // { dependencies = [ sources."pull-cont-0.0.0" ]; @@ -54727,7 +55096,7 @@ in sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."get-value-2.0.6" @@ -55048,7 +55417,7 @@ in ]; }) sources."pull-write-file-0.2.4" - sources."pull-ws-3.3.1" + sources."pull-ws-3.3.2" sources."pump-2.0.1" sources."push-stream-10.0.4" sources."push-stream-to-pull-stream-1.0.3" @@ -55195,7 +55564,7 @@ in sources."source-map-url-0.4.0" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - sources."ssb-blobs-1.1.8" + sources."ssb-blobs-1.1.9" (sources."ssb-client-4.6.0" // { dependencies = [ sources."multiserver-1.13.7" @@ -56761,7 +57130,7 @@ in sources."fresh-0.5.2" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.1.3" @@ -57250,6 +57619,227 @@ in production = true; bypassCache = true; }; + textlint = nodeEnv.buildNodePackage { + name = "textlint"; + packageName = "textlint"; + version = "11.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint/-/textlint-11.2.1.tgz"; + sha512 = "BXknewyTyypmC7vBvY+2SY5uXmHPG8jnnbiV7f4PBOX8xRciMX7qU5ilGiOb8qDI0NBaNRcwn3lHUqW/90GBIg=="; + }; + dependencies = [ + sources."@azu/format-text-1.0.1" + sources."@azu/style-format-1.0.0" + sources."@textlint/ast-node-types-4.2.1" + sources."@textlint/ast-traverse-2.1.2" + sources."@textlint/feature-flag-3.1.2" + sources."@textlint/fixer-formatter-3.1.2" + sources."@textlint/kernel-3.1.2" + sources."@textlint/linter-formatter-3.1.2" + sources."@textlint/markdown-to-ast-6.1.2" + sources."@textlint/text-to-ast-3.1.2" + sources."@textlint/textlint-plugin-markdown-5.1.2" + sources."@textlint/textlint-plugin-text-4.1.2" + sources."@textlint/types-1.1.2" + sources."@types/bluebird-3.5.25" + sources."ajv-4.11.8" + sources."ajv-keywords-1.5.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."argparse-1.0.10" + sources."bail-1.0.3" + sources."balanced-match-1.0.0" + sources."bluebird-3.5.3" + sources."boundary-1.0.1" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.1.1" + sources."builtin-modules-1.1.1" + sources."chalk-1.1.3" + sources."character-entities-1.2.2" + sources."character-entities-legacy-1.1.2" + sources."character-reference-invalid-1.1.2" + sources."charenc-0.0.2" + sources."circular-json-0.3.3" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."collapse-white-space-1.0.4" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."core-util-is-1.0.2" + sources."crypt-0.0.2" + sources."debug-4.1.1" + sources."deep-equal-1.0.1" + sources."deep-is-0.1.3" + sources."define-properties-1.1.3" + sources."diff-2.2.3" + sources."error-ex-1.3.2" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."extend-3.0.2" + sources."fast-levenshtein-2.0.6" + sources."fault-1.0.2" + sources."file-entry-cache-2.0.0" + sources."find-up-2.1.0" + sources."flat-cache-1.3.4" + sources."format-0.2.2" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."get-stdin-5.0.1" + sources."glob-7.1.3" + sources."graceful-fs-4.1.15" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-symbols-1.0.0" + sources."hosted-git-info-2.7.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."interop-require-1.0.0" + sources."is-alphabetical-1.0.2" + sources."is-alphanumerical-1.0.2" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" + sources."is-decimal-1.0.2" + sources."is-file-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-hexadecimal-1.0.2" + sources."is-plain-obj-1.1.0" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" + sources."is-utf8-0.2.1" + sources."is-whitespace-character-1.0.2" + sources."is-word-character-1.0.2" + sources."isarray-1.0.0" + sources."js-yaml-3.12.1" + sources."json-parse-better-errors-1.0.2" + sources."json-stable-stringify-1.0.1" + (sources."json5-1.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."jsonify-0.0.0" + sources."levn-0.3.0" + sources."load-json-file-1.1.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.11" + sources."log-symbols-1.0.2" + sources."map-like-2.0.0" + sources."markdown-escapes-1.0.2" + sources."md5-2.2.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.1.1" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."object-keys-1.0.12" + sources."once-1.4.0" + sources."optionator-0.8.2" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parse-entities-1.2.0" + sources."parse-json-2.2.0" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-to-glob-pattern-1.0.2" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pluralize-2.0.0" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.0" + (sources."rc-config-loader-2.0.2" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) + sources."read-pkg-1.1.0" + (sources."read-pkg-up-3.0.0" // { + dependencies = [ + sources."load-json-file-4.0.0" + sources."parse-json-4.0.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."read-pkg-3.0.0" + sources."strip-bom-3.0.0" + ]; + }) + sources."readable-stream-2.3.6" + sources."remark-frontmatter-1.3.1" + sources."remark-parse-5.0.0" + sources."repeat-string-1.6.1" + sources."replace-ext-1.0.0" + sources."require-from-string-2.0.2" + sources."rimraf-2.6.3" + sources."safe-buffer-5.1.2" + sources."semver-5.6.0" + sources."slice-ansi-0.0.4" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.3" + sources."sprintf-js-1.0.3" + sources."state-toggle-1.0.1" + sources."string-width-1.0.2" + sources."string.prototype.padstart-3.0.0" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."structured-source-3.0.2" + sources."supports-color-2.0.0" + (sources."table-3.8.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."text-table-0.2.0" + sources."traverse-0.6.6" + sources."trim-0.0.1" + sources."trim-trailing-lines-1.1.1" + sources."trough-1.0.3" + sources."try-resolve-1.0.1" + sources."type-check-0.3.2" + sources."typedarray-0.0.6" + sources."unherit-1.1.1" + sources."unified-6.2.0" + sources."unique-concat-0.2.2" + sources."unist-util-is-2.1.2" + sources."unist-util-remove-position-1.1.2" + sources."unist-util-stringify-position-1.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-parents-2.0.1" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.4" + sources."vfile-2.3.0" + sources."vfile-location-2.0.4" + sources."vfile-message-1.1.1" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."write-0.2.1" + sources."x-is-string-0.1.0" + sources."xml-escape-1.1.0" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The pluggable linting tool for text and markdown."; + homepage = https://github.com/textlint/textlint/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; @@ -57492,10 +58082,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz"; - sha512 = "VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz"; + sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; }; buildInputs = globalBuildInputs; meta = { @@ -58287,7 +58877,6 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/accepts-1.3.5" - sources."@types/async-2.0.50" sources."@types/body-parser-1.17.0" sources."@types/connect-3.4.32" sources."@types/cors-2.8.4" @@ -58318,14 +58907,14 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" - sources."apollo-cache-1.1.22" + sources."apollo-cache-1.1.25" (sources."apollo-cache-control-0.4.0" // { dependencies = [ sources."graphql-extensions-0.4.0" ]; }) - sources."apollo-cache-inmemory-1.3.12" - sources."apollo-client-2.4.8" + sources."apollo-cache-inmemory-1.4.2" + sources."apollo-client-2.4.12" sources."apollo-datasource-0.2.1" (sources."apollo-engine-reporting-0.2.0" // { dependencies = [ @@ -58353,7 +58942,7 @@ in ]; }) sources."apollo-upload-client-9.1.0" - sources."apollo-utilities-1.0.27" + sources."apollo-utilities-1.1.2" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -58456,7 +59045,7 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.0.0-beta.8" + sources."core-js-3.0.0-beta.9" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."create-error-class-3.0.2" @@ -58611,7 +59200,7 @@ in sources."fs-exists-sync-0.1.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."fswin-2.17.1227" sources."function-bind-1.1.1" sources."generate-function-1.1.0" @@ -58640,10 +59229,10 @@ in sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" sources."graphql-14.1.1" - sources."graphql-anywhere-4.1.24" + sources."graphql-anywhere-4.1.27" sources."graphql-extensions-0.4.1" sources."graphql-subscriptions-1.0.0" - sources."graphql-tag-2.10.0" + sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.3" sources."graphql-type-json-0.2.1" sources."graphql-upload-8.0.4" @@ -58670,7 +59259,7 @@ in sources."ieee754-1.1.12" sources."ignore-3.3.10" sources."ignore-by-default-1.0.1" - sources."immutable-tuple-0.4.9" + sources."immutable-tuple-0.4.10" sources."import-global-0.1.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -58840,7 +59429,7 @@ in sources."once-1.4.0" sources."onetime-2.0.1" sources."opn-5.4.0" - sources."optimism-0.6.8" + sources."optimism-0.6.9" sources."ora-3.0.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" @@ -59491,7 +60080,7 @@ in sources."eslint-scope-4.0.0" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" - sources."events-1.1.1" + sources."events-3.0.0" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -59538,7 +60127,7 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-value-2.0.6" sources."glob-7.1.3" (sources."glob-parent-3.1.0" // { @@ -59616,7 +60205,7 @@ in sources."nan-2.12.1" sources."nanomatch-1.2.13" sources."neo-async-2.6.0" - (sources."node-libs-browser-2.1.0" // { + (sources."node-libs-browser-2.2.0" // { dependencies = [ sources."punycode-1.4.1" ]; @@ -59644,7 +60233,7 @@ in sources."p-try-2.0.0" sources."pako-1.0.8" sources."parallel-transform-1.1.0" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" sources."path-dirname-1.0.2" @@ -59805,7 +60394,7 @@ in ]; }) sources."use-3.1.1" - sources."util-0.10.4" + sources."util-0.11.1" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" @@ -60614,7 +61203,7 @@ in sources."cheerio-1.0.0-rc.2" (sources."chokidar-2.0.4" // { dependencies = [ - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" ]; }) sources."circular-json-0.3.3" -- cgit 1.4.1 From 68436aec2c08976fad6a70f0b8e298fea003a49f Mon Sep 17 00:00:00 2001 From: Robin Palotai Date: Mon, 19 Nov 2018 19:08:48 +0100 Subject: Add awk as a default tool for Bazel shell commands. Apparently https://github.com/gflags/gflags/blob/e292e0452fcfd5a8ae055b59052fc041cbab4abf/bazel/gflags.bzl#L8 assumes it should be accessible. Normally we could ask them to fix, but I would expect awk to be a commonly assumed. The rough search https://github.com/search?q=filename%3ABUILD+genrule+awk&type=Code brings ~1K hits. --- pkgs/development/tools/build-managers/bazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index be85213b8c2..b1bb5708d44 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper , jdk, zip, unzip, bash, writeCBin, coreutils -, which, python, perl, gnused, gnugrep, findutils +, which, python, perl, gawk, gnused, gnugrep, findutils # Apple dependencies , cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively @@ -23,7 +23,7 @@ let for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done ''; - defaultShellPath = lib.makeBinPath [ bash coreutils findutils gnugrep gnused which unzip ]; + defaultShellPath = lib.makeBinPath [ bash coreutils findutils gawk gnugrep gnused which unzip ]; in stdenv.mkDerivation rec { -- cgit 1.4.1 From 1d55e50fe4cc0a70370234943c59d776c0e933b5 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 19 Jan 2019 11:37:05 +0000 Subject: shaderc: Add multiple outputs --- pkgs/development/compilers/shaderc/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 1176d348d9d..d56d939a0e0 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -27,6 +27,8 @@ in stdenv.mkDerivation rec { name = "shaderc-git-${version}"; version = "2018-06-01"; + outputs = [ "out" "lib" "bin" "dev" "static" ]; + src = fetchFromGitHub { owner = "google"; repo = "shaderc"; @@ -41,7 +43,12 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ cmake python ]; - enableParallelBuilding = true; + + postInstall = '' + moveToOutput "lib/*.a" $static + ''; + + preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_BINDIR=$bin/bin"''; cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; -- cgit 1.4.1 From 731f0e06b130d4f037689b5e025c203539fb33c5 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 19 Jan 2019 11:38:02 +0000 Subject: shaderc: Turn buildInputs to nativeBuildInputs These are all build-time only native dependencies --- pkgs/development/compilers/shaderc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index d56d939a0e0..c6826e8ccfe 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ''; - buildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python ]; postInstall = '' moveToOutput "lib/*.a" $static @@ -50,6 +50,8 @@ in stdenv.mkDerivation rec { preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_BINDIR=$bin/bin"''; + enableParallelBuilding = true; + cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; meta = with stdenv.lib; { -- cgit 1.4.1 From 9eb9fd2d9bc833f768c98e612d1d9c994e017112 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 19 Jan 2019 11:40:21 +0000 Subject: shaderc: Add missing meta license --- pkgs/development/compilers/shaderc/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index c6826e8ccfe..2363cf20ecd 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -57,5 +57,6 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation."; + license = [ licenses.asl20 ]; }; } -- cgit 1.4.1 From 32301dbba6abef16f48bae9a7f05568cd054be37 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 19 Jan 2019 12:25:00 +0000 Subject: shaderc: git-2018-06-01 -> 2018.0 This is a tagged upstream release --- pkgs/development/compilers/shaderc/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 2363cf20ecd..7ce7f9cefe5 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -8,32 +8,32 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "32d3ec319909fcad0b2b308fe1635198773e8316"; - sha256 = "1kmgjv5kbrjy6azpgwnjcn3cj8vg5i8hnyk3m969sc0gq2j1rbjj"; + rev = "712cd6618df2c77e126d68042ad7a81a69ee4a6f"; + sha256 = "0wncdj6q1hn40lc7cnz97mx5qjvb8p13mhxilnncgcmf0crsvblz"; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "fe2fbee294a8ad4434f828a8b4d99eafe9aac88c"; - sha256 = "03rq4ypwqnz34n8ip85n95a3b9rxb34j26azzm3b3invaqchv19x"; + rev = "df5bd2d05ac1fd3ec3024439f885ec21cc949b22"; + sha256 = "0l8ds4nn2qcfi8535ai8891i3547x35hscs2jxwwq6qjgw1sgkax"; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "3ce3e49d73b8abbf2ffe33f829f941fb2a40f552"; - sha256 = "0yk4bzqifdqpmdxkhvrxbdqhf5ngkga0ig1yyz7khr7rklqfz7wp"; + rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; + sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; }; in stdenv.mkDerivation rec { - name = "shaderc-git-${version}"; - version = "2018-06-01"; + name = "shaderc-${version}"; + version = "2018.0"; outputs = [ "out" "lib" "bin" "dev" "static" ]; src = fetchFromGitHub { owner = "google"; repo = "shaderc"; - rev = "be8e0879750303a1de09385465d6b20ecb8b380d"; - sha256 = "16p25ry2i4zrj00zihfpf210f8xd7g398ffbw25igvi9mbn4nbfd"; + rev = "v${version}"; + sha256 = "0qigmj0riw43pgjn5f6kpvk72fajssz1lc2aiqib5qvmj9rqq3hl"; }; patchPhase = '' -- cgit 1.4.1 From c0fcae159c45688e2452f4501eb1af42c2c7f8e9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 19 Jan 2019 12:54:53 +0000 Subject: mujs: 2017-01-24 -> 1.0.5 --- pkgs/development/interpreters/mujs/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index c7663a11676..5a8b78143c5 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchgit, clang }: +{ stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "mujs-2017-01-24"; + name = "mujs-${version}"; + version = "1.0.5"; - src = fetchgit { - url = git://git.ghostscript.com/mujs.git; - rev = "4006739a28367c708dea19aeb19b8a1a9326ce08"; - sha256 = "0wvjl8lkh0ga6fkmxgjqq77yagncbv1bdy6hpnxq31x3mkwn1s51"; + src = fetchurl { + url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; + sha256 = "02cqrfnww2s3ylcvqin1951f2c5nzpby8gxb207p2hbrivbg8f0l"; }; - buildInputs = [ clang ]; + buildInputs = [ readline ]; makeFlags = [ "prefix=$(out)" ]; -- cgit 1.4.1 From cf8383810e6370eabe0bc88509a10f465b030c60 Mon Sep 17 00:00:00 2001 From: Léo Gaspard Date: Fri, 18 Jan 2019 00:45:26 +0100 Subject: gn: use python2 as gn is incompatible with python3 --- pkgs/development/tools/build-managers/gn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index d5559768d6f..8c1b55fc5c9 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchzip, fetchpatch, darwin, writeText -, git, ninja, python }: +, git, ninja, python2 }: let rev = "96ff462cddf35f98e25fd5d098fc27bc81eab94a"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --replace "NSArray*" "NSArray*" ''; - nativeBuildInputs = [ ninja python git ]; + nativeBuildInputs = [ ninja python2 git ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ libobjc cctools -- cgit 1.4.1 From 6f8e0ae6087c4062dea5ea9ba055264be08dd869 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Dec 2018 17:15:07 -0800 Subject: gdal: 2.3.2 -> 2.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gdal/versions --- pkgs/development/libraries/gdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 642063220b2..d8ae037db84 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gdal-${version}"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "191jknma0vricrgdcdmwh8588rwly6a77lmynypxdl87i3z7hv9z"; + sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite -- cgit 1.4.1 From d2f39adea91aa8d682a7c3b06a08ff0050781d21 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Jan 2019 15:42:58 +0100 Subject: gdal: fix build with poppler 0.73 --- pkgs/development/libraries/gdal/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index d8ae037db84..98ec9f2960e 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -51,6 +51,20 @@ stdenv.mkDerivation rec { #ifdef swap\ #undef swap\ #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h + + # poppler 0.73.0 support + patch -lp2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; + sha256 = "0xaxj0nj7j8prw1xrdwqs2in9iwyizqprpaibfbhjmsanyl2lfsx"; + } + } || true + patch -p2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; + sha256 = "0jmdkyzlw0rcv4apcaki6pszcb1dca3lljy06sjh60yh795wlqd6"; + } + } ''; # - Unset CC and CXX as they confuse libtool. -- cgit 1.4.1 From 19d6c32fcf216a9312c99dc2d9896bd26c09d0f3 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 19 Jan 2019 16:55:08 +0100 Subject: libaom: fix fetch (and tweak version accordingly) Apparently, upstream renamed the tag in the meantime :-/ --- pkgs/development/libraries/libaom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 6ce84bef15e..c7d7bfb1e82 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libaom-${version}"; - version = "1.0.0.errata.1"; + version = "1.0.0-errata1"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; -- cgit 1.4.1 From 7bc18d2535b9dfa89f32649fe468c2965c3e89b5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 19 Jan 2019 17:17:47 +0100 Subject: pythonPackages.glances: 3.0.2 -> 3.1.0 --- pkgs/development/python-modules/glances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix index f25723e7ec7..9670428a3e5 100644 --- a/pkgs/development/python-modules/glances/default.nix +++ b/pkgs/development/python-modules/glances/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { name = "glances-${version}"; - version = "3.0.2"; + version = "3.1.0"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "1jkjblfk4gbr00j7lny7ajiizzqnp0p1yhzfi14074gwk38z0q14"; + sha256 = "0zjpp017i8b8bijdaj85rya7rmdqh4g8vkb42q14q2sw6agxz3zi"; }; patches = lib.optional doCheck ./skip-failing-tests.patch; -- cgit 1.4.1 From 8cbe6b9ce421f5f214bcca92d5d18d12104edeb7 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 6 Aug 2018 10:17:52 -0500 Subject: nixpkgs: reorganize the postgresql extensions This is a backwards compatible change; it mostly puts all the extensions for postgresql in a common directory to keep them isolated. It also moves a few things that /were not/ extensions out into other parts of the filesystem namespace; namely the postgresql_jdbc and psqlodbc libraries were moved under development/java-modules and development/libraries, respectively. Because these libraries use the libpq postgresql client drivers, they're less sensitive to underlying version changes anyway (since the protocol is relatively stable). No attributes were renamed or harmed in the creation of this patch. Signed-off-by: Austin Seipp --- .../java-modules/postgresql_jdbc/default.nix | 26 +++++++++++ pkgs/development/libraries/psqlodbc/default.nix | 21 +++++++++ pkgs/servers/sql/postgresql/cstore_fdw/default.nix | 32 -------------- pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 32 ++++++++++++++ pkgs/servers/sql/postgresql/ext/pg_cron.nix | 31 +++++++++++++ pkgs/servers/sql/postgresql/ext/pg_hll.nix | 31 +++++++++++++ pkgs/servers/sql/postgresql/ext/pg_repack.nix | 35 +++++++++++++++ pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 31 +++++++++++++ pkgs/servers/sql/postgresql/ext/pg_topn.nix | 32 ++++++++++++++ pkgs/servers/sql/postgresql/ext/pgjwt.nix | 29 ++++++++++++ pkgs/servers/sql/postgresql/ext/pgroonga.nix | 30 +++++++++++++ pkgs/servers/sql/postgresql/ext/pgtap.nix | 33 ++++++++++++++ pkgs/servers/sql/postgresql/ext/plv8.nix | 38 ++++++++++++++++ pkgs/servers/sql/postgresql/ext/timescaledb.nix | 51 ++++++++++++++++++++++ pkgs/servers/sql/postgresql/ext/tsearch_extras.nix | 29 ++++++++++++ pkgs/servers/sql/postgresql/jdbc/default.nix | 26 ----------- pkgs/servers/sql/postgresql/pg_cron/default.nix | 31 ------------- pkgs/servers/sql/postgresql/pg_hll/default.nix | 31 ------------- pkgs/servers/sql/postgresql/pg_repack/default.nix | 35 --------------- .../sql/postgresql/pg_similarity/default.nix | 31 ------------- pkgs/servers/sql/postgresql/pgjwt/default.nix | 29 ------------ pkgs/servers/sql/postgresql/pgroonga/default.nix | 30 ------------- pkgs/servers/sql/postgresql/pgtap/default.nix | 33 -------------- pkgs/servers/sql/postgresql/plv8/default.nix | 38 ---------------- pkgs/servers/sql/postgresql/psqlodbc/default.nix | 21 --------- .../servers/sql/postgresql/timescaledb/default.nix | 51 ---------------------- pkgs/servers/sql/postgresql/topn/default.nix | 32 -------------- .../sql/postgresql/tsearch_extras/default.nix | 29 ------------ pkgs/top-level/all-packages.nix | 51 ++++++++++++---------- 29 files changed, 476 insertions(+), 473 deletions(-) create mode 100644 pkgs/development/java-modules/postgresql_jdbc/default.nix create mode 100644 pkgs/development/libraries/psqlodbc/default.nix delete mode 100644 pkgs/servers/sql/postgresql/cstore_fdw/default.nix create mode 100644 pkgs/servers/sql/postgresql/ext/cstore_fdw.nix create mode 100644 pkgs/servers/sql/postgresql/ext/pg_cron.nix create mode 100644 pkgs/servers/sql/postgresql/ext/pg_hll.nix create mode 100644 pkgs/servers/sql/postgresql/ext/pg_repack.nix create mode 100644 pkgs/servers/sql/postgresql/ext/pg_similarity.nix create mode 100644 pkgs/servers/sql/postgresql/ext/pg_topn.nix create mode 100644 pkgs/servers/sql/postgresql/ext/pgjwt.nix create mode 100644 pkgs/servers/sql/postgresql/ext/pgroonga.nix create mode 100644 pkgs/servers/sql/postgresql/ext/pgtap.nix create mode 100644 pkgs/servers/sql/postgresql/ext/plv8.nix create mode 100644 pkgs/servers/sql/postgresql/ext/timescaledb.nix create mode 100644 pkgs/servers/sql/postgresql/ext/tsearch_extras.nix delete mode 100644 pkgs/servers/sql/postgresql/jdbc/default.nix delete mode 100644 pkgs/servers/sql/postgresql/pg_cron/default.nix delete mode 100644 pkgs/servers/sql/postgresql/pg_hll/default.nix delete mode 100644 pkgs/servers/sql/postgresql/pg_repack/default.nix delete mode 100644 pkgs/servers/sql/postgresql/pg_similarity/default.nix delete mode 100644 pkgs/servers/sql/postgresql/pgjwt/default.nix delete mode 100644 pkgs/servers/sql/postgresql/pgroonga/default.nix delete mode 100644 pkgs/servers/sql/postgresql/pgtap/default.nix delete mode 100644 pkgs/servers/sql/postgresql/plv8/default.nix delete mode 100644 pkgs/servers/sql/postgresql/psqlodbc/default.nix delete mode 100644 pkgs/servers/sql/postgresql/timescaledb/default.nix delete mode 100644 pkgs/servers/sql/postgresql/topn/default.nix delete mode 100644 pkgs/servers/sql/postgresql/tsearch_extras/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix new file mode 100644 index 00000000000..c67d7270548 --- /dev/null +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchMavenArtifact }: + +stdenv.mkDerivation rec { + name = "postgresql-jdbc-${version}"; + version = "42.2.5"; + + src = fetchMavenArtifact { + artifactId = "postgresql"; + groupId = "org.postgresql"; + sha256 = "1p0cbb7ka41xxipzjy81hmcndkqynav22xyipkg7qdqrqvw4dykz"; + inherit version; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar + ''; + + meta = with stdenv.lib; { + homepage = https://jdbc.postgresql.org/; + description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; + license = licenses.bsd2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix new file mode 100644 index 00000000000..2364e0913bc --- /dev/null +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libiodbc, postgresql, openssl }: + +stdenv.mkDerivation rec { + name = "psqlodbc-09.01.0200"; + + src = fetchurl { + url = "https://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9"; + }; + + buildInputs = [ libiodbc postgresql openssl ]; + + configureFlags = [ "--with-iodbc=${libiodbc}" ]; + + meta = with stdenv.lib; { + homepage = http://psqlodbc.projects.postgresql.org/; + description = "ODBC driver for PostgreSQL"; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix deleted file mode 100644 index a6e2c590f38..00000000000 --- a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, postgresql, protobufc }: - -stdenv.mkDerivation rec { - name = "cstore_fdw-${version}"; - version = "1.6.2"; - - nativeBuildInputs = [ protobufc ]; - buildInputs = [ postgresql ]; - - src = fetchFromGitHub { - owner = "citusdata"; - repo = "cstore_fdw"; - rev = "refs/tags/v${version}"; - sha256 = "0kdmzpbhhjdg4p6i5963h7qbs88jzgpqc52gz450h7hwb9ckpv74"; - }; - - installPhase = '' - mkdir -p $out/{lib,share/extension} - - cp *.so $out/lib - cp *.sql $out/share/extension - cp *.control $out/share/extension - ''; - - meta = with stdenv.lib; { - description = "Columnar storage for PostgreSQL"; - homepage = https://www.citusdata.com/; - maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; - license = licenses.asl20; - }; -} diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix new file mode 100644 index 00000000000..a6e2c590f38 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, postgresql, protobufc }: + +stdenv.mkDerivation rec { + name = "cstore_fdw-${version}"; + version = "1.6.2"; + + nativeBuildInputs = [ protobufc ]; + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "cstore_fdw"; + rev = "refs/tags/v${version}"; + sha256 = "0kdmzpbhhjdg4p6i5963h7qbs88jzgpqc52gz450h7hwb9ckpv74"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Columnar storage for PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix new file mode 100644 index 00000000000..959c2c38252 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + name = "pg_cron-${version}"; + version = "1.1.2"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "pg_cron"; + rev = "refs/tags/v${version}"; + sha256 = "0n74dx1wkg9qxvjhnx03028465ap3p97v2kzqww833dws1wqk5m1"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Run Cron jobs through PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix new file mode 100644 index 00000000000..f91a8b1bf25 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + name = "pg_hll-${version}"; + version = "2.12"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "postgresql-hll"; + rev = "refs/tags/v${version}"; + sha256 = "1jdc9gjqc3dkjxv855q1p594j0awhrrymrcqnl5vw5vx2ny3bpgn"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "HyperLogLog for PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix new file mode 100644 index 00000000000..14f71b1e2b3 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: + +stdenv.mkDerivation rec { + name = "pg_repack-${version}"; + version = "1.4.4"; + + buildInputs = [ postgresql openssl zlib readline ]; + + src = fetchFromGitHub { + owner = "reorg"; + repo = "pg_repack"; + rev = "refs/tags/ver_${version}"; + sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw"; + }; + + installPhase = '' + install -D bin/pg_repack -t $out/bin/ + install -D lib/pg_repack.so -t $out/lib/ + install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Reorganize tables in PostgreSQL databases with minimal locks"; + longDescription = '' + pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore + the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an + exclusive lock on the processed tables during processing. pg_repack is efficient to boot, + with performance comparable to using CLUSTER directly. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ danbst ]; + inherit (postgresql.meta) platforms; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix new file mode 100644 index 00000000000..32945c9fa62 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, gcc, postgresql }: + +stdenv.mkDerivation { + + name = "pg_similarity-1.0"; + src = fetchFromGitHub { + owner = "eulerto"; + repo = "pg_similarity"; + rev = "be1a8b08c8716e59b89982557da9ea68cdf868c5"; + sha256 = "1z4v4r2yccdr8kz3935fnk1bc5vj0qj0apscldyap4wxlyi89xim"; + }; + + buildInputs = [ postgresql gcc ]; + buildPhase = "USE_PGXS=1 make"; + installPhase = '' + mkdir -p $out/bin # for buildEnv to setup proper symlinks + install -D pg_similarity.so -t $out/lib/ + install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension + ''; + + meta = { + description = '' + pg_similarity is an extension to support similarity queries on PostgreSQL. The implementation + is tightly integrated in the RDBMS in the sense that it defines operators so instead of the traditional + operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function). + ''; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ danbst ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix new file mode 100644 index 00000000000..dae30aadabd --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, postgresql, protobufc }: + +stdenv.mkDerivation rec { + name = "pg_topn-${version}"; + version = "2.2.0"; + + nativeBuildInputs = [ protobufc ]; + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "postgresql-topn"; + rev = "refs/tags/v${version}"; + sha256 = "1i5fn517mdvzfhlcj7fh4z0iniynanshcn7kzhsq19sgci0g31fr"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Efficient querying of 'top values' for PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.agpl3; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix new file mode 100644 index 00000000000..ab7ba8943a7 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + name = "pgjwt-${version}"; + version = "unstable-2017-04-24"; + + src = fetchFromGitHub { + owner = "michelp"; + repo = "pgjwt"; + rev = "546a2911027b716586e241be7fd4c6f1785237cd"; + sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf"; + }; + + buildPhase = ":"; + installPhase = '' + mkdir -p $out/bin # current postgresql extension mechanism in nixos requires bin directory + mkdir -p $out/share/extension + cp pg*sql *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "PostgreSQL implementation of JSON Web Tokens"; + longDescription = '' + sign() and verify() functions to create and verify JSON Web Tokens. + ''; + license = licenses.mit; + maintainers = with maintainers; [spinus]; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix new file mode 100644 index 00000000000..8a185990725 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: + +stdenv.mkDerivation rec { + name = "pgroonga-${version}"; + version = "2.1.7"; + + src = fetchurl { + url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; + sha256 = "1mpns28f5hk528i5x7rkj9jp3qdhxmicmz13aj4lzlwa8yssx9ws"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql msgpack groonga ]; + + makeFlags = [ "HAVE_MSGPACK=1" ]; + + installPhase = '' + mkdir -p $out/bin + install -D pgroonga.so -t $out/lib/ + install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "A PostgreSQL extension to use Groonga as the index"; + longDescription = "PGroonga is a PostgreSQL extension to use Groonga as the index. PostgreSQL supports full text search against languages that use only alphabet and digit. It means that PostgreSQL doesn't support full text search against Japanese, Chinese and so on. You can use super fast full text search feature against all languages by installing PGroonga into your PostgreSQL."; + homepage = https://pgroonga.github.io/; + license = licenses.postgresql; + maintainers = with maintainers; [ DerTim1 ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix new file mode 100644 index 00000000000..6386049be39 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }: + +stdenv.mkDerivation rec { + name = "pgtap-${version}"; + version = "0.99.0"; + + src = fetchFromGitHub { + owner = "theory"; + repo = "pgtap"; + rev = "v${version}"; + sha256 = "0xakjlbb99mgd8za6m0xa6n3s5fhif217iip6b3aywqw7nh1j6nv"; + }; + + nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; + + installPhase = '' + install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "pgTAP is a unit testing framework for PostgreSQL"; + longDescription = '' + pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL. + It includes a comprehensive collection of TAP-emitting assertion functions, + as well as the ability to integrate with other TAP-emitting test frameworks. + It can also be used in the xUnit testing style. + ''; + maintainers = with maintainers; [ willibutz ]; + homepage = https://pgtap.org; + inherit (postgresql.meta) platforms; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix new file mode 100644 index 00000000000..dae3b2fd1af --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, v8, perl, postgresql }: + +stdenv.mkDerivation rec { + name = "plv8-${version}"; + version = "2.3.8"; + + nativeBuildInputs = [ perl ]; + buildInputs = [ v8 postgresql ]; + + src = fetchFromGitHub { + owner = "plv8"; + repo = "plv8"; + rev = "v${version}"; + sha256 = "0hrmn1zzzdf52zwldg6axv57p0f3b279l9s8lbpijcv60fqrzx16"; + }; + + makeFlags = [ "--makefile=Makefile.shared" ]; + + preConfigure = '' + patchShebangs ./generate_upgrade.sh + ''; + + buildPhase = "make -f Makefile.shared all"; + + installPhase = '' + mkdir -p $out/bin + install -D plv8*.so -t $out/lib + install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "PL/v8 - A Procedural Language in JavaScript powered by V8"; + homepage = https://pgxn.org/dist/plv8/; + maintainers = with maintainers; [ volth ]; + platforms = platforms.linux; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix new file mode 100644 index 00000000000..3c53054ba7d --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub, cmake, postgresql, openssl }: + +# # To enable on NixOS: +# config.services.postgresql = { +# extraPlugins = [ pkgs.timescaledb ]; +# extraConfig = "shared_preload_libraries = 'timescaledb'"; +# } + +stdenv.mkDerivation rec { + name = "timescaledb-${version}"; + version = "1.0.0"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ postgresql openssl ]; + + src = fetchFromGitHub { + owner = "timescale"; + repo = "timescaledb"; + rev = "refs/tags/${version}"; + sha256 = "1359jc0dw8q3f0iipqfadzs8lvri9qa5w59ziz00x1d09ppw2q40"; + }; + + # Fix the install phase which tries to install into the pgsql extension dir, + # and cannot be manually overridden. This is rather fragile but works OK. + patchPhase = '' + for x in CMakeLists.txt sql/CMakeLists.txt; do + substituteInPlace "$x" \ + --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\"" + done + + for x in src/CMakeLists.txt src/loader/CMakeLists.txt; do + substituteInPlace "$x" \ + --replace 'DESTINATION ''${PG_PKGLIBDIR}' "DESTINATION \"$out/lib\"" + done + ''; + + postInstall = '' + # work around an annoying bug, by creating $out/bin, so buildEnv doesn't freak out later + # see https://github.com/NixOS/nixpkgs/issues/22653 + + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; + homepage = https://www.timescale.com/; + maintainers = with maintainers; [ volth ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix new file mode 100644 index 00000000000..b43a9c51be0 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgconfig, postgresql }: + +stdenv.mkDerivation rec { + name = "tsearch-extras-${version}"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "zulip"; + repo = "tsearch_extras"; + rev = "84e78f00931c4ef261d98197d6b5d94fc141f742"; # no release tag? + sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; + }; + + nativenativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql ]; + + installPhase = '' + mkdir -p $out/bin + install -D tsearch_extras.so -t $out/lib/ + install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Provides a few PostgreSQL functions for a lower-level data full text search"; + homepage = https://github.com/zulip/tsearch_extras/; + license = licenses.postgresql; + maintainers = with maintainers; [ DerTim1 ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix deleted file mode 100644 index c67d7270548..00000000000 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchMavenArtifact }: - -stdenv.mkDerivation rec { - name = "postgresql-jdbc-${version}"; - version = "42.2.5"; - - src = fetchMavenArtifact { - artifactId = "postgresql"; - groupId = "org.postgresql"; - sha256 = "1p0cbb7ka41xxipzjy81hmcndkqynav22xyipkg7qdqrqvw4dykz"; - inherit version; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar - ''; - - meta = with stdenv.lib; { - homepage = https://jdbc.postgresql.org/; - description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; - license = licenses.bsd2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/sql/postgresql/pg_cron/default.nix b/pkgs/servers/sql/postgresql/pg_cron/default.nix deleted file mode 100644 index 959c2c38252..00000000000 --- a/pkgs/servers/sql/postgresql/pg_cron/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, postgresql }: - -stdenv.mkDerivation rec { - name = "pg_cron-${version}"; - version = "1.1.2"; - - buildInputs = [ postgresql ]; - - src = fetchFromGitHub { - owner = "citusdata"; - repo = "pg_cron"; - rev = "refs/tags/v${version}"; - sha256 = "0n74dx1wkg9qxvjhnx03028465ap3p97v2kzqww833dws1wqk5m1"; - }; - - installPhase = '' - mkdir -p $out/{lib,share/extension} - - cp *.so $out/lib - cp *.sql $out/share/extension - cp *.control $out/share/extension - ''; - - meta = with stdenv.lib; { - description = "Run Cron jobs through PostgreSQL"; - homepage = https://www.citusdata.com/; - maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; - license = licenses.postgresql; - }; -} diff --git a/pkgs/servers/sql/postgresql/pg_hll/default.nix b/pkgs/servers/sql/postgresql/pg_hll/default.nix deleted file mode 100644 index f91a8b1bf25..00000000000 --- a/pkgs/servers/sql/postgresql/pg_hll/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, postgresql }: - -stdenv.mkDerivation rec { - name = "pg_hll-${version}"; - version = "2.12"; - - buildInputs = [ postgresql ]; - - src = fetchFromGitHub { - owner = "citusdata"; - repo = "postgresql-hll"; - rev = "refs/tags/v${version}"; - sha256 = "1jdc9gjqc3dkjxv855q1p594j0awhrrymrcqnl5vw5vx2ny3bpgn"; - }; - - installPhase = '' - mkdir -p $out/{lib,share/extension} - - cp *.so $out/lib - cp *.sql $out/share/extension - cp *.control $out/share/extension - ''; - - meta = with stdenv.lib; { - description = "HyperLogLog for PostgreSQL"; - homepage = https://www.citusdata.com/; - maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; - license = licenses.asl20; - }; -} diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix deleted file mode 100644 index 14f71b1e2b3..00000000000 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: - -stdenv.mkDerivation rec { - name = "pg_repack-${version}"; - version = "1.4.4"; - - buildInputs = [ postgresql openssl zlib readline ]; - - src = fetchFromGitHub { - owner = "reorg"; - repo = "pg_repack"; - rev = "refs/tags/ver_${version}"; - sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw"; - }; - - installPhase = '' - install -D bin/pg_repack -t $out/bin/ - install -D lib/pg_repack.so -t $out/lib/ - install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension - ''; - - meta = with stdenv.lib; { - description = "Reorganize tables in PostgreSQL databases with minimal locks"; - longDescription = '' - pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore - the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an - exclusive lock on the processed tables during processing. pg_repack is efficient to boot, - with performance comparable to using CLUSTER directly. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ danbst ]; - inherit (postgresql.meta) platforms; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/servers/sql/postgresql/pg_similarity/default.nix b/pkgs/servers/sql/postgresql/pg_similarity/default.nix deleted file mode 100644 index 32945c9fa62..00000000000 --- a/pkgs/servers/sql/postgresql/pg_similarity/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, gcc, postgresql }: - -stdenv.mkDerivation { - - name = "pg_similarity-1.0"; - src = fetchFromGitHub { - owner = "eulerto"; - repo = "pg_similarity"; - rev = "be1a8b08c8716e59b89982557da9ea68cdf868c5"; - sha256 = "1z4v4r2yccdr8kz3935fnk1bc5vj0qj0apscldyap4wxlyi89xim"; - }; - - buildInputs = [ postgresql gcc ]; - buildPhase = "USE_PGXS=1 make"; - installPhase = '' - mkdir -p $out/bin # for buildEnv to setup proper symlinks - install -D pg_similarity.so -t $out/lib/ - install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension - ''; - - meta = { - description = '' - pg_similarity is an extension to support similarity queries on PostgreSQL. The implementation - is tightly integrated in the RDBMS in the sense that it defines operators so instead of the traditional - operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function). - ''; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - maintainers = with lib.maintainers; [ danbst ]; - }; -} diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/pgjwt/default.nix deleted file mode 100644 index ab7ba8943a7..00000000000 --- a/pkgs/servers/sql/postgresql/pgjwt/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub, postgresql }: - -stdenv.mkDerivation rec { - name = "pgjwt-${version}"; - version = "unstable-2017-04-24"; - - src = fetchFromGitHub { - owner = "michelp"; - repo = "pgjwt"; - rev = "546a2911027b716586e241be7fd4c6f1785237cd"; - sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf"; - }; - - buildPhase = ":"; - installPhase = '' - mkdir -p $out/bin # current postgresql extension mechanism in nixos requires bin directory - mkdir -p $out/share/extension - cp pg*sql *.control $out/share/extension - ''; - - meta = with stdenv.lib; { - description = "PostgreSQL implementation of JSON Web Tokens"; - longDescription = '' - sign() and verify() functions to create and verify JSON Web Tokens. - ''; - license = licenses.mit; - maintainers = with maintainers; [spinus]; - }; -} diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix deleted file mode 100644 index 8a185990725..00000000000 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: - -stdenv.mkDerivation rec { - name = "pgroonga-${version}"; - version = "2.1.7"; - - src = fetchurl { - url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "1mpns28f5hk528i5x7rkj9jp3qdhxmicmz13aj4lzlwa8yssx9ws"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ postgresql msgpack groonga ]; - - makeFlags = [ "HAVE_MSGPACK=1" ]; - - installPhase = '' - mkdir -p $out/bin - install -D pgroonga.so -t $out/lib/ - install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/extension - ''; - - meta = with stdenv.lib; { - description = "A PostgreSQL extension to use Groonga as the index"; - longDescription = "PGroonga is a PostgreSQL extension to use Groonga as the index. PostgreSQL supports full text search against languages that use only alphabet and digit. It means that PostgreSQL doesn't support full text search against Japanese, Chinese and so on. You can use super fast full text search feature against all languages by installing PGroonga into your PostgreSQL."; - homepage = https://pgroonga.github.io/; - license = licenses.postgresql; - maintainers = with maintainers; [ DerTim1 ]; - }; -} diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix deleted file mode 100644 index 6386049be39..00000000000 --- a/pkgs/servers/sql/postgresql/pgtap/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }: - -stdenv.mkDerivation rec { - name = "pgtap-${version}"; - version = "0.99.0"; - - src = fetchFromGitHub { - owner = "theory"; - repo = "pgtap"; - rev = "v${version}"; - sha256 = "0xakjlbb99mgd8za6m0xa6n3s5fhif217iip6b3aywqw7nh1j6nv"; - }; - - nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; - - installPhase = '' - install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/extension - ''; - - meta = with stdenv.lib; { - description = "pgTAP is a unit testing framework for PostgreSQL"; - longDescription = '' - pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL. - It includes a comprehensive collection of TAP-emitting assertion functions, - as well as the ability to integrate with other TAP-emitting test frameworks. - It can also be used in the xUnit testing style. - ''; - maintainers = with maintainers; [ willibutz ]; - homepage = https://pgtap.org; - inherit (postgresql.meta) platforms; - license = licenses.mit; - }; -} diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/plv8/default.nix deleted file mode 100644 index dae3b2fd1af..00000000000 --- a/pkgs/servers/sql/postgresql/plv8/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchFromGitHub, v8, perl, postgresql }: - -stdenv.mkDerivation rec { - name = "plv8-${version}"; - version = "2.3.8"; - - nativeBuildInputs = [ perl ]; - buildInputs = [ v8 postgresql ]; - - src = fetchFromGitHub { - owner = "plv8"; - repo = "plv8"; - rev = "v${version}"; - sha256 = "0hrmn1zzzdf52zwldg6axv57p0f3b279l9s8lbpijcv60fqrzx16"; - }; - - makeFlags = [ "--makefile=Makefile.shared" ]; - - preConfigure = '' - patchShebangs ./generate_upgrade.sh - ''; - - buildPhase = "make -f Makefile.shared all"; - - installPhase = '' - mkdir -p $out/bin - install -D plv8*.so -t $out/lib - install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension - ''; - - meta = with stdenv.lib; { - description = "PL/v8 - A Procedural Language in JavaScript powered by V8"; - homepage = https://pgxn.org/dist/plv8/; - maintainers = with maintainers; [ volth ]; - platforms = platforms.linux; - license = licenses.postgresql; - }; -} diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix deleted file mode 100644 index 2364e0913bc..00000000000 --- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, libiodbc, postgresql, openssl }: - -stdenv.mkDerivation rec { - name = "psqlodbc-09.01.0200"; - - src = fetchurl { - url = "https://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; - sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9"; - }; - - buildInputs = [ libiodbc postgresql openssl ]; - - configureFlags = [ "--with-iodbc=${libiodbc}" ]; - - meta = with stdenv.lib; { - homepage = http://psqlodbc.projects.postgresql.org/; - description = "ODBC driver for PostgreSQL"; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix deleted file mode 100644 index 3c53054ba7d..00000000000 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, postgresql, openssl }: - -# # To enable on NixOS: -# config.services.postgresql = { -# extraPlugins = [ pkgs.timescaledb ]; -# extraConfig = "shared_preload_libraries = 'timescaledb'"; -# } - -stdenv.mkDerivation rec { - name = "timescaledb-${version}"; - version = "1.0.0"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ postgresql openssl ]; - - src = fetchFromGitHub { - owner = "timescale"; - repo = "timescaledb"; - rev = "refs/tags/${version}"; - sha256 = "1359jc0dw8q3f0iipqfadzs8lvri9qa5w59ziz00x1d09ppw2q40"; - }; - - # Fix the install phase which tries to install into the pgsql extension dir, - # and cannot be manually overridden. This is rather fragile but works OK. - patchPhase = '' - for x in CMakeLists.txt sql/CMakeLists.txt; do - substituteInPlace "$x" \ - --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\"" - done - - for x in src/CMakeLists.txt src/loader/CMakeLists.txt; do - substituteInPlace "$x" \ - --replace 'DESTINATION ''${PG_PKGLIBDIR}' "DESTINATION \"$out/lib\"" - done - ''; - - postInstall = '' - # work around an annoying bug, by creating $out/bin, so buildEnv doesn't freak out later - # see https://github.com/NixOS/nixpkgs/issues/22653 - - mkdir -p $out/bin - ''; - - meta = with stdenv.lib; { - description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; - homepage = https://www.timescale.com/; - maintainers = with maintainers; [ volth ]; - platforms = platforms.linux; - license = licenses.asl20; - }; -} diff --git a/pkgs/servers/sql/postgresql/topn/default.nix b/pkgs/servers/sql/postgresql/topn/default.nix deleted file mode 100644 index dae30aadabd..00000000000 --- a/pkgs/servers/sql/postgresql/topn/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, postgresql, protobufc }: - -stdenv.mkDerivation rec { - name = "pg_topn-${version}"; - version = "2.2.0"; - - nativeBuildInputs = [ protobufc ]; - buildInputs = [ postgresql ]; - - src = fetchFromGitHub { - owner = "citusdata"; - repo = "postgresql-topn"; - rev = "refs/tags/v${version}"; - sha256 = "1i5fn517mdvzfhlcj7fh4z0iniynanshcn7kzhsq19sgci0g31fr"; - }; - - installPhase = '' - mkdir -p $out/{lib,share/extension} - - cp *.so $out/lib - cp *.sql $out/share/extension - cp *.control $out/share/extension - ''; - - meta = with stdenv.lib; { - description = "Efficient querying of 'top values' for PostgreSQL"; - homepage = https://www.citusdata.com/; - maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; - license = licenses.agpl3; - }; -} diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix deleted file mode 100644 index b43a9c51be0..00000000000 --- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, postgresql }: - -stdenv.mkDerivation rec { - name = "tsearch-extras-${version}"; - version = "0.4"; - - src = fetchFromGitHub { - owner = "zulip"; - repo = "tsearch_extras"; - rev = "84e78f00931c4ef261d98197d6b5d94fc141f742"; # no release tag? - sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; - }; - - nativenativeBuildInputs = [ pkgconfig ]; - buildInputs = [ postgresql ]; - - installPhase = '' - mkdir -p $out/bin - install -D tsearch_extras.so -t $out/lib/ - install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/extension - ''; - - meta = with stdenv.lib; { - description = "Provides a few PostgreSQL functions for a lower-level data full text search"; - homepage = https://github.com/zulip/tsearch_extras/; - license = licenses.postgresql; - maintainers = with maintainers; [ DerTim1 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9daaa2c088..6c43ae2f354 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3211,17 +3211,36 @@ in pgf_graphics = callPackage ../tools/graphics/pgf { }; - pgjwt = callPackage ../servers/sql/postgresql/pgjwt {}; - cstore_fdw = callPackage ../servers/sql/postgresql/cstore_fdw {}; + # postgresql extensions - pg_hll = callPackage ../servers/sql/postgresql/pg_hll {}; + cstore_fdw = callPackage ../servers/sql/postgresql/ext/cstore_fdw.nix {}; - pg_cron = callPackage ../servers/sql/postgresql/pg_cron {}; + pg_cron = callPackage ../servers/sql/postgresql/ext/pg_cron.nix {}; - pgtap = callPackage ../servers/sql/postgresql/pgtap {}; + pg_hll = callPackage ../servers/sql/postgresql/ext/pg_hll.nix {}; - pg_topn = callPackage ../servers/sql/postgresql/topn {}; + pgjwt = callPackage ../servers/sql/postgresql/ext/pgjwt.nix {}; + + pg_repack = callPackage ../servers/sql/postgresql/ext/pg_repack.nix {}; + + pgroonga = callPackage ../servers/sql/postgresql/ext/pgroonga.nix {}; + + plv8 = callPackage ../servers/sql/postgresql/ext/plv8.nix { + v8 = callPackage ../development/libraries/v8/plv8_6_x.nix { + inherit (python2Packages) python; + }; + }; + + pg_similarity = callPackage ../servers/sql/postgresql/ext/pg_similarity.nix {}; + + pgtap = callPackage ../servers/sql/postgresql/ext/pgtap.nix {}; + + pg_topn = callPackage ../servers/sql/postgresql/ext/pg_topn.nix {}; + + timescaledb = callPackage ../servers/sql/postgresql/ext/timescaledb.nix {}; + + tsearch_extras = callPackage ../servers/sql/postgresql/ext/tsearch_extras.nix { }; pigz = callPackage ../tools/compression/pigz { }; @@ -11978,18 +11997,6 @@ in pdf2xml = callPackage ../development/libraries/pdf2xml {} ; - pg_repack = callPackage ../servers/sql/postgresql/pg_repack {}; - - pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {}; - - pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; - - plv8 = callPackage ../servers/sql/postgresql/plv8 { - v8 = callPackage ../development/libraries/v8/plv8_6_x.nix { - inherit (python2Packages) python; - }; - }; - phonon = callPackage ../development/libraries/phonon {}; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; @@ -13931,7 +13938,7 @@ in postgresql_10 postgresql_11; - postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; + postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; inherit (callPackage ../servers/monitoring/prometheus { buildGoPackage = buildGo110Package; @@ -13971,7 +13978,7 @@ in prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; - psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; + psqlodbc = callPackage ../development/libraries/psqlodbc { }; pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; @@ -19612,8 +19619,6 @@ in fftw = fftwSinglePrec; }; - timescaledb = callPackage ../servers/sql/postgresql/timescaledb {}; - timewarrior = callPackage ../applications/misc/timewarrior { }; timidity = callPackage ../tools/misc/timidity { }; @@ -19699,8 +19704,6 @@ in trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; - tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { }; - tudu = callPackage ../applications/office/tudu { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; -- cgit 1.4.1 From e36b4d6a857afb13840a5b4468b82a69eeca45d4 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 20 Jan 2019 00:34:28 +0100 Subject: gdal: fix patch hashes Commit d2f39adea9 added them with hashes *before* normalization done by fetchpatch. --- pkgs/development/libraries/gdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 98ec9f2960e..6b7a58fa30d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -56,13 +56,13 @@ stdenv.mkDerivation rec { patch -lp2 <${ fetchpatch { url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; - sha256 = "0xaxj0nj7j8prw1xrdwqs2in9iwyizqprpaibfbhjmsanyl2lfsx"; + sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734"; } } || true patch -p2 <${ fetchpatch { url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; - sha256 = "0jmdkyzlw0rcv4apcaki6pszcb1dca3lljy06sjh60yh795wlqd6"; + sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj"; } } ''; -- cgit 1.4.1 From 531bba6182ef2ad2a5a13258bd75dabe6e3d391b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 19 Jan 2019 18:24:55 -0500 Subject: mujs: enable on darwin --- pkgs/development/interpreters/mujs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 5a8b78143c5..918b2c2515e 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://mujs.com/; description = "A lightweight, embeddable Javascript interpreter"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; -- cgit 1.4.1 From 4e0f0790646d22f999b6845e7c27c47127428511 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sun, 20 Jan 2019 02:58:54 +0100 Subject: python.pkgs.pyaxmlparser: some files are licensed asl20 Fixes https://github.com/NixOS/nixpkgs/issues/54338. --- pkgs/development/python-modules/pyaxmlparser/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 0721c0d449c..c5be26bd9b7 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; homepage = https://github.com/appknox/pyaxmlparser; - license = licenses.mit; + # Files from Androguard are licensed ASL 2.0 + license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ ma27 ]; }; } -- cgit 1.4.1 From 59379cb304449637802de32614cfe6c68f3cf49c Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sun, 20 Jan 2019 10:43:02 +0800 Subject: haskellPackages.monad-memo: remove unnecessary patch --- pkgs/development/haskell-modules/configuration-common.nix | 9 --------- 1 file changed, 9 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7bd540c8578..d3f62b5ef35 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -914,15 +914,6 @@ self: super: { language-puppet = dontHaddock super.language-puppet; filecache = overrideCabal super.filecache (drv: { doCheck = !pkgs.stdenv.isDarwin; }); - # Missing FlexibleContexts in testsuite - # https://github.com/EduardSergeev/monad-memo/pull/4 - monad-memo = - let patch = pkgs.fetchpatch - { url = https://github.com/EduardSergeev/monad-memo/pull/4.patch; - sha256 = "14mf9940arilg6v54w9bc4z567rfbmm7gknsklv965fr7jpinxxj"; - }; - in appendPatch super.monad-memo patch; - # https://github.com/alphaHeavy/protobuf/issues/34 protobuf = dontCheck super.protobuf; -- cgit 1.4.1 From 6507d48edae6a54fa8e05b7e13638e99dbd46f19 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 19 Jan 2019 21:35:05 -0600 Subject: spin: use dropbox "mirror" again to avoid problems --- pkgs/development/tools/analysis/spin/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 8717c99cb46..fbb7eca0ef5 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -11,7 +11,11 @@ in stdenv.mkDerivation rec { url-version = stdenv.lib.replaceChars ["."] [""] version; src = fetchurl { - url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz"; + # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. + # Dropbox mirror from developers: + # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa + # (note that this URL doesn't work aross versions and hash should come from official site) + url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AABtxFePMJmPxsxSvU5cpxh8a/spin${url-version}.tar.gz?raw=1"; sha256 = "07b7wk3qyfnp4pgwicqd33l7i1krzyihx0cf9zkv81ywaklf5vll"; }; -- cgit 1.4.1 From dda9edce1d566772bf43124ca7b7a8c52cb9bf97 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 20 Jan 2019 13:14:42 +0900 Subject: oraclejdk: add warning message about future udpates --- pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 1e333e052b6..4d88f3b9772 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -199,4 +199,4 @@ let result = stdenv.mkDerivation rec { platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms }; -}; in result +}; in stdenv.lib.trivial.warn "Public updates for Oracle Java SE 8 released after January 2019 will not be available for business, commercial or production use without a commercial license. See https://java.com/en/download/release_notice.jsp for more information." result -- cgit 1.4.1 From 4bddac6e67639ebb7c829c47cb4904294de3f03b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 19 Jan 2019 13:02:44 +0000 Subject: pythonPackages.django_compat: 1.0.14 -> 1.0.15 --- .../python-modules/django-compat/default.nix | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index d575c1b674b..32d85cfadd7 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -1,36 +1,31 @@ { stdenv, buildPythonPackage, fetchFromGitHub, python, - django, django_nose, six + django, six }: buildPythonPackage rec { pname = "django-compat"; - version = "1.0.14"; + version = "1.0.15"; # the pypi packages don't include everything required for the tests src = fetchFromGitHub { owner = "arteria"; repo = "django-compat"; rev = "v${version}"; - sha256 = "11g6ra6djkchqk44v8k7biaxd1v69qyyyask5l92vmrvb0qiwvm8"; + sha256 = "1pr6v38ahrsvxlgmcx69s4b5q5082f44gzi4h3c32sccdc4pwqxp"; }; checkPhase = '' runHook preCheck - # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the - # source directory - mkdir -p testbase/compat - pushd testbase - # note we're not copying the direct contents of compat/ (notably __init__.py) so python won't recognize this as a - # package, but the tests need to be in a specific path for the test templates to get picked up. - cp -r ../compat/tests compat/ - cp ../runtests.py . - ${python.interpreter} runtests.py compat/tests - popd + # to convince the tests to run against the installed package, not the source directory, we extract the + # tests directory from it then dispose of the actual source + mv compat/tests . + rm -r compat + substituteInPlace runtests.py --replace compat.tests tests + ${python.interpreter} runtests.py runHook postCheck ''; - checkInputs = [ django_nose ]; propagatedBuildInputs = [ django six ]; meta = with stdenv.lib; { -- cgit 1.4.1 From c9912dbf9d47a4da109500ca788001b341f478b2 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 19 Jan 2019 14:18:54 +0000 Subject: pythonPackages.django_hijack: 2.1.9 -> 2.1.10 --- pkgs/development/python-modules/django-hijack/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index bdf503cd849..f41e7d146c9 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -3,15 +3,14 @@ }: buildPythonPackage rec { pname = "django-hijack"; - version = "2.1.9"; - name = pname + "-" + version; + version = "2.1.10"; # the pypi packages don't include everything required for the tests src = fetchFromGitHub { owner = "arteria"; repo = "django-hijack"; rev = "v${version}"; - sha256 = "109xi93xj37ycdsvainybhg89pcb5sawv6w80px4r6fjvaq4732c"; + sha256 = "01fwkjdzvw0yx2spwi7zc1yy64ndq1y72bfmk7kxnq5x803m2ak6"; }; checkInputs = [ django_nose ]; @@ -24,7 +23,7 @@ buildPythonPackage rec { # source directory mkdir testbase pushd testbase - cp ../runtests.py . + mv ../runtests.py . ${python.interpreter} runtests.py hijack popd -- cgit 1.4.1 From 72fc58b3f10d3a0e6087800d6602671e3919a267 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 19 Jan 2019 15:06:27 +0000 Subject: pythonPackages.django_hijack_admin: 2.1.5 -> 2.1.10 --- pkgs/development/python-modules/django-hijack-admin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index e6cd5a3482f..aa84a0e7b83 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -2,14 +2,14 @@ django_hijack, django_nose }: buildPythonPackage rec { pname = "django-hijack-admin"; - version = "2.1.5"; + version = "2.1.10"; # the pypi packages don't include everything required for the tests src = fetchFromGitHub { owner = "arteria"; repo = "django-hijack-admin"; rev = "v${version}"; - sha256 = "02j75blvkjiz5mv5wc4jxl27rgmjsrl6l67a3p8342jwazzsm6jg"; + sha256 = "0m98lchp2y43886n67j4s7miyd50pg2r5r966vjnxmd7nx7qkihf"; }; checkInputs = [ django_nose ]; -- cgit 1.4.1 From ed4bf383a8bf228cf988fee331db0056aa63ae2d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 19 Jan 2019 15:45:30 +0000 Subject: pythonPackages.django_hijack_admin: tweak checkPhase to ensure tests are running against installed package, not source directory --- .../development/python-modules/django-hijack-admin/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index aa84a0e7b83..005d61acab9 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -17,13 +17,21 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck + + # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the + # source directory + mkdir testbase + pushd testbase + mv ../runtests.py . ${python.interpreter} runtests.py hijack_admin + popd + runHook postCheck ''; meta = with stdenv.lib; { description = "Admin integration for django-hijack"; - homepage = https://github.com/arteria/django-hijack; + homepage = https://github.com/arteria/django-hijack-admin; license = licenses.mit; maintainers = with maintainers; [ lsix ]; }; -- cgit 1.4.1