diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 35a1296db5a9..94b2a285ee09 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -341,6 +341,11 @@
github = "apeyroux";
name = "Alexandre Peyroux";
};
+ ar1a = {
+ email = "aria@ar1as.space";
+ github = "ar1a";
+ name = "Aria Edmonds";
+ };
arcadio = {
email = "arc@well.ox.ac.uk";
github = "arcadio";
@@ -1586,6 +1591,11 @@
email = "eocallaghan@alterapraxis.com";
name = "Edward O'Callaghan";
};
+ fusion809 = {
+ email = "brentonhorne77@gmail.com";
+ github = "fusion809";
+ name = "Brenton Horne";
+ };
fuuzetsu = {
email = "fuuzetsu@fuuzetsu.co.uk";
github = "fuuzetsu";
diff --git a/nixos/doc/manual/development/debugging-nixos-tests.xml b/nixos/doc/manual/development/debugging-nixos-tests.xml
deleted file mode 100644
index 30e58e1e3554..000000000000
--- a/nixos/doc/manual/development/debugging-nixos-tests.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
- Debugging NixOS tests
-
-
- Tests may fail and infrastructure offers access to inspect machine state.
-
-
-
- To prevent test from stopping and cleaning up, insert a sleep command:
-
-
-
-$machine->succeed("sleep 84000");
-
-
-
- As soon as machine starts run as root:
-
-
-
-nix-shell -p socat --run "socat STDIO,raw,echo=0,escape=0x11 UNIX:/tmp/nix-build-vm-test-run-*.drv-0/vm-state-machine/backdoor"
-
-
-
- You may need to find the correct path, replacing /tmp,
- * or machine.
-
-
-
- Press "enter" to open up console and login as "root". After you're done,
- press "ctrl-q" to exit the console.
-
-
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml
index d068887200a9..2695082e3867 100644
--- a/nixos/doc/manual/development/nixos-tests.xml
+++ b/nixos/doc/manual/development/nixos-tests.xml
@@ -16,5 +16,4 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test
-
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index c95bc548e04f..006da889671e 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -156,10 +156,8 @@ sub start {
$ENV{USE_TMPDIR} = 1;
$ENV{QEMU_OPTS} =
($self->{allowReboot} ? "" : "-no-reboot ") .
- "-monitor unix:./monitor " .
- "-chardev socket,id=shell,path=./shell -device virtio-serial -device virtconsole,chardev=shell " .
- # socket backdoor, see "Debugging NixOS tests" section in NixOS manual
- "-chardev socket,id=backdoor,path=./backdoor,server,nowait -device virtio-serial -device virtconsole,chardev=backdoor " .
+ "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
+ "-device virtio-serial -device virtconsole,chardev=shell " .
"-device virtio-rng-pci " .
($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || "");
chdir $self->{stateDir} or die;
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index aa0db4afd978..ed4cfa7805e2 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -55,8 +55,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
systemd.services."serial-getty@hvc0".enable = false;
# Only use a serial console, no TTY.
- # hvc1: socket backdoor, see "Debugging NixOS tests" section in NixOS manual
- virtualisation.qemu.consoles = [ "hvc1" qemuSerialDevice ];
+ virtualisation.qemu.consoles = [ qemuSerialDevice ];
boot.initrd.preDeviceCommands =
''
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 14bf13d8828e..ad1ccbf496cf 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "go-ethereum-${version}";
- version = "1.8.20";
+ version = "1.8.21";
goPackagePath = "github.com/ethereum/go-ethereum";
# Fix for usb-related segmentation faults on darwin
@@ -16,7 +16,7 @@ buildGoPackage rec {
owner = "ethereum";
repo = "go-ethereum";
rev = "v${version}";
- sha256 = "0m2q1nz6f39pyr2rk6vflkwi4ykganzwr7wndpwr9rliw0x8jgi0";
+ sha256 = "1p4qfxa90l26s9q4hddyb93gdf7vb0sb46z9n26ijiqlxdq3z7v2";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/backup/vdmfec/default.nix b/pkgs/applications/backup/vdmfec/default.nix
new file mode 100644
index 000000000000..3a480f70d4b7
--- /dev/null
+++ b/pkgs/applications/backup/vdmfec/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "vdmfec-${version}";
+ version = "1.0";
+
+ src = fetchurl {
+ url = "http://members.tripod.com/professor_tom/archives/${name}.tgz";
+ sha256 = "0i7q4ylx2xmzzq778anpkj4nqir5gf573n1lbpxnbc10ymsjq2rm";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A program that adds error correction blocks";
+ homepage = "http://members.tripod.com/professor_tom/archives/index.html";
+ maintainers = [ maintainers.ar1a ];
+ license = with licenses; [ gpl2 /* for vdmfec */ bsd2 /* for fec */ ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index aa6305ce8311..2e7435b48bbb 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -24,7 +24,7 @@ in
postPatch = ''
sed -i "s,/usr/local,$out,g" \
app/CMakeLists.txt app/app/app.cpp app/app/main.cpp
- sed -i "s,python-py35,python36," CMakeLists.txt
+ sed -i "s,python3,${python3.executable}," CMakeLists.txt
'';
buildInputs = [
diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix
index e57e9394c105..a10b58d00b61 100644
--- a/pkgs/applications/misc/sigal/default.nix
+++ b/pkgs/applications/misc/sigal/default.nix
@@ -1,16 +1,16 @@
-{ lib, buildPythonApplication, fetchPypi, pythonPackages, ffmpeg }:
+{ lib, python3Packages, ffmpeg }:
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
version = "1.4.1";
pname = "sigal";
- src = fetchPypi {
+ src = python3Packages.fetchPypi {
inherit version pname;
sha256 = "1fg32ii26j3xpq3cryi212lx9z33qnicm1cszwv1wfpg6sr2rr61";
};
- buildInputs = with pythonPackages; [ pytest ];
- propagatedBuildInputs = with pythonPackages; [
+ checkInputs = with python3Packages; [ pytest ];
+ propagatedBuildInputs = with python3Packages; [
jinja2
markdown
pillow
@@ -32,4 +32,3 @@ buildPythonApplication rec {
maintainers = with maintainers; [ domenkozar ];
};
}
-
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 251315619cfd..569a4593dfee 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -1,26 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib-networking
-, gsettings-desktop-schemas, makeWrapper
+{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkit, gtk3, glib-networking
+, gsettings-desktop-schemas, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "vimb-${version}";
- version = "3.1.0";
+ version = "3.3.0";
- src = fetchurl {
- url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
- sha256 = "1gws028c2v1zh6r142hmjvi2m447lwqqh65m6z3dzcar2yw35z3f";
+ src = fetchFromGitHub {
+ owner = "fanglingsu";
+ repo = "vimb";
+ rev = version;
+ sha256 = "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings-desktop-schemas ];
+ nativeBuildInputs = [ wrapGAppsHook pkgconfig ];
+ buildInputs = [ gtk3 libsoup webkit glib-networking gsettings-desktop-schemas ];
- makeFlags = [ "PREFIX=$(out)" ];
-
- preFixup = ''
- wrapProgram "$out/bin/vimb" \
- --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- '';
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = {
description = "A Vim-like browser";
diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix
new file mode 100644
index 000000000000..4dbd3d38d31d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubectl/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, kubernetes }:
+
+stdenv.mkDerivation {
+ name = "kubectl-${kubernetes.version}";
+
+ # kubectl is currently part of the main distribution but will eventially be
+ # split out (see homepage)
+ src = kubernetes;
+
+ outputs = [ "out" "man" ];
+
+ doBuild = false;
+
+ installPhase = ''
+ mkdir -p \
+ "$out/bin" \
+ "$out/share/bash-completion/completions" \
+ "$out/share/zsh/site-functions" \
+ "$man/share/man/man1"
+
+ cp bin/kubectl $out/bin/kubectl
+
+ cp "${kubernetes.man}/share/man/man1"/kubectl* "$man/share/man/man1"
+
+ $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
+ $out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl
+ '';
+
+ meta = kubernetes.meta // {
+ description = "Kubernetes CLI";
+ homepage = "https://github.com/kubernetes/kubectl";
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch
deleted file mode 100644
index 1c79840d6260..000000000000
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Date: Tue, 17 Jul 2018 20:29:49 +0200
-
----
- Telegram/SourceFiles/export/data/export_data_types.cpp | 9 ++++++---
- Telegram/SourceFiles/export/export_api_wrap.cpp | 6 ++++--
- 2 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
-index f835dc2f9..e811c27e8 100644
---- a/Telegram/SourceFiles/export/data/export_data_types.cpp
-+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
-@@ -221,7 +221,8 @@ Image ParseMaxImage(
- result.width = data.vw.v;
- result.height = data.vh.v;
- result.file.location = ParseLocation(data.vlocation);
-- if constexpr (MTPDphotoCachedSize::Is()) {
-+ constexpr bool condition = MTPDphotoCachedSize::Is();
-+ if constexpr (condition) {
- result.file.content = data.vbytes.v;
- result.file.size = result.file.content.size();
- } else {
-@@ -409,7 +410,8 @@ Document ParseDocument(
- result.width = data.vw.v;
- result.height = data.vh.v;
- result.file.location = ParseLocation(data.vlocation);
-- if constexpr (MTPDphotoCachedSize::Is()) {
-+ constexpr bool condition = MTPDphotoCachedSize::Is();
-+ if constexpr (condition) {
- result.file.content = data.vbytes.v;
- result.file.size = result.file.content.size();
- } else {
-@@ -1017,7 +1019,8 @@ Message ParseMessage(
- auto result = Message();
- data.match([&](const auto &data) {
- result.id = data.vid.v;
-- if constexpr (!MTPDmessageEmpty::Is()) {
-+ constexpr bool condition = !MTPDmessageEmpty::Is();
-+ if constexpr (condition) {
- result.toId = ParsePeerId(data.vto_id);
- const auto peerId = (!data.is_out()
- && data.has_from_id()
-diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
-index b618937f6..bb98647dd 100644
---- a/Telegram/SourceFiles/export/export_api_wrap.cpp
-+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
-@@ -709,7 +709,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) {
- Expects(_userpicsProcess != nullptr);
-
- result.match([&](const auto &data) {
-- if constexpr (MTPDphotos_photos::Is()) {
-+ constexpr bool condition = MTPDphotos_photos::Is();
-+ if constexpr (condition) {
- _userpicsProcess->lastSlice = true;
- }
- loadUserpicsFiles(Data::ParseUserpicsSlice(
-@@ -1141,7 +1142,8 @@ void ApiWrap::requestMessagesSlice() {
- result.match([&](const MTPDmessages_messagesNotModified &data) {
- error("Unexpected messagesNotModified received.");
- }, [&](const auto &data) {
-- if constexpr (MTPDmessages_messages::Is()) {
-+ constexpr bool condition = MTPDmessages_messages::Is();
-+ if constexpr (condition) {
- _chatProcess->lastSlice = true;
- }
- loadMessagesFiles(Data::ParseMessagesSlice(
---
-2.16.3
-
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index c20da7eeb665..c32e6b186b7a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -29,12 +29,7 @@ mkDerivation rec {
};
# TODO: libtgvoip.patch no-gtk2.patch
- patches = [
- "${archPatches}/tdesktop.patch"
- ]
- # TODO: Only required to work around a compiler bug.
- # This should be fixed in GCC 7.3.1 (or later?)
- ++ [ ./fix-internal-compiler-error.patch ];
+ patches = [ "${archPatches}/tdesktop.patch" ];
postPatch = ''
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
diff --git a/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop b/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop
new file mode 100755
index 000000000000..90b8ed7d20a5
--- /dev/null
+++ b/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop
@@ -0,0 +1,9 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Type=Application
+Name=ChemAxon License Manager
+Exec=@out@/bin/LicenseManager
+Icon=LicenseManager
+Categories=Education;Science;Chemistry;
+StartupWMClass=com-install4j-runtime-launcher-UnixLauncher
+Comment=License manager for ChemAxon software like MarvinSketch
diff --git a/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop b/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop
new file mode 100755
index 000000000000..d6e0343a78c3
--- /dev/null
+++ b/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop
@@ -0,0 +1,10 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Type=Application
+Name=MarvinSketch
+Exec=@out@/bin/msketch %f
+Icon=MarvinSketch
+MimeType=text/xml;text/plain;chemical/x-cml;chemical/x-mdl-molfile;chemical/x-mdl-sdfile;chemical/x-mol2;chemical/x-pdb;chemical/x-xyz;chemical/x-mdl-rdfile;chemical/x-mdl-rxnfile;chemical/x-inchi;
+Categories=Education;Science;Chemistry;
+StartupWMClass=com-install4j-runtime-launcher-UnixLauncher
+Comment=Molecular modelling, analysis and structure drawing program
diff --git a/pkgs/applications/science/chemistry/marvin/MarvinView.desktop b/pkgs/applications/science/chemistry/marvin/MarvinView.desktop
new file mode 100755
index 000000000000..07a3c3c7cf33
--- /dev/null
+++ b/pkgs/applications/science/chemistry/marvin/MarvinView.desktop
@@ -0,0 +1,10 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Type=Application
+Name=MarvinView
+Exec=@out@/bin/mview %f
+Icon=MarvinView
+Comment=Molecule viewing program
+MimeType=text/xml;text/plain;chemical/x-cml;chemical/x-mdl-molfile;chemical/x-mdl-sdfile;chemical/x-mol2;chemical/x-pdb;chemical/x-xyz;chemical/x-mdl-rdfile;chemical/x-mdl-rxnfile;chemical/x-inchi;
+Categories=Education;Science;Chemistry;
+StartupWMClass=com-install4j-runtime-launcher-UnixLauncher
diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
new file mode 100644
index 000000000000..948aed03fe5e
--- /dev/null
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "marvin";
+ version = "19.1.0";
+
+ src = fetchurl {
+ name = "marvin-${version}.deb";
+ url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
+ sha256 = "1ccsimfvms5q4prjyk6sg5hsc3hkcjjfq3gl7jjm8dgd2173zzyc";
+ };
+
+ nativeBuildInputs = [ dpkg makeWrapper ];
+
+ unpackPhase = ''
+ dpkg-deb -x $src opt
+ '';
+
+ installPhase = ''
+ wrapBin() {
+ makeWrapper $1 $out/bin/$(basename $1) \
+ --set INSTALL4J_JAVA_HOME "${jre}" \
+ --prefix PATH : ${makeBinPath [ coreutils gawk gnugrep gnused ]}
+ }
+ cp -r opt $out
+ mkdir -p $out/bin $out/share/pixmaps $out/share/applications
+ for name in LicenseManager MarvinSketch MarvinView; do
+ wrapBin $out/opt/chemaxon/marvinsuite/$name
+ ln -s {$out/opt/chemaxon/marvinsuite/.install4j,$out/share/pixmaps}/$name.png
+ done
+ for name in cxcalc cxtrain evaluate molconvert mview msketch; do
+ wrapBin $out/opt/chemaxon/marvinsuite/bin/$name
+ done
+ ${concatStrings (map (name: ''
+ substitute ${./. + "/${name}.desktop"} $out/share/applications/${name}.desktop --subst-var out
+ '') [ "LicenseManager" "MarvinSketch" "MarvinView" ])}
+ '';
+
+ meta = {
+ description = "A chemical modelling, analysis and structure drawing program";
+ homepage = https://chemaxon.com/products/marvin;
+ maintainers = with maintainers; [ fusion809 ];
+ license = licenses.unfree;
+ platforms = platforms.linux;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/science/logic/sapic/default.nix b/pkgs/applications/science/logic/sapic/default.nix
deleted file mode 100644
index 27efe865a9d9..000000000000
--- a/pkgs/applications/science/logic/sapic/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, unzip, ocaml }:
-
-stdenv.mkDerivation rec {
- name = "sapic-${version}";
- version = "0.9";
-
- src = fetchurl {
- url = "http://sapic.gforge.inria.fr/${name}.zip";
- sha256 = "1ckl090lpyfh90mkjhnpcys5grs3nrl9wlbn9nfkxxnaivn2yx9y";
- };
-
- nativeBuildInputs = [ unzip ];
- buildInputs = [ ocaml ];
- patches = [ ./native.patch ]; # create a native binary, not a bytecode one
-
- buildPhase = "make depend && make";
- installPhase = ''
- mkdir -p $out/bin
- cp ./sapic $out/bin
- '';
-
- meta = {
- description = "Stateful applied Pi Calculus for protocol verification";
- homepage = http://sapic.gforge.inria.fr/;
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
- };
-}
diff --git a/pkgs/applications/science/logic/sapic/native.patch b/pkgs/applications/science/logic/sapic/native.patch
deleted file mode 100644
index 6e0b98113df2..000000000000
--- a/pkgs/applications/science/logic/sapic/native.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a1de94d..f9e2eb8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,8 @@
- TARGET = sapic
--OBJS=lexer.cmo apip.cmo firsttranslation.cmo main.cmo #secondtranslation.cmo thirdtranslation.cmo main.cmo
-+OBJS=lexer.cmx apip.cmx firsttranslation.cmx main.cmx
-
- sapic: $(OBJS)
-- ocamlc -o $@ $(OBJS)
-+ ocamlopt.opt -o $@ $(OBJS)
-
- depend:
- ocamldep *.ml *.mli > .depend
-@@ -13,17 +13,17 @@ clean:
- rm -rf *.cmi *.cmo $(TARGET)
- rm -rf apip.ml apip.mli lexer.ml lexer.mli
-
--.SUFFIXES: .ml .mli .mll .mly .cmo .cmi
-+.SUFFIXES: .ml .mli .mll .mly .cmo .cmi .cmx
-
--.ml.cmo:
-- ocamlc -c $<
-+.ml.cmx:
-+ ocamlopt.opt -c $<
- .mli.cmi:
-- ocamlc -c $<
-+ ocamlopt.opt -c $<
- .mll.ml:
- ocamllex $<
- .mly.ml:
- ocamlyacc $<
- .ml.mli:
-- ocamlc -i $< > $@
-+ ocamlopt.opt -i $< > $@
-
- -include .depend
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 9056eab71ea3..40378f8c04d5 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -1,15 +1,15 @@
{ haskellPackages, mkDerivation, fetchFromGitHub, lib
# the following are non-haskell dependencies
-, makeWrapper, which, maude, graphviz, sapic
+, makeWrapper, which, maude, graphviz, ocaml
}:
let
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "tamarin-prover";
repo = "tamarin-prover";
- rev = "7ced07a69f8e93178f9a95797479277a736ae572";
- sha256 = "02pyw22h90228g6qybjpdvpcm9d5lh96f5qwmy2hv2bylz05z3nn";
+ rev = "d2e1c57311ce4ed0ef46d0372c4995b8fdc25323";
+ sha256 = "1bf2qvb646jg3qxd6jgp9ja3wlr888wchxi9mfr3kg7hfn63vxbq";
};
# tamarin has its own dependencies, but they're kept inside the repo,
@@ -32,7 +32,6 @@ let
tamarin-prover-utils = mkDerivation (common "tamarin-prover-utils" (src + "/lib/utils") // {
postPatch = replaceSymlinks;
- patches = [ ./ghc-8.4-support-utils.patch ];
libraryHaskellDepends = with haskellPackages; [
base base64-bytestring binary blaze-builder bytestring containers
deepseq dlist fclabels mtl pretty safe SHA syb time transformers
@@ -41,7 +40,6 @@ let
tamarin-prover-term = mkDerivation (common "tamarin-prover-term" (src + "/lib/term") // {
postPatch = replaceSymlinks;
- patches = [ ./ghc-8.4-support-term.patch ];
libraryHaskellDepends = (with haskellPackages; [
attoparsec base binary bytestring containers deepseq dlist HUnit
mtl process safe
@@ -50,7 +48,6 @@ let
tamarin-prover-theory = mkDerivation (common "tamarin-prover-theory" (src + "/lib/theory") // {
postPatch = replaceSymlinks;
- patches = [ ./ghc-8.4-support-theory.patch ];
doHaddock = false; # broken
libraryHaskellDepends = (with haskellPackages; [
aeson aeson-pretty base binary bytestring containers deepseq dlist
@@ -75,20 +72,28 @@ mkDerivation (common "tamarin-prover" src // {
sed -ie 's~\( *, \)mtl~&\
\1monad-control~' tamarin-prover.cabal
+
+ patch -p1 < ${./sapic-native.patch}
+ '';
+
+ postBuild = ''
+ cd plugins/sapic && make sapic && cd ../..
'';
# wrap the prover to be sure it can find maude, sapic, etc
- executableToolDepends = [ makeWrapper which maude graphviz sapic ];
+ executableToolDepends = [ makeWrapper which maude graphviz ];
postInstall = ''
wrapProgram $out/bin/tamarin-prover \
- --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]}
+ --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]}
# so that the package can be used as a vim plugin to install syntax coloration
install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim
install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim
+ install -m0755 ./plugins/sapic/sapic $out/bin/sapic
'';
checkPhase = "./dist/build/tamarin-prover/tamarin-prover test";
+ executableSystemDepends = [ ocaml ];
executableHaskellDepends = (with haskellPackages; [
base binary binary-orphans blaze-builder blaze-html bytestring
cmdargs conduit containers monad-control deepseq directory fclabels file-embed
diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch
deleted file mode 100644
index f93919faf54e..000000000000
--- a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001
-From: Felix Yan
-Date: Fri, 18 May 2018 16:24:41 +0800
-Subject: [PATCH] GHC 8.4 support
-
----
- src/Term/Maude/Signature.hs | 8 ++--
- src/Term/Rewriting/Definitions.hs | 23 ++++++----
- src/Term/Unification.hs | 4 +-
- 11 files changed, 79 insertions(+), 48 deletions(-)
-
-diff --git a/src/Term/Maude/Signature.hs b/src/Term/Maude/Signature.hs
-index 98c25d9f..1a4ce82f 100644
---- a/src/Term/Maude/Signature.hs
-+++ b/src/Term/Maude/Signature.hs
-@@ -104,9 +104,9 @@ maudeSig msig@(MaudeSig {enableDH,enableBP,enableMSet,enableXor,enableDiff=_,stF
- `S.union` dhReducibleFunSig `S.union` bpReducibleFunSig `S.union` xorReducibleFunSig
-
- -- | A monoid instance to combine maude signatures.
--instance Monoid MaudeSig where
-- (MaudeSig dh1 bp1 mset1 xor1 diff1 stFunSyms1 stRules1 _ _) `mappend`
-- (MaudeSig dh2 bp2 mset2 xor2 diff2 stFunSyms2 stRules2 _ _) =
-+instance Semigroup MaudeSig where
-+ MaudeSig dh1 bp1 mset1 xor1 diff1 stFunSyms1 stRules1 _ _ <>
-+ MaudeSig dh2 bp2 mset2 xor2 diff2 stFunSyms2 stRules2 _ _ =
- maudeSig (mempty {enableDH=dh1||dh2
- ,enableBP=bp1||bp2
- ,enableMSet=mset1||mset2
-@@ -114,6 +114,8 @@ instance Monoid MaudeSig where
- ,enableDiff=diff1||diff2
- ,stFunSyms=S.union stFunSyms1 stFunSyms2
- ,stRules=S.union stRules1 stRules2})
-+
-+instance Monoid MaudeSig where
- mempty = MaudeSig False False False False False S.empty S.empty S.empty S.empty
-
- -- | Non-AC function symbols.
-diff --git a/src/Term/Rewriting/Definitions.hs b/src/Term/Rewriting/Definitions.hs
-index bd942b6a..18562e4e 100644
---- a/src/Term/Rewriting/Definitions.hs
-+++ b/src/Term/Rewriting/Definitions.hs
-@@ -44,10 +44,12 @@ evalEqual (Equal l r) = l == r
- instance Functor Equal where
- fmap f (Equal lhs rhs) = Equal (f lhs) (f rhs)
-
-+instance Semigroup a => Semigroup (Equal a) where
-+ (Equal l1 r1) <> (Equal l2 r2) =
-+ Equal (l1 <> l2) (r1 <> r2)
-+
- instance Monoid a => Monoid (Equal a) where
- mempty = Equal mempty mempty
-- (Equal l1 r1) `mappend` (Equal l2 r2) =
-- Equal (l1 `mappend` l2) (r1 `mappend` r2)
-
- instance Foldable Equal where
- foldMap f (Equal l r) = f l `mappend` f r
-@@ -104,14 +106,15 @@ instance Functor Match where
- fmap _ NoMatch = NoMatch
- fmap f (DelayedMatches ms) = DelayedMatches (fmap (f *** f) ms)
-
-+instance Semigroup (Match a) where
-+ NoMatch <> _ = NoMatch
-+ _ <> NoMatch = NoMatch
-+ DelayedMatches ms1 <> DelayedMatches ms2 =
-+ DelayedMatches (ms1 <> ms2)
-+
- instance Monoid (Match a) where
- mempty = DelayedMatches []
-
-- NoMatch `mappend` _ = NoMatch
-- _ `mappend` NoMatch = NoMatch
-- DelayedMatches ms1 `mappend` DelayedMatches ms2 =
-- DelayedMatches (ms1 `mappend` ms2)
--
-
- instance Foldable Match where
- foldMap _ NoMatch = mempty
-@@ -136,10 +139,12 @@ data RRule a = RRule a a
- instance Functor RRule where
- fmap f (RRule lhs rhs) = RRule (f lhs) (f rhs)
-
-+instance Monoid a => Semigroup (RRule a) where
-+ (RRule l1 r1) <> (RRule l2 r2) =
-+ RRule (l1 <> l2) (r1 <> r2)
-+
- instance Monoid a => Monoid (RRule a) where
- mempty = RRule mempty mempty
-- (RRule l1 r1) `mappend` (RRule l2 r2) =
-- RRule (l1 `mappend` l2) (r1 `mappend` r2)
-
- instance Foldable RRule where
- foldMap f (RRule l r) = f l `mappend` f r
-diff --git a/src/Term/Unification.hs b/src/Term/Unification.hs
-index e1de0163..7ce6bb41 100644
---- a/src/Term/Unification.hs
-+++ b/src/Term/Unification.hs
-@@ -265,9 +265,11 @@ unifyRaw l0 r0 = do
-
- data MatchFailure = NoMatcher | ACProblem
-
-+instance Semigroup MatchFailure where
-+ _ <> _ = NoMatcher
-+
- instance Monoid MatchFailure where
- mempty = NoMatcher
-- mappend _ _ = NoMatcher
-
- -- | Ensure that the computed substitution @sigma@ satisfies
- -- @t ==_AC apply sigma p@ after the delayed equations are solved.
diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch
deleted file mode 100644
index f7393e37f1b2..000000000000
--- a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001
-From: Felix Yan
-Date: Fri, 18 May 2018 16:24:41 +0800
-Subject: [PATCH] GHC 8.4 support
-
----
- src/Theory/Proof.hs | 43 +++++++++++--------
- 11 files changed, 79 insertions(+), 48 deletions(-)
-
-diff --git a/src/Theory/Constraint/Solver/Reduction.hs b/src/Theory/Constraint/Solver/Reduction.hs
-index ddbc965a..6daadd0d 100644
---- a/src/Theory/Constraint/Solver/Reduction.hs
-+++ b/src/Theory/Constraint/Solver/Reduction.hs
-@@ -139,13 +139,14 @@ execReduction m ctxt se fs =
- data ChangeIndicator = Unchanged | Changed
- deriving( Eq, Ord, Show )
-
-+instance Semigroup ChangeIndicator where
-+ Changed <> _ = Changed
-+ _ <> Changed = Changed
-+ Unchanged <> Unchanged = Unchanged
-+
- instance Monoid ChangeIndicator where
- mempty = Unchanged
-
-- Changed `mappend` _ = Changed
-- _ `mappend` Changed = Changed
-- Unchanged `mappend` Unchanged = Unchanged
--
- -- | Return 'True' iff there was a change.
- wasChanged :: ChangeIndicator -> Bool
- wasChanged Changed = True
-diff --git a/src/Theory/Constraint/System/Guarded.hs b/src/Theory/Constraint/System/Guarded.hs
-index f98fc7c2..2aac8ce2 100644
---- a/src/Theory/Constraint/System/Guarded.hs
-+++ b/src/Theory/Constraint/System/Guarded.hs
-@@ -435,7 +435,7 @@ gall ss atos gf = GGuarded All ss atos gf
-
- -- | Local newtype to avoid orphan instance.
- newtype ErrorDoc d = ErrorDoc { unErrorDoc :: d }
-- deriving( Monoid, NFData, Document, HighlightDocument )
-+ deriving( Monoid, Semigroup, NFData, Document, HighlightDocument )
-
- -- | @formulaToGuarded fm@ returns a guarded formula @gf@ that is
- -- equivalent to @fm@ under the assumption that this is possible.
-diff --git a/src/Theory/Proof.hs b/src/Theory/Proof.hs
-index 74fb77b1..7971b9fc 100644
---- a/src/Theory/Proof.hs
-+++ b/src/Theory/Proof.hs
-@@ -388,17 +388,19 @@ data ProofStatus =
- | TraceFound -- ^ There is an annotated solved step
- deriving ( Show, Generic, NFData, Binary )
-
-+instance Semigroup ProofStatus where
-+ TraceFound <> _ = TraceFound
-+ _ <> TraceFound = TraceFound
-+ IncompleteProof <> _ = IncompleteProof
-+ _ <> IncompleteProof = IncompleteProof
-+ _ <> CompleteProof = CompleteProof
-+ CompleteProof <> _ = CompleteProof
-+ UndeterminedProof <> UndeterminedProof = UndeterminedProof
-+
-+
- instance Monoid ProofStatus where
- mempty = CompleteProof
-
-- mappend TraceFound _ = TraceFound
-- mappend _ TraceFound = TraceFound
-- mappend IncompleteProof _ = IncompleteProof
-- mappend _ IncompleteProof = IncompleteProof
-- mappend _ CompleteProof = CompleteProof
-- mappend CompleteProof _ = CompleteProof
-- mappend UndeterminedProof UndeterminedProof = UndeterminedProof
--
- -- | The status of a 'ProofStep'.
- proofStepStatus :: ProofStep (Maybe a) -> ProofStatus
- proofStepStatus (ProofStep _ Nothing ) = UndeterminedProof
-@@ -560,10 +562,12 @@ newtype Prover = Prover
- -> Maybe IncrementalProof -- resulting proof
- }
-
-+instance Semigroup Prover where
-+ p1 <> p2 = Prover $ \ctxt d se ->
-+ runProver p1 ctxt d se >=> runProver p2 ctxt d se
-+
- instance Monoid Prover where
- mempty = Prover $ \_ _ _ -> Just
-- p1 `mappend` p2 = Prover $ \ctxt d se ->
-- runProver p1 ctxt d se >=> runProver p2 ctxt d se
-
- -- | Provers whose sequencing is handled via the 'Monoid' instance.
- --
-@@ -579,10 +583,12 @@ newtype DiffProver = DiffProver
- -> Maybe IncrementalDiffProof -- resulting proof
- }
-
-+instance Semigroup DiffProver where
-+ p1 <> p2 = DiffProver $ \ctxt d se ->
-+ runDiffProver p1 ctxt d se >=> runDiffProver p2 ctxt d se
-+
- instance Monoid DiffProver where
- mempty = DiffProver $ \_ _ _ -> Just
-- p1 `mappend` p2 = DiffProver $ \ctxt d se ->
-- runDiffProver p1 ctxt d se >=> runDiffProver p2 ctxt d se
-
- -- | Map the proof generated by the prover.
- mapProverProof :: (IncrementalProof -> IncrementalProof) -> Prover -> Prover
-@@ -784,15 +790,16 @@ runAutoDiffProver (AutoProver heuristic bound cut) =
- -- | The result of one pass of iterative deepening.
- data IterDeepRes = NoSolution | MaybeNoSolution | Solution ProofPath
-
-+instance Semigroup IterDeepRes where
-+ x@(Solution _) <> _ = x
-+ _ <> y@(Solution _) = y
-+ MaybeNoSolution <> _ = MaybeNoSolution
-+ _ <> MaybeNoSolution = MaybeNoSolution
-+ NoSolution <> NoSolution = NoSolution
-+
- instance Monoid IterDeepRes where
- mempty = NoSolution
-
-- x@(Solution _) `mappend` _ = x
-- _ `mappend` y@(Solution _) = y
-- MaybeNoSolution `mappend` _ = MaybeNoSolution
-- _ `mappend` MaybeNoSolution = MaybeNoSolution
-- NoSolution `mappend` NoSolution = NoSolution
--
- -- | @cutOnSolvedDFS prf@ removes all other cases if an attack is found. The
- -- attack search is performed using a parallel DFS traversal with iterative
- -- deepening.
diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch
deleted file mode 100644
index d6cd6d73f99e..000000000000
--- a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001
-From: Felix Yan
-Date: Fri, 18 May 2018 16:24:41 +0800
-Subject: [PATCH] GHC 8.4 support
-
----
- src/Extension/Data/Bounded.hs | 10 ++++-
- src/Extension/Data/Monoid.hs | 14 +++---
- src/Logic/Connectives.hs | 4 +-
- src/Text/PrettyPrint/Class.hs | 4 +-
- src/Text/PrettyPrint/Html.hs | 6 ++-
- 11 files changed, 79 insertions(+), 48 deletions(-)
-
-
-diff --git a/src/Extension/Data/Bounded.hs b/src/Extension/Data/Bounded.hs
-index 5f166006..f416a44c 100644
---- a/src/Extension/Data/Bounded.hs
-+++ b/src/Extension/Data/Bounded.hs
-@@ -11,19 +11,25 @@ module Extension.Data.Bounded (
- ) where
-
- -- import Data.Monoid
-+import Data.Semigroup
-
- -- | A newtype wrapper for a monoid of the maximum of a bounded type.
- newtype BoundedMax a = BoundedMax {getBoundedMax :: a}
- deriving( Eq, Ord, Show )
-
-+instance (Ord a, Bounded a) => Semigroup (BoundedMax a) where
-+ BoundedMax x <> BoundedMax y = BoundedMax (max x y)
-+
- instance (Ord a, Bounded a) => Monoid (BoundedMax a) where
- mempty = BoundedMax minBound
-- (BoundedMax x) `mappend` (BoundedMax y) = BoundedMax (max x y)
-+ mappend = (<>)
-
- -- | A newtype wrapper for a monoid of the minimum of a bounded type.
- newtype BoundedMin a = BoundedMin {getBoundedMin :: a}
- deriving( Eq, Ord, Show )
-
-+instance (Ord a, Bounded a) => Semigroup (BoundedMin a) where
-+ BoundedMin x <> BoundedMin y = BoundedMin (min x y)
-+
- instance (Ord a, Bounded a) => Monoid (BoundedMin a) where
- mempty = BoundedMin maxBound
-- (BoundedMin x) `mappend` (BoundedMin y) = BoundedMin (min x y)
-\ No newline at end of file
-diff --git a/src/Extension/Data/Monoid.hs b/src/Extension/Data/Monoid.hs
-index 83655c34..9ce2f91b 100644
---- a/src/Extension/Data/Monoid.hs
-+++ b/src/Extension/Data/Monoid.hs
-@@ -18,6 +18,7 @@ module Extension.Data.Monoid (
- ) where
-
- import Data.Monoid
-+import Data.Semigroup
-
- #if __GLASGOW_HASKELL__ < 704
-
-@@ -38,10 +39,13 @@ newtype MinMax a = MinMax { getMinMax :: Maybe (a, a) }
- minMaxSingleton :: a -> MinMax a
- minMaxSingleton x = MinMax (Just (x, x))
-
-+instance Ord a => Semigroup (MinMax a) where
-+ MinMax Nothing <> y = y
-+ x <> MinMax Nothing = x
-+ MinMax (Just (xMin, xMax)) <> MinMax (Just (yMin, yMax)) =
-+ MinMax (Just (min xMin yMin, max xMax yMax))
-+
-+
- instance Ord a => Monoid (MinMax a) where
- mempty = MinMax Nothing
--
-- MinMax Nothing `mappend` y = y
-- x `mappend` MinMax Nothing = x
-- MinMax (Just (xMin, xMax)) `mappend` MinMax (Just (yMin, yMax)) =
-- MinMax (Just (min xMin yMin, max xMax yMax))
-+ mappend = (<>)
-diff --git a/src/Logic/Connectives.hs b/src/Logic/Connectives.hs
-index 2e441172..7206cc2c 100644
---- a/src/Logic/Connectives.hs
-+++ b/src/Logic/Connectives.hs
-@@ -23,12 +23,12 @@ import Control.DeepSeq
-
- -- | A conjunction of atoms of type a.
- newtype Conj a = Conj { getConj :: [a] }
-- deriving (Monoid, Foldable, Traversable, Eq, Ord, Show, Binary,
-+ deriving (Monoid, Semigroup, Foldable, Traversable, Eq, Ord, Show, Binary,
- Functor, Applicative, Monad, Alternative, MonadPlus, Typeable, Data, NFData)
-
- -- | A disjunction of atoms of type a.
- newtype Disj a = Disj { getDisj :: [a] }
-- deriving (Monoid, Foldable, Traversable, Eq, Ord, Show, Binary,
-+ deriving (Monoid, Semigroup, Foldable, Traversable, Eq, Ord, Show, Binary,
- Functor, Applicative, Monad, Alternative, MonadPlus, Typeable, Data, NFData)
-
- instance MonadDisj Disj where
-diff --git a/src/Text/PrettyPrint/Class.hs b/src/Text/PrettyPrint/Class.hs
-index f5eb42fe..13be6515 100644
---- a/src/Text/PrettyPrint/Class.hs
-+++ b/src/Text/PrettyPrint/Class.hs
-@@ -187,9 +187,11 @@ instance Document Doc where
- nest i (Doc d) = Doc $ P.nest i d
- caseEmptyDoc yes no (Doc d) = if P.isEmpty d then yes else no
-
-+instance Semigroup Doc where
-+ Doc d1 <> Doc d2 = Doc $ (P.<>) d1 d2
-+
- instance Monoid Doc where
- mempty = Doc $ P.empty
-- mappend (Doc d1) (Doc d2) = Doc $ (P.<>) d1 d2
-
- ------------------------------------------------------------------------------
- -- Additional combinators
-diff --git a/src/Text/PrettyPrint/Html.hs b/src/Text/PrettyPrint/Html.hs
-index 3de5e307..10103eb7 100644
---- a/src/Text/PrettyPrint/Html.hs
-+++ b/src/Text/PrettyPrint/Html.hs
-@@ -90,7 +90,7 @@ attribute (key,value) = " " ++ key ++ "=\"" ++ escapeHtmlEntities value ++ "\""
-
- -- | A 'Document' transformer that adds proper HTML escaping.
- newtype HtmlDoc d = HtmlDoc { getHtmlDoc :: d }
-- deriving( Monoid )
-+ deriving( Monoid, Semigroup )
-
- -- | Wrap a document such that HTML markup can be added without disturbing the
- -- layout.
-@@ -182,9 +182,11 @@ getNoHtmlDoc = runIdentity . unNoHtmlDoc
- instance NFData d => NFData (NoHtmlDoc d) where
- rnf = rnf . getNoHtmlDoc
-
-+instance Semigroup d => Semigroup (NoHtmlDoc d) where
-+ (<>) = liftA2 (<>)
-+
- instance Monoid d => Monoid (NoHtmlDoc d) where
- mempty = pure mempty
-- mappend = liftA2 mappend
-
- instance Document d => Document (NoHtmlDoc d) where
- char = pure . char
diff --git a/pkgs/applications/science/logic/tamarin-prover/sapic-native.patch b/pkgs/applications/science/logic/tamarin-prover/sapic-native.patch
new file mode 100644
index 000000000000..6ab7e4e7594f
--- /dev/null
+++ b/pkgs/applications/science/logic/tamarin-prover/sapic-native.patch
@@ -0,0 +1,77 @@
+diff --git a/plugins/sapic/Makefile b/plugins/sapic/Makefile
+index 8f1b1866..678accbe 100644
+--- a/plugins/sapic/Makefile
++++ b/plugins/sapic/Makefile
+@@ -1,18 +1,18 @@
+ TARGET = sapic
+-OBJS= color.cmo exceptions.cmo btree.cmo position.cmo positionplusinit.cmo var.cmo term.cmo fact.cmo atomformulaaction.cmo action.cmo atom.cmo formula.cmo tamarin.cmo sapicterm.cmo sapicvar.cmo sapicaction.cmo lexer.cmo sapic.cmo annotatedsapicaction.cmo annotatedsapictree.cmo progressfunction.cmo restrictions.cmo annotatedrule.cmo translationhelper.cmo basetranslation.cmo firsttranslation.cmo main.cmo
++OBJS= color.cmx exceptions.cmx btree.cmx position.cmx positionplusinit.cmx var.cmx term.cmx fact.cmx atomformulaaction.cmx action.cmx atom.cmx formula.cmx tamarin.cmx sapicterm.cmx sapicvar.cmx sapicaction.cmx lexer.cmx sapic.cmx annotatedsapicaction.cmx annotatedsapictree.cmx progressfunction.cmx restrictions.cmx annotatedrule.cmx translationhelper.cmx basetranslation.cmx firsttranslation.cmx main.cmx
+ FLAGS=-g
+
+-OCAMLC := $(shell command -v ocamlc 2> /dev/null)
++OCAMLOPT := $(shell command -v ocamlopt 2> /dev/null)
+ OCAMLLEX := $(shell command -v ocamllex 2> /dev/null)
+ OCAMLYACC := $(shell command -v ocamlyacc 2> /dev/null)
+ OCAMLDEP := $(shell command -v ocamldep 2> /dev/null)
+-OCAMLC_GTEQ_402 := $(shell expr `ocamlc -version | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40200)
++OCAMLC_GTEQ_402 := $(shell expr `ocamlopt -version | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40200)
+
+ default: sapic
+
+ sapic:
+-ifdef OCAMLC
+- @echo "Found ocamlc."
++ifdef OCAMLOPT
++ @echo "Found ocamlopt."
+ ifdef OCAMLLEX
+ @echo "Found ocamllex."
+ ifdef OCAMLYACC
+@@ -22,9 +22,9 @@ ifdef OCAMLDEP
+ ifeq "$(OCAMLC_GTEQ_402)" "1"
+ @echo "Building SAPIC."
+ $(MAKE) $(OBJS)
+- ocamlc $(FLAGS) -o $@ str.cma $(OBJS)
+- @echo "Installing SAPIC into ~/.local/bin/"
+- cp sapic ~/.local/bin
++ ocamlopt $(FLAGS) -o $@ str.cmxa $(OBJS)
++# @echo "Installing SAPIC into ~/.local/bin/"
++# cp sapic ~/.local/bin
+ else
+ @echo "Found OCAML version < 4.02. SAPIC will not be installed."
+ endif
+@@ -38,7 +38,7 @@ else
+ @echo "ocamllex not found. SAPIC will not be installed."
+ endif
+ else
+- @echo "ocamlc not found. SAPIC will not be installed."
++ @echo "ocamlopt not found. SAPIC will not be installed."
+ endif
+
+ depend:
+@@ -48,20 +48,20 @@ lexer.ml: sapic.cmi
+
+ .PHONY: clean
+ clean:
+- rm -rf *.cmi *.cmo $(TARGET)
++ rm -rf *.cmi **.cmx $(TARGET)
+ rm -rf sapic.ml sapic.mli lexer.ml lexer.mli
+
+-.SUFFIXES: .ml .mli .mll .mly .cmo .cmi
++.SUFFIXES: .ml .mli .mll .mly .cmx .cmi
+
+-.ml.cmo:
+- ocamlc $(FLAGS) -c $<
++.ml.cmx:
++ ocamlopt $(FLAGS) -c $<
+ .mli.cmi:
+- ocamlc $(FLAGS) -c $<
++ ocamlopt $(FLAGS) -c $<
+ .mll.ml:
+ ocamllex $<
+ .mly.ml:
+ ocamlyacc $<
+ .ml.mli:
+- ocamlc -i $< > $@
++ ocamlopt -i $< > $@
+
+ -include .depend
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 11fa892f135d..b629c8fe9109 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python ];
- # TODO: Cleanup
patchPhase = ''
- CA_PATH="$(echo '${cacert}/etc/ssl/certs/ca-bundle.crt' | sed 's/\//\\\//g')" # / -> \/
- sed -i -E 's/urlopen\(url\)/urlopen(url, cafile="'$CA_PATH'")/' repo
+ substituteInPlace repo --replace \
+ 'urllib.request.urlopen(url)' \
+ 'urllib.request.urlopen(url, cafile="${cacert}/etc/ssl/certs/ca-bundle.crt")'
'';
installPhase = ''
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
index 93a8d2070542..34efffc21d72 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -1,31 +1,31 @@
-{ stdenv, fetchurl, jre, unzip }:
+{ stdenv, fetchurl, makeWrapper, jre }:
-stdenv.mkDerivation {
- name = "mediathekview-9";
+stdenv.mkDerivation rec {
+ version = "13.2.1";
+ name = "mediathekview-${version}";
src = fetchurl {
- url = "mirror://sourceforge/zdfmediathk/MediathekView_9.zip";
- sha256 = "1wff0igr33z9p1mjw7yvb6658smdwnp22dv8klz0y8qg116wx7a4";
+ url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz";
+ sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a";
};
- unpackPhase = "true";
- buildInputs = [ unzip ];
-
- # Could use some more love
- # Maybe we can also preconfigure locations for vlc and the others.
+ nativeBuildInputs = [ makeWrapper ];
+
installPhase = ''
- mkdir -p $out/bin
- mkdir -p $out/opt/mediathekview
- cd $out/opt/mediathekview
- unzip $src
- find . -iname '*.exe' -delete
- sed -i -e 's, java, ${jre}/bin/java,' MediathekView__Linux.sh
- ln -s $out/opt/mediathekview/MediathekView__Linux.sh $out/bin/mediathekview
- '';
+ mkdir -p $out/{lib,bin,share/mediathekview}
+
+ install -m644 MediathekView.jar $out/
+ install -m644 -t $out/lib lib/*
+ install -m755 bin/flv.sh $out/share/mediathekview
+
+ makeWrapper ${jre}/bin/java $out/bin/mediathek \
+ --add-flags "-cp '$out/lib/*' -jar $out/MediathekView.jar"
+ '';
meta = with stdenv.lib; {
- homepage = http://zdfmediathk.sourceforge.net/;
- license = stdenv.lib.licenses.gpl3;
- maintainers = [ maintainers.chaoflow ];
- platforms = platforms.linux; # also macOS and cygwin, but not investigated, yet
+ description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
+ homepage = https://mediathekview.de/;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ chaoflow moredread ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 62a517e80ea6..4e4c623ca607 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg_4
-, freefont_ttf, freetype, libass, libpthreadstubs
+, freefont_ttf, freetype, libass, libpthreadstubs, mujs
, lua, luasocket, libuchardet, libiconv ? null, darwin
, waylandSupport ? false
@@ -19,6 +19,11 @@
, libcdio ? null
, libcdio-paranoia ? null
+, vulkanSupport ? stdenv.isLinux
+ , shaderc ? null
+ , vulkan-headers ? null
+ , vulkan-loader ? null
+
, alsaSupport ? true, alsaLib ? null
, bluraySupport ? true, libbluray ? null
, bs2bSupport ? true, libbs2b ? null
@@ -134,7 +139,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
ffmpeg_4 freetype libass libpthreadstubs
- lua luasocket libuchardet
+ lua luasocket libuchardet mujs
] ++ optional alsaSupport alsaLib
++ optional archiveSupport libarchive
++ optional bluraySupport libbluray
@@ -163,6 +168,7 @@ in stdenv.mkDerivation rec {
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ]
+ ++ optionals vulkanSupport [ shaderc vulkan-headers vulkan-loader ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation Cocoa CoreAudio
]);
@@ -176,7 +182,7 @@ in stdenv.mkDerivation rec {
'';
# Ensure youtube-dl is available in $PATH for mpv
- wrapperFlags =
+ wrapperFlags =
let
getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" +
"${luasocket}/share/lua/${lua.luaversion}/?.${type}";
diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix
deleted file mode 100644
index a875daf065e9..000000000000
--- a/pkgs/applications/video/zdfmediathk/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, jre }:
-
-with stdenv;
-
-mkDerivation rec {
-
- version = "10";
- name = "zdfmediathk-${version}";
- src = fetchurl {
- url = "https://github.com/xaverW/MediathekView/archive/Version${version}.tar.gz";
- sha256 = "12iyigqjslbn8rzym1mq1s0mvss7r97aiy6wfdrq5m0psarlcljw";
- };
-
- installPhase = ''
- mkdir -p $out/{lib,bin,share/{doc,licenses}}
- cd dist/
- install -m644 MediathekView.jar $out/
- install -m644 -t $out/lib lib/*
- install -m755 bin/flv.sh $out/bin/
- install -m644 -t $out/share/doc Anleitung/*.pdf
- install -m644 -t $out/share/licenses Copyright/{*.*,_copyright}
- bin="$out/bin/mediathek"
- cat >> "$bin" << EOF
- #!/bin/sh
- exec ${jre}/bin/java -cp "$out/lib/*" -Xms128M -Xmx1G -jar "$out/MediathekView.jar" "\$@"
- EOF
- chmod +x "$bin"
- '';
-
- meta = with stdenv.lib; {
- description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
- homepage = https://github.com/xaverW/MediathekView/;
- license = licenses.gpl3;
- maintainers = [ maintainers.flosse ];
- platforms = platforms.all;
- };
-
-}
diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix
index 8b590cff9640..4499fff4dc8b 100644
--- a/pkgs/applications/virtualization/dynamips/default.nix
+++ b/pkgs/applications/virtualization/dynamips/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dynamips";
- version = "0.2.18";
+ version = "0.2.19";
src = fetchFromGitHub {
owner = "GNS3";
repo = pname;
rev = "v${version}";
- sha256 = "1jrwvrpl61rqbjjphv8v7ryhdwfjrpps76dbvkpl43hpn5hqqis2";
+ sha256 = "0x63m37vjyp57900x09gfvw02cwg85b33918x7fjj9x37wgmi5qf";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index b3a4b774b121..83ff846db7ab 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -544,14 +544,19 @@ rec {
buildInputs = [ jshon pigz coreutils findutils jq ];
# Image name and tag must be lowercase
imageName = lib.toLower name;
- imageTag = if tag == null then "" else lib.toLower tag;
baseJson = configJson;
+ passthru.imageTag =
+ if tag == null
+ then lib.head (lib.splitString "-" (lib.last (lib.splitString "/" result)))
+ else lib.toLower tag;
} ''
- ${lib.optionalString (tag == null) ''
+ ${if (tag == null) then ''
outName="$(basename "$out")"
outHash=$(echo "$outName" | cut -d - -f 1)
imageTag=$outHash
+ '' else ''
+ imageTag="${tag}"
''}
find ${bulkLayers} -mindepth 1 -maxdepth 1 | sort -t/ -k5 -n > layer-list
diff --git a/pkgs/data/themes/ant-theme/default.nix b/pkgs/data/themes/ant-theme/default.nix
index 8c4c865ef4ae..8ff869bc7aaa 100644
--- a/pkgs/data/themes/ant-theme/default.nix
+++ b/pkgs/data/themes/ant-theme/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ant-theme";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
url = "https://github.com/EliverLara/Ant/releases/download/v${version}/Ant.tar";
- sha256 = "15751pnb94g2wi6y932l3d7ksaz18402zbzp3l7ryy0lqwjnqvkj";
+ sha256 = "1r795v96ywzcb4dq08q2fdbmfia32g36cc512mhy41s8fb1a47dz";
};
propagatedUserEnvPkgs = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "1fzy7bq5v9fzjpfxplvk0nwjgamcva83462gkz01lhr1mipb92h1";
+ outputHash = "1gpacrmi5y87shp39jgy78n0ca2xdpvbqfh0mgldlxx99ca9rvvy";
meta = with stdenv.lib; {
description = "A flat and light theme with a modern look";
diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix
index 305f59529479..af1ccd0a5829 100644
--- a/pkgs/data/themes/nordic-polar/default.nix
+++ b/pkgs/data/themes/nordic-polar/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "nordic-polar-${version}";
- version = "1.3.0";
+ version = "1.4.0";
srcs = [
(fetchurl {
url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz";
- sha256 = "1c5zgymkwd89fr680c49siwbkhfbay56iq9vlyqkj1dp0xnc528s";
+ sha256 = "0sw4m1njnxal1kkiipsvfg9ndzxsf9rxfba5vhwswyzk388264xa";
})
(fetchurl {
url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz";
- sha256 = "0nxzcgqzc42qvnhafranz6rwanqb4wzf9ychm5m4yrlp3ngw38p4";
+ sha256 = "0ix0x0pnhfd1lrfj7a7n8xfg8vvzg7m0dzrsj8gzpav6wvwlypiy";
})
];
diff --git a/pkgs/misc/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
similarity index 60%
rename from pkgs/misc/themes/nordic/default.nix
rename to pkgs/data/themes/nordic/default.nix
index ac24e35c66f7..93df3c723dd5 100644
--- a/pkgs/misc/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -2,16 +2,24 @@
stdenv.mkDerivation rec {
name = "nordic-${version}";
- version = "1.3.0";
+ version = "1.5.4";
srcs = [
(fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz";
- sha256 = "04axs2yldppcx159nwj70g4cyw0hbbzk5250677i9ny8b0w3gr9x";
+ sha256 = "0m00hwr6ms9fzlpl97d972wvgq5l0m11mpn213248a8sqbh2zz9g";
+ })
+ (fetchurl {
+ url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue.tar.xz";
+ sha256 = "05k1m9f0q4mfaqp2as3ymjsqmyz0bs5cd576srd5v952dzxmmbm2";
})
(fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz";
- sha256 = "1h0690cijaipidb5if2bxhvvkrx5src3akyxvfywxg4bf8x7jxs5";
+ sha256 = "1qps13fpp8y83c25c51w7kyds266gmks8c7kjp23iybij2lkny1m";
+ })
+ (fetchurl {
+ url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue-standard-buttons.tar.xz";
+ sha256 = "1c0j6qsxa6zahrl9ad0q6pczgbmm8qn9qsd7k41yk2ndh9iqzr5y";
})
];
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 1e333e052b64..4d88f3b97729 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
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 51ff77758a5b..81f4ef3c7dba 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 51ff77758a5b..0263bdde8d28 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";
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index 1176d348d9d3..7ce7f9cefe51 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -8,30 +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 = ''
@@ -40,7 +42,14 @@ 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
+ '';
+
+ preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_BINDIR=$bin/bin"'';
+
enableParallelBuilding = true;
cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ];
@@ -48,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 ];
};
}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 96486ffd925f..901c4d387661 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -915,15 +915,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;
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index c7663a116763..918b2c2515e2 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,22 +1,22 @@
-{ 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)" ];
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;
};
diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/jdbc/default.nix
rename to pkgs/development/java-modules/postgresql_jdbc/default.nix
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 2cfa4b1d3cd6..e0cd1227f7ea 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, nv-codec-headers ? null # NVIDIA NVENC support
, callPackage # needed for NVENC to access external ffmpeg nvidia headers
@@ -139,7 +140,7 @@
* Darwin frameworks
*/
, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox
-, VideoDecodeAcceleration, CF
+, VideoDecodeAcceleration, cf-private
}:
/* Maintainer notes:
@@ -230,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
- version = "4.0.2";
+ version = "4.1";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
- sha256 = "15rgzcmdccy4flajs63gkz4n3k24wkkg50r13l1r83lrxg4hqp59";
+ sha256 = "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3";
};
prePatch = ''
@@ -355,7 +356,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")
@@ -408,7 +409,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
@@ -431,7 +432,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/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix
index b99c7240daec..f8343e668a67 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 ];
})
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index b470d45ba43f..9821357de3b9 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.1";
+ sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n";
darwinFrameworks = [ Cocoa CoreMedia ];
})
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 7ad5680c75cd..616394c6a084 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 = [
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 642063220b2c..6b7a58fa30d9 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
@@ -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 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734";
+ }
+ } || true
+ patch -p2 <${
+ fetchpatch {
+ url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff";
+ sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj";
+ }
+ }
'';
# - Unset CC and CXX as they confuse libtool.
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 8bfca47a3b44..62963283f937 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
@@ -88,7 +90,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
@@ -126,15 +133,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|"
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index f6ff7e758956..c7d7bfb1e824 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -2,22 +2,18 @@
stdenv.mkDerivation rec {
name = "libaom-${version}";
- version = "1.0.0";
+ version = "1.0.0-errata1";
src = fetchgit {
url = "https://aomedia.googlesource.com/aom";
rev = "v${version}";
- sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82";
+ sha256 = "090phh4jl9z6m2pwpfpwcjh6iyw0byngb2n112qxkg6a3gsaa62f";
};
nativeBuildInputs = [
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"
diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/psqlodbc/default.nix
rename to pkgs/development/libraries/psqlodbc/default.nix
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index 35dea57d4e62..995981d18edc 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 ca3cc096b1a2..3384ccf854e6 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"
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 000000000000..633daab7d4e3
--- /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/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix
new file mode 100644
index 000000000000..ed99686ed27b
--- /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/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix
new file mode 100644
index 000000000000..2bc4a5bbb616
--- /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/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix
new file mode 100644
index 000000000000..673a570c61f0
--- /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/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix
index d575c1b674b0..32d85cfadd71 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; {
diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix
index e6cd5a3482fe..005d61acab9b 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 ];
@@ -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 ];
};
diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
index bdf503cd8492..f41e7d146c97 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
diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix
index f25723e7ec72..9670428a3e5f 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;
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 000000000000..b2196c8748ce
--- /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/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix
new file mode 100644
index 000000000000..d7fb8a917076
--- /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/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix
new file mode 100644
index 000000000000..b0fe0f8a2544
--- /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/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix
new file mode 100644
index 000000000000..098d9f3e06d8
--- /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/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix
new file mode 100644
index 000000000000..daf9d0062fb2
--- /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/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index 0721c0d449c7..c5be26bd9b73 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 ];
};
}
diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix
new file mode 100644
index 000000000000..596fa6b825fc
--- /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/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index fd841563005e..cde0b90d6fe9 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 = ''
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index a59b452b432b..fbb7eca0ef51 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -7,15 +7,16 @@ 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";
+ # (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";
};
nativeBuildInputs = [ makeWrapper ];
@@ -24,6 +25,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}
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index be85213b8c20..b1bb5708d44a 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 {
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index d5559768d6fc..8c1b55fc5c9a 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
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 17938ab47b37..96e044073259 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 000000000000..60a205828f5d
--- /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)
diff --git a/pkgs/games/spring/fix-certs.patch b/pkgs/games/spring/fix-certs.patch
new file mode 100644
index 000000000000..b31160a05cc6
--- /dev/null
+++ b/pkgs/games/spring/fix-certs.patch
@@ -0,0 +1,11 @@
+--- a/src/downloader/lib/src/Downloader/CurlWrapper.cpp
++++ b/src/downloader/lib/src/Downloader/CurlWrapper.cpp
+@@ -108,7 +108,6 @@
+ if (res != CURLE_OK) {
+ LOG_WARN("Error setting CURLOPT_CAPATH: %d", res);
+ }
+- return;
+ }
+
+ const std::string cafile = GetCAFilePath();
+
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index fa7fad3ecd92..8df4450d13d1 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure
];
- patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed
+ patches = [ ./revert_58b423e.patch ./fix-certs.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed
enableParallelBuilding = true;
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index febdd94e1198..9a29ba82dae6 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -19,18 +19,21 @@
self: super: {
vim2nix = buildVimPluginFrom2Nix {
- name = "vim2nix";
+ pname = "vim2nix";
+ version = "1.0";
src = ./vim2nix;
dependencies = with super; [ vim-addon-manager ];
};
fzfWrapper = buildVimPluginFrom2Nix {
- name = fzf.name;
+ pname = "fzf";
+ version = fzf.version;
src = fzf.src;
};
skim = buildVimPluginFrom2Nix {
- name = skim.name;
+ pname = "skim";
+ version = skim.version;
src = skim.vim;
};
@@ -54,7 +57,8 @@ self: super: {
'';
};
in buildVimPluginFrom2Nix {
- name = "LanguageClient-neovim-2018-09-07";
+ pname = "LanguageClient-neovim";
+ version = "2018-09-07";
src = LanguageClient-neovim-src;
propogatedBuildInputs = [ LanguageClient-neovim-bin ];
@@ -67,7 +71,8 @@ self: super: {
# do not auto-update this one, as the name clashes with vim-snippets
vim-docbk-snippets = buildVimPluginFrom2Nix {
- name = "vim-docbk-snippets-2017-11-02";
+ pname = "vim-docbk-snippets";
+ version = "2017-11-02";
src = fetchgit {
url = "https://github.com/jhradilek/vim-snippets";
rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index c9cf12912670..2ced9c6094ec 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "alsa-utils-${version}";
- version = "1.1.7";
+ version = "1.1.8";
src = fetchurl {
url = "mirror://alsa/utils/${name}.tar.bz2";
- sha256 = "02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx";
+ sha256 = "1kx45yhrxai3k595yyqs4wj0p2n5b0c9mf0k36ljjf1bj8lgb6zx";
};
patchPhase = ''
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 1466b51b2616..ddd1e9828d51 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -688,6 +688,14 @@ let
HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
+ # Enable memory hotplug support
+ # Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot
+ ACPI_HOTPLUG_MEMORY = yes;
+ MEMORY_HOTPLUG = yes;
+ MEMORY_HOTREMOVE = yes;
+ MIGRATION = yes;
+ SPARSEMEM = yes;
+
# Bump the maximum number of CPUs to support systems like EC2 x1.*
# instances and Xeon Phi.
NR_CPUS = "384";
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index e92cd6175af1..b13c2cbee85d 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "rabbitmq-server-${version}";
- version = "3.7.9";
+ version = "3.7.10";
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz";
- sha256 = "138hz19g4x562vm7aqdsxc98ay0aidn37isafzhkig8cjlygg2iq";
+ sha256 = "03g9912640xxwwm078idrxqg8jwn3xc45lkyq5ixjqs0vhc7aw4v";
};
buildInputs =
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c28160b04a42..36f5bfe53078 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -21,7 +21,6 @@
"alarm_control_panel.egardia" = ps: with ps; [ ];
"alarm_control_panel.elkm1" = ps: with ps; [ ];
"alarm_control_panel.envisalink" = ps: with ps; [ ];
- "alarm_control_panel.homekit_controller" = ps: with ps; [ ];
"alarm_control_panel.homematicip_cloud" = ps: with ps; [ ];
"alarm_control_panel.ialarm" = ps: with ps; [ ];
"alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
@@ -118,7 +117,7 @@
"binary_sensor.iss" = ps: with ps; [ ];
"binary_sensor.isy994" = ps: with ps; [ ];
"binary_sensor.knx" = ps: with ps; [ ];
- "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors ];
+ "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
"binary_sensor.linode" = ps: with ps; [ linode-api ];
"binary_sensor.lupusec" = ps: with ps; [ ];
"binary_sensor.maxcube" = ps: with ps; [ ];
@@ -420,10 +419,6 @@
"emulated_hue" = ps: with ps; [ aiohttp-cors ];
"emulated_hue.hue_api" = ps: with ps; [ ];
"emulated_hue.upnp" = ps: with ps; [ ];
- "emulated_roku" = ps: with ps; [ ];
- "emulated_roku.binding" = ps: with ps; [ ];
- "emulated_roku.config_flow" = ps: with ps; [ ];
- "emulated_roku.const" = ps: with ps; [ ];
"enocean" = ps: with ps; [ ];
"envisalink" = ps: with ps; [ ];
"esphome" = ps: with ps; [ ];
@@ -517,7 +512,6 @@
"hue.config_flow" = ps: with ps; [ ];
"hue.const" = ps: with ps; [ ];
"hue.errors" = ps: with ps; [ ];
- "hue.light" = ps: with ps; [ aiohue ];
"hydrawise" = ps: with ps; [ ];
"idteck_prox" = ps: with ps; [ ];
"ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
@@ -556,7 +550,7 @@
"keyboard_remote" = ps: with ps; [ evdev ];
"kira" = ps: with ps; [ ];
"knx" = ps: with ps; [ ];
- "konnected" = ps: with ps; [ aiohttp-cors ];
+ "konnected" = ps: with ps; [ aiohttp-cors netdisco ];
"lametric" = ps: with ps; [ ];
"lcn" = ps: with ps; [ ];
"lifx" = ps: with ps; [ ];
@@ -584,6 +578,7 @@
"light.homematic" = ps: with ps; [ pyhomematic ];
"light.homematicip_cloud" = ps: with ps; [ ];
"light.homeworks" = ps: with ps; [ ];
+ "light.hue" = ps: with ps; [ aiohue ];
"light.hyperion" = ps: with ps; [ ];
"light.iglo" = ps: with ps; [ ];
"light.ihc" = ps: with ps; [ defusedxml ];
@@ -718,6 +713,7 @@
"media_player.mpchc" = ps: with ps; [ ];
"media_player.mpd" = ps: with ps; [ mpd2 ];
"media_player.nad" = ps: with ps; [ ];
+ "media_player.nadtcp" = ps: with ps; [ ];
"media_player.onkyo" = ps: with ps; [ onkyo-eiscp ];
"media_player.openhome" = ps: with ps; [ ];
"media_player.panasonic_bluray" = ps: with ps; [ ];
@@ -1294,7 +1290,7 @@
"switch.isy994" = ps: with ps; [ ];
"switch.kankun" = ps: with ps; [ ];
"switch.knx" = ps: with ps; [ ];
- "switch.konnected" = ps: with ps; [ aiohttp-cors ];
+ "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
"switch.lightwave" = ps: with ps; [ ];
"switch.linode" = ps: with ps; [ linode-api ];
"switch.litejet" = ps: with ps; [ ];
@@ -1462,7 +1458,6 @@
"zabbix" = ps: with ps; [ ];
"zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
"zha" = ps: with ps; [ ];
- "zha.api" = ps: with ps; [ ];
"zha.config_flow" = ps: with ps; [ ];
"zha.const" = ps: with ps; [ ];
"zha.entities" = ps: with ps; [ ];
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index b8c06d5ec2f5..2b22c36e829f 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -48,10 +48,10 @@ let
] ++ lib.optionals icuEnabled [ "--with-icu" ];
patches =
- [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch)
- (if atLeast "9.6" then ./less-is-more-96.patch else ./less-is-more.patch)
- (if atLeast "9.6" then ./hardcode-pgxs-path-96.patch else ./hardcode-pgxs-path.patch)
- ./specify_pkglibdir_at_runtime.patch
+ [ (if atLeast "9.4" then ./patches/disable-resolve_symlinks-94.patch else ./patches/disable-resolve_symlinks.patch)
+ (if atLeast "9.6" then ./patches/less-is-more-96.patch else ./patches/less-is-more.patch)
+ (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch)
+ ./patches/specify_pkglibdir_at_runtime.patch
];
installTargets = [ "install-world" ];
diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/cstore_fdw/default.nix
rename to pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
diff --git a/pkgs/servers/sql/postgresql/pg_cron/default.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/pg_cron/default.nix
rename to pkgs/servers/sql/postgresql/ext/pg_cron.nix
diff --git a/pkgs/servers/sql/postgresql/pg_hll/default.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/pg_hll/default.nix
rename to pkgs/servers/sql/postgresql/ext/pg_hll.nix
diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/pg_repack/default.nix
rename to pkgs/servers/sql/postgresql/ext/pg_repack.nix
diff --git a/pkgs/servers/sql/postgresql/pg_similarity/default.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/pg_similarity/default.nix
rename to pkgs/servers/sql/postgresql/ext/pg_similarity.nix
diff --git a/pkgs/servers/sql/postgresql/topn/default.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/topn/default.nix
rename to pkgs/servers/sql/postgresql/ext/pg_topn.nix
diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/pgjwt/default.nix
rename to pkgs/servers/sql/postgresql/ext/pgjwt.nix
diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/pgroonga/default.nix
rename to pkgs/servers/sql/postgresql/ext/pgroonga.nix
diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/pgtap/default.nix
rename to pkgs/servers/sql/postgresql/ext/pgtap.nix
diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/plv8/default.nix
rename to pkgs/servers/sql/postgresql/ext/plv8.nix
diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/timescaledb/default.nix
rename to pkgs/servers/sql/postgresql/ext/timescaledb.nix
diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/tsearch_extras/default.nix
rename to pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch
rename to pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch
diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch
rename to pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch
diff --git a/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch
rename to pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch
diff --git a/pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch
rename to pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch
diff --git a/pkgs/servers/sql/postgresql/less-is-more-96.patch b/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/less-is-more-96.patch
rename to pkgs/servers/sql/postgresql/patches/less-is-more-96.patch
diff --git a/pkgs/servers/sql/postgresql/less-is-more.patch b/pkgs/servers/sql/postgresql/patches/less-is-more.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/less-is-more.patch
rename to pkgs/servers/sql/postgresql/patches/less-is-more.patch
diff --git a/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch b/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch
rename to pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch
diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix
new file mode 100644
index 000000000000..a718ea557469
--- /dev/null
+++ b/pkgs/tools/audio/google-music-scripts/default.nix
@@ -0,0 +1,32 @@
+{ lib, python3 }:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "google-music-scripts";
+ version = "3.0.0";
+
+ src = python3.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "12risivi11z3shrgs1kpi7x6lvk113cbp3dnczw9mmqhb4mmwviy";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [
+ appdirs
+ audio-metadata
+ click
+ click-default-group
+ google-music
+ google-music-utils
+ logzero
+ tomlkit
+ ];
+
+ # No tests
+ doCheck = false;
+
+ meta = with lib; {
+ homepage = https://github.com/thebigmunch/google-music-scripts;
+ description = "A CLI utility for interacting with Google Music";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jakewaksbaum ];
+ };
+}
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index df5a9e80f38a..0a3ae5c28e97 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [
];
in stdenv.mkDerivation rec {
name = "debootstrap-${version}";
- version = "1.0.112";
+ version = "1.0.114";
src = fetchurl {
# git clone git://git.debian.org/d-i/debootstrap.git
# I'd like to use the source. However it's lacking the lanny script ? (still true?)
url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
- sha256 = "1p7skj8821dhwgjq3f2v1fplzv5y6xfma6bh9ai6f8ry6vz0hvha";
+ sha256 = "14lw18bhxap1g15q0rhslacj1bcrl69wrqcx6azmbvd92rl4bqd8";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 23cbfd3428fe..dd210498fe75 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchurl, buildPythonPackage
-, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
+, zip, ffmpeg_4, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
, fetchpatch
# Pandoc is required to build the package's man page. Release tarballs contain a
# formatted man page already, though, it will still be installed. We keep the
@@ -37,7 +37,7 @@ buildPythonPackage rec {
makeWrapperArgs = let
packagesToBinPath =
[ atomicparsley ]
- ++ lib.optional ffmpegSupport ffmpeg
+ ++ lib.optional ffmpegSupport ffmpeg_4
++ lib.optional rtmpSupport rtmpdump
++ lib.optional phantomjsSupport phantomjs2;
in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];
diff --git a/pkgs/tools/networking/curl/7_59.nix b/pkgs/tools/networking/curl/7_59.nix
deleted file mode 100644
index 272c38a99586..000000000000
--- a/pkgs/tools/networking/curl/7_59.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ stdenv, lib, fetchurl, pkgconfig, perl
-, http2Support ? true, nghttp2
-, idnSupport ? false, libidn ? null
-, ldapSupport ? false, openldap ? null
-, zlibSupport ? true, zlib ? null
-, sslSupport ? zlibSupport, openssl ? null
-, gnutlsSupport ? false, gnutls ? null
-, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null
-, gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null
-, c-aresSupport ? false, c-ares ? null
-, brotliSupport ? false, brotli ? null
-}:
-
-assert http2Support -> nghttp2 != null;
-assert idnSupport -> libidn != null;
-assert ldapSupport -> openldap != null;
-assert zlibSupport -> zlib != null;
-assert sslSupport -> openssl != null;
-assert !(gnutlsSupport && sslSupport);
-assert gnutlsSupport -> gnutls != null;
-assert scpSupport -> libssh2 != null;
-assert c-aresSupport -> c-ares != null;
-assert brotliSupport -> brotli != null;
-assert gssSupport -> libkrb5 != null;
-
-stdenv.mkDerivation rec {
- name = "curl-7.59.0";
-
- src = fetchurl {
- urls = [
- "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
- "https://curl.haxx.se/download/${name}.tar.bz2"
- ];
- sha256 = "185mazhi4bc5mc6rvhrmnc67j8l3sg7f0w2hp5gmi5ccdbyhz4mm";
- };
-
- outputs = [ "bin" "dev" "out" "man" "devdoc" ];
- separateDebugInfo = stdenv.isLinux;
-
- enableParallelBuilding = true;
-
- nativeBuildInputs = [ pkgconfig perl ];
-
- # Zlib and OpenSSL must be propagated because `libcurl.la' contains
- # "-lz -lssl", which aren't necessary direct build inputs of
- # applications that use Curl.
- propagatedBuildInputs = with stdenv.lib;
- optional http2Support nghttp2 ++
- optional idnSupport libidn ++
- optional ldapSupport openldap ++
- optional zlibSupport zlib ++
- optional gssSupport libkrb5 ++
- optional c-aresSupport c-ares ++
- optional sslSupport openssl ++
- optional gnutlsSupport gnutls ++
- optional scpSupport libssh2 ++
- optional brotliSupport brotli;
-
- # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html
- preConfigure = ''
- sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
- rm src/tool_hugehelp.c
- '';
-
- configureFlags = [
- "--with-ca-fallback"
- "--disable-manual"
- ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" )
- ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" )
- ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" )
- ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )
- ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" )
- ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" )
- ( if brotliSupport then "--with-brotli" else "--without-brotli" )
- ]
- ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
- ++ stdenv.lib.optional gssSupport "--with-gssapi=${libkrb5.dev}"
- # For the 'urandom', maybe it should be a cross-system option
- ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
- "--with-random=/dev/urandom"
- ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [
- "--disable-shared"
- "--enable-static"
- ];
-
- CXX = "${stdenv.cc.targetPrefix}c++";
- CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
-
- doCheck = false; # expensive, fails
-
- postInstall = ''
- moveToOutput bin/curl-config "$dev"
- sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
- '' + stdenv.lib.optionalString gnutlsSupport ''
- ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so
- ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4
- ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
- '';
-
- passthru = {
- inherit sslSupport openssl;
- };
-
- meta = with stdenv.lib; {
- description = "A command line tool for transferring files with URL syntax";
- homepage = https://curl.haxx.se/;
- maintainers = with maintainers; [ lovek323 ];
- license = licenses.curl;
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix
index 75e380a6b661..69fce7a109cc 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/pkgs/tools/text/discount/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "2.2.4";
@@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
patches = ./fix-configure-path.patch;
configureScript = "./configure.sh";
+ configureFlags = [
+ "--enable-all-features"
+ "--pkg-config"
+ "--shared"
+ "--with-fenced-code"
+ ];
+
meta = with stdenv.lib; {
description = "Implementation of Markdown markup language in C";
homepage = http://www.pell.portland.or.us/~orc/Code/discount/;
diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index 1ff804f0d4a4..55bcf449a2d1 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "scdoc-${version}";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchurl {
url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";
- sha256 = "1ca3js4arkg28gg2iszxxyrq7kgsrz482d1szv5dfd471h3vr5m3";
+ sha256 = "16wp3plxbdzb3jvshdwvyjnskvk34bz4s6fc8vsz5hffkmxm7vdq";
};
postPatch = ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 186260c0f688..e13e9adfa165 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -271,6 +271,7 @@ mapAliases ({
saneBackends = sane-backends; # added 2016-01-02
saneBackendsGit = sane-backends-git; # added 2016-01-02
saneFrontends = sane-frontends; # added 2016-01-02
+ sapic = throw "deprecated 2019-1-19: sapic is bundled with 'tamarin-prover' now";
scim = sc-im; # added 2016-01-22
scollector = bosun; # added 2018-04-25
shared_mime_info = shared-mime-info; # added 2018-02-25
@@ -341,6 +342,7 @@ mapAliases ({
xlibs = xorg; # added 2015-09
xpraGtk3 = xpra; # added 2018-09-13
youtubeDL = youtube-dl; # added 2014-10-26
+ zdfmediathk = mediathekview; # added 2019-01-19
# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
# branch-off
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2797cea19e34..adddd7863591 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -419,7 +419,7 @@ in
findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
wrapGAppsHook = makeSetupHook {
- deps = [ gnome3.dconf.lib gnome3.gtk librsvg makeWrapper ];
+ deps = lib.optional (!stdenv.isDarwin) gnome3.dconf.lib ++ [ gtk3 librsvg makeWrapper ];
} ../build-support/setup-hooks/wrap-gapps-hook.sh;
separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
@@ -2171,10 +2171,6 @@ in
brotliSupport = true;
};
- curl_7_59 = callPackage ../tools/networking/curl/7_59.nix rec {
- fetchurl = fetchurlBoot;
- };
-
curl = callPackage ../tools/networking/curl rec {
fetchurl = fetchurlBoot;
};
@@ -3048,6 +3044,8 @@ in
google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { };
+ google-music-scripts = callPackage ../tools/audio/google-music-scripts { };
+
gource = callPackage ../applications/version-management/gource { };
govc = callPackage ../tools/virtualization/govc { };
@@ -3215,17 +3213,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 { };
@@ -5421,9 +5438,7 @@ in
sieve-connect = callPackage ../applications/networking/sieve-connect {};
- sigal = callPackage ../applications/misc/sigal {
- inherit (pythonPackages) buildPythonApplication fetchPypi;
- };
+ sigal = callPackage ../applications/misc/sigal { };
sigil = libsForQt5.callPackage ../applications/editors/sigil { };
@@ -5992,6 +6007,8 @@ in
vampire = callPackage ../applications/science/logic/vampire {};
+ vdmfec = callPackage ../applications/backup/vdmfec {};
+
vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {};
volatility = callPackage ../tools/security/volatility { };
@@ -7066,7 +7083,7 @@ in
tamarin-prover =
(haskellPackages.callPackage ../applications/science/logic/tamarin-prover {
# NOTE: do not use the haskell packages 'graphviz' and 'maude'
- inherit maude which sapic;
+ inherit maude which;
graphviz = graphviz-nox;
});
@@ -9752,7 +9769,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;
@@ -11984,18 +12001,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 {};
@@ -13937,7 +13942,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;
@@ -13977,7 +13982,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 { };
@@ -15712,6 +15717,8 @@ in
nafees = callPackage ../data/fonts/nafees { };
+ nordic = callPackage ../data/themes/nordic { };
+
nordic-polar = callPackage ../data/themes/nordic-polar { };
inherit (callPackages ../data/fonts/noto-fonts {})
@@ -17929,11 +17936,9 @@ in
kubeval = callPackage ../applications/networking/cluster/kubeval { };
- kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
+ kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
- kubectl = (kubernetes.override { components = [ "cmd/kubectl" ]; }).overrideAttrs(oldAttrs: {
- name = "kubectl-${oldAttrs.version}";
- });
+ kubectl = callPackage ../applications/networking/cluster/kubectl { };
kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
@@ -18147,7 +18152,9 @@ in
mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
- mediathekview = callPackage ../applications/video/mediathekview { };
+ # mediathekview needs JavaFX, which currently only is available inside OracleJRE
+ # we might be able to get rid of it, as soon as we have an OpenJRE with OpenJFX included
+ mediathekview = callPackage ../applications/video/mediathekview { jre = oraclejre; };
meteo = callPackage ../applications/networking/weather/meteo { };
@@ -18358,6 +18365,8 @@ in
x11Support = !stdenv.isDarwin;
xineramaSupport = !stdenv.isDarwin;
xvSupport = !stdenv.isDarwin;
+ # Use docutils from python3 to avoid python2 in the closure
+ inherit (python3Packages) docutils;
};
mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { };
@@ -19615,8 +19624,6 @@ in
fftw = fftwSinglePrec;
};
- timescaledb = callPackage ../servers/sql/postgresql/timescaledb {};
-
timewarrior = callPackage ../applications/misc/timewarrior { };
timidity = callPackage ../tools/misc/timidity { };
@@ -19702,8 +19709,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 { };
@@ -21333,8 +21338,6 @@ in
gnome-themes-extra = gnome3.gnome-themes-extra;
- nordic = callPackage ../misc/themes/nordic { };
-
numix-gtk-theme = callPackage ../misc/themes/numix { };
numix-solarized-gtk-theme = callPackage ../misc/themes/numix-solarized { };
@@ -21397,6 +21400,8 @@ in
jmol = callPackage ../applications/science/chemistry/jmol { };
+ marvin = callPackage ../applications/science/chemistry/marvin { };
+
molden = callPackage ../applications/science/chemistry/molden { };
octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; };
@@ -21853,10 +21858,6 @@ in
proverif = callPackage ../applications/science/logic/proverif { };
- sapic = callPackage ../applications/science/logic/sapic {
- inherit (ocaml-ng.ocamlPackages_4_05) ocaml;
- };
-
satallax = callPackage ../applications/science/logic/satallax {
ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;
};
@@ -22466,7 +22467,6 @@ in
inherit (callPackages ../tools/package-management/nix {
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
- curl = curl_7_59;
boehmgc = boehmgc.override { enableLargeConfig = true; };
})
nix
@@ -23102,8 +23102,6 @@ in
zap = callPackage ../tools/networking/zap { };
- zdfmediathk = callPackage ../applications/video/zdfmediathk { };
-
zopfli = callPackage ../tools/compression/zopfli { };
myEnvFun = callPackage ../misc/my-env {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 194a9110339e..13f261031097 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -430,6 +430,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 { };
@@ -512,6 +514,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 { };
@@ -783,6 +787,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 { };
@@ -946,6 +952,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 { };
@@ -1009,6 +1017,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 {
@@ -1017,6 +1027,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 { };
@@ -1259,6 +1271,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 {};
@@ -1790,6 +1804,12 @@ 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 { };
+
gpapi = callPackage ../development/python-modules/gpapi { };
gplaycli = callPackage ../development/python-modules/gplaycli { };