Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2019-10-27 15:27:53 +01:00
commit bb05acabda
36 changed files with 1265 additions and 512 deletions

View File

@ -532,6 +532,7 @@ in {
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
add_header Referrer-Policy no-referrer;
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
error_page 403 /core/templates/403.php;
error_page 404 /core/templates/404.php;
client_max_body_size ${cfg.maxUploadSize};

View File

@ -1,56 +0,0 @@
{ stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest
, liblastfm, lucenepp, phonon, phonon-backend-vlc, qca2, qjson, qt4
, qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper
, enableXMPP ? true, libjreen ? null
, enableKDE ? false, kdelibs4 ? null
, enableTelepathy ? false, telepathy-qt ? null
}:
assert enableXMPP -> libjreen != null;
assert enableKDE -> kdelibs4 != null;
assert enableTelepathy -> telepathy-qt != null;
stdenv.mkDerivation rec {
pname = "tomahawk";
version = "0.8.4";
src = fetchurl {
url = "http://download.tomahawk-player.org/${pname}-${version}.tar.bz2";
sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g";
};
cmakeFlags = [
"-DLUCENEPP_INCLUDE_DIR=${lucenepp}/include"
"-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib"
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
cmake attica boost gnutls libechonest liblastfm lucenepp phonon
qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp
makeWrapper
] ++ stdenv.lib.optional enableXMPP libjreen
++ stdenv.lib.optional enableKDE kdelibs4
++ stdenv.lib.optional enableTelepathy telepathy-qt;
postInstall = let
pluginPath = stdenv.lib.concatStringsSep ":" [
"${phonon-backend-vlc}/lib/kde4/plugins"
];
in ''
for i in "$out"/bin/*; do
wrapProgram "$i" --prefix QT_PLUGIN_PATH : "${pluginPath}"
done
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A multi-source music player (unmaintained)";
homepage = http://tomahawk-player.org/;
license = licenses.gpl3Plus;
platforms = platforms.all;
broken = true; # 2018-06-25
};
}

View File

@ -7,16 +7,11 @@ let
name = "glfw-git-${version}";
version = "2019-06-30";
src = fetchFromGitHub {
owner = "AndrewBelt";
owner = "glfw";
repo = "glfw";
rev = "d9ab59efc781c392128a449361a381fcc93cf6f3";
sha256 = "1ykkq6qq8y6j5hlfj2zp1p87kr33vwhywziprz20v5avx1q7rjm8";
rev = "d25248343e248337284dfbe5ecd1eddbd37ae66d";
sha256 = "0gbz353bfmqbpm0af2nqf5draz3k4f3lqwiqj68s8nwn7878aqm3";
};
# We patch the source to export a function that was added to the glfw fork
# for Rack so it is present when we build glfw as a shared library.
# See https://github.com/AndrewBelt/glfw/pull/1 for discussion of this issue
# with upstream.
patches = [ ./glfw.patch ];
buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ];
});
pfft-source = fetchFromBitbucket {
@ -25,6 +20,30 @@ let
rev = "29e4f76ac53bef048938754f32231d7836401f79";
sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1";
};
nanovg-source = fetchFromGitHub {
owner = "memononen";
repo = "nanovg";
rev = "1f9c8864fc556a1be4d4bf1d6bfe20cde25734b4";
sha256 = "08r15zrr6p1kxigxzxrg5rgya7wwbdx7d078r362qbkmws83wk27";
};
nanosvg-source = fetchFromGitHub {
owner = "memononen";
repo = "nanosvg";
rev = "25241c5a8f8451d41ab1b02ab2d865b01600d949";
sha256 = "114qgfmazsdl53rm4pgqif3gv8msdmfwi91lyc2jfadgzfd83xkg";
};
osdialog-source = fetchFromGitHub {
owner = "AndrewBelt";
repo = "osdialog";
rev = "e5db5de6444f4b2c4e1390c67b3efd718080c3da";
sha256 = "0iqxn1md053nl19hbjk8rqsdcmjwa5l5z0ci4fara77q43rc323i";
};
oui-blendish-source = fetchFromGitHub {
owner = "AndrewBelt";
repo = "oui-blendish";
rev = "79ec59e6bc7201017fc13a20c6e33380adca1660";
sha256 = "17kd0lh2x3x12bxkyhq6z8sg6vxln8m9qirf0basvcsmylr6rb64";
};
in
with stdenv.lib; stdenv.mkDerivation rec {
pname = "VCV-Rack";
@ -34,17 +53,26 @@ with stdenv.lib; stdenv.mkDerivation rec {
owner = "VCVRack";
repo = "Rack";
rev = "v${version}";
sha256 = "172v66v2vb6l9dpsq6fb6xn035igwhpjci8w3kz2na3rvmz1bc5w";
fetchSubmodules = true;
sha256 = "1g3mkghgiycbxyvzjhanc1b10jynkfkw03bpnha06qgd6gd9wv7k";
};
patches = [ ./rack-minimize-vendoring.patch ];
patches = [
./rack-minimize-vendoring.patch
# We patch out a call to a custom function, that is not needed on Linux.
# This avoids needing a patched version of glfw. The version we previously used disappeared
# on GitHub. See https://github.com/NixOS/nixpkgs/issues/71189
./remove-custom-glfw-function.patch
];
prePatch = ''
cp -r ${pfft-source} dep/jpommier-pffft-source
mkdir -p dep/include
cp -r ${pfft-source} dep/jpommier-pffft-source
cp -r ${nanovg-source}/* dep/nanovg
cp -r ${nanosvg-source}/* dep/nanosvg
cp -r ${osdialog-source}/* dep/osdialog
cp -r ${oui-blendish-source}/* dep/oui-blendish
cp dep/jpommier-pffft-source/*.h dep/include
cp dep/nanosvg/**/*.h dep/include
cp dep/nanovg/src/*.h dep/include

View File

@ -1,13 +0,0 @@
diff --git a/src/init.c b/src/init.c
index af4a579e..317e25b8 100644
--- a/src/init.c
+++ b/src/init.c
@@ -339,7 +339,7 @@ GLFWAPI GLFWerrorfun glfwSetErrorCallback(GLFWerrorfun cbfun)
char glfwOpenedFilename[1024];
-const char *glfwGetOpenedFilename()
+GLFWAPI const char *glfwGetOpenedFilename()
{
if (glfwOpenedFilename[0])
{

View File

@ -0,0 +1,16 @@
diff --git a/src/main.cpp b/src/main.cpp
index 0954ae6..a8299f7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -162,11 +162,6 @@ int main(int argc, char* argv[]) {
INFO("Initializing app");
appInit();
- const char* openedFilename = glfwGetOpenedFilename();
- if (openedFilename) {
- patchPath = openedFilename;
- }
-
if (!settings::headless) {
APP->patch->init(patchPath);
}

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "jormungandr";
version = "0.7.0-alpha.dev.1";
version = "0.7.0-rc1";
src = fetchgit {
url = "https://github.com/input-output-hk/${pname}";
rev = "v${version}";
sha256 = "0r3icx42glrpa68sjxz4gr0z5660gh4n79lncy720s04cmgjcjci";
sha256 = "02ihnq7b32rwx7ychrj76rin1z3s9np5yjylppxm0qp5sjkik9ff";
fetchSubmodules = true;
};
cargoSha256 = "0f9b2lr2xxlcn9j33b5ahzbndz6sjm8ybhqm472bv5hzisqm4lg4";
cargoSha256 = "1pp829azj6aw68ba637rm852sj61nxznxfzrlqs9ds6adk9h7abs";
nativeBuildInputs = [ pkgconfig protobuf ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

View File

@ -32,13 +32,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "keepassxc";
version = "2.4.3";
version = "2.5.0";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac";
sha256 = "053z6mzcn22w3vkf09i7kdi5p0c6zcd9g62v3p5i3yhd14cgviqr";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [

View File

@ -64,6 +64,7 @@ in stdenv.mkDerivation rec {
EOF
moveToOutput "bin" "$bin"
ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"
mkdir -p $bin/share/applications
cat > $bin/share/applications/mupdf.desktop <<EOF
[Desktop Entry]

View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "rclone";
version = "1.49.5";
version = "1.50.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0firfb2300grfp5fnqaifhp346m4d0x8r1xshs9d8r6jxb160n03";
sha256 = "0k4fybz4670cqg1rpx0c1ximf1x6yl1f788hx9raxkwp5wv703kw";
};
goPackagePath = "github.com/rclone/rclone";

View File

@ -1,16 +1,17 @@
{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, itk, fftwFloat, gsl }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk, fftwFloat, gsl }:
stdenv.mkDerivation rec { pname = "EZminc";
name = "${pname}-2017-08-29";
stdenv.mkDerivation rec {
pname = "EZminc";
name = "${pname}-unstable-2019-07-25";
src = fetchFromGitHub {
owner = "BIC-MNI";
repo = pname;
rev = "4e017236cb6e7f6e07507446b18b759c584b6fc3";
sha256 = "1pg06x42pgsg7zy7dz9wf6ajakkm2n8by64lg9z64qi8qqy82b8v";
rev = "9591edd5389a5bda2c1f606816c7cdb35c065adf";
sha256 = "02k87qbpx0f48l2lbcjmlqx82py684z3sfi29va5icfg3hjd6j7b";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ itk libminc bicpl fftwFloat gsl ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/"
@ -26,6 +27,5 @@ stdenv.mkDerivation rec { pname = "EZminc";
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix;
license = licenses.free;
broken = true;
};
}

View File

@ -1,40 +1,40 @@
{ stdenv, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
{ stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype
, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2
, linuxHeaders, fetchpatch
, perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders
, libXNVCtrl, enableXnvctrl ? false
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "mythtv";
version = "29.1";
version = "30.0";
src = fetchFromGitHub {
owner = "MythTV";
repo = "mythtv";
rev = "v${version}";
sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x";
sha256 = "1pfzjb07xwd3mfgmbr4kkiyfyvwy9fkl13ik7bvqds86m0ws5bw4";
};
patches = [
# Fixes build with exiv2 0.27.1.
(fetchpatch {
name = "004-exiv2.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946";
sha256 = "0mh542f53qgky0w3s2bv0gmcxzvmb10834z3cfff40fby2ffr6k8";
})
./exiv2.patch
# Disables OS detection used while checking for xnvctrl support.
./disable-os-detection.patch
];
setSourceRoot = ''sourceRoot=$(echo */mythtv)'';
buildInputs = [
freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined
perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2
];
] ++ stdenv.lib.optional enableXnvctrl libXNVCtrl;
nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ];
configureFlags = [ "--dvb-path=${linuxHeaders}/include" ];
configureFlags =
[ "--dvb-path=${linuxHeaders}/include" ]
++ stdenv.lib.optionals (!enableXnvctrl) [ "--disable-xnvctrl" ];
meta = with stdenv.lib; {
homepage = https://www.mythtv.org/;

View File

@ -0,0 +1,51 @@
--- a/configure 1970-01-01 01:00:01.000000000 +0100
+++ b/configure 2019-10-26 11:54:01.920776490 +0200
@@ -6642,29 +6642,29 @@
require libXinerama X11/extensions/Xinerama.h XineramaQueryExtension -lXinerama
require libXext "X11/Xdefs.h X11/Xlib.h X11/extensions/Xext.h" XMissingExtension -lXext
if enabled xnvctrl; then
- case $target_os in
- linux)
+# case $target_os in
+# linux)
# Bah. Suse linux doesn't have xnvctrl.
- . /etc/os-release
- case $ID in
- *suse*)
+# . /etc/os-release
+# case $ID in
+# *suse*)
# This is hopefully temporary.
- disable xnvctrl_external
- ;;
- *)
- require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
- ;;
- esac
- ;;
- freebsd)
+# disable xnvctrl_external
+# ;;
+# *)
+ require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
+# ;;
+# esac
+# ;;
+# freebsd)
# This is hopefully temporary, and will eventually
# check for a system library too.
- disable xnvctrl_external
- ;;
- *)
- disable xnvctrl
- ;;
- esac
+# disable xnvctrl_external
+# ;;
+# *)
+# disable xnvctrl
+# ;;
+# esac
fi
fi

View File

@ -0,0 +1,19 @@
Patch source: https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946
--- a/libs/libmythmetadata/imagemetadata.cpp
+++ b/libs/libmythmetadata/imagemetadata.cpp
@@ -7,14 +7,7 @@
#include "exitcodes.h" // for ffprobe
// libexiv2 for Exif metadata
-//#include <exiv2/exiv2.hpp>
-// Note: Older versions of Exiv2 don't have the exiv2.hpp include
-// file. Using image.hpp instead seems to work.
-#ifdef _MSC_VER
-#include <exiv2/src/image.hpp>
-#else
-#include <exiv2/image.hpp>
-#endif
+#include <exiv2/exiv2.hpp>
// To read FFMPEG Metadata
extern "C" {

View File

@ -78,9 +78,7 @@ let
elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples;
elm-language-server = nodePkgs."@elm-tooling/elm-language-server";
# elm-analyse@0.16.4 build is not working
elm-analyse = nodePkgs."elm-analyse-0.16.3";
inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref;
inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse;
};
patchBinwrap = import ./packages/patch-binwrap.nix { inherit lib writeScriptBin stdenv; };

View File

@ -3,7 +3,7 @@
"elm-verify-examples",
"elm-doc-preview",
"elm-upgrade",
{ "elm-analyse": "0.16.3" },
"elm-analyse",
"elm-live",
"elm-xref",
"@elm-tooling/elm-language-server"

View File

@ -76,13 +76,13 @@ let
sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
};
};
"@types/node-12.11.1" = {
"@types/node-12.11.2" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "12.11.1";
version = "12.11.2";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-12.11.1.tgz";
sha512 = "TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A==";
url = "https://registry.npmjs.org/@types/node/-/node-12.11.2.tgz";
sha512 = "dsfE4BHJkLQW+reOS6b17xhZ/6FB1rB8eRRvO08nn5o+voxf3i74tuyFWNH6djdfgX7Sm5s6LD8t6mJug4dpDw==";
};
};
"accepts-1.3.7" = {
@ -436,13 +436,13 @@ let
sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
};
};
"bser-2.1.0" = {
"bser-2.1.1" = {
name = "bser";
packageName = "bser";
version = "2.1.0";
version = "2.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz";
sha512 = "8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==";
url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz";
sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==";
};
};
"buffers-0.1.1" = {
@ -598,6 +598,15 @@ let
sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==";
};
};
"chokidar-3.2.1" = {
name = "chokidar";
packageName = "chokidar";
version = "3.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/chokidar/-/chokidar-3.2.1.tgz";
sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==";
};
};
"chownr-1.1.3" = {
name = "chownr";
packageName = "chownr";
@ -796,13 +805,13 @@ let
sha512 = "I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==";
};
};
"core-js-3.3.2" = {
"core-js-3.3.3" = {
name = "core-js";
packageName = "core-js";
version = "3.3.2";
version = "3.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/core-js/-/core-js-3.3.2.tgz";
sha512 = "S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg==";
url = "https://registry.npmjs.org/core-js/-/core-js-3.3.3.tgz";
sha512 = "0xmD4vUJRY8nfLyV9zcpC17FtSie5STXzw+HyYw2t8IIvmDnbq7RJUULECCo+NstpJtwK9kx8S+898iyqgeUow==";
};
};
"core-util-is-1.0.2" = {
@ -859,6 +868,15 @@ let
sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
};
};
"cross-spawn-7.0.0" = {
name = "cross-spawn";
packageName = "cross-spawn";
version = "7.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz";
sha512 = "6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw==";
};
};
"cross-spawn-7.0.1" = {
name = "cross-spawn";
packageName = "cross-spawn";
@ -1094,6 +1112,15 @@ let
sha512 = "O0Z3YsYU9OTb1hTDGORWxi69QjQFEIPfZVq/oc1D5lhL3swduHKY8vdKGuo+WlKVdTas99oNIsgL7yojWdYcsQ==";
};
};
"elmi-to-json-1.2.0" = {
name = "elmi-to-json";
packageName = "elmi-to-json";
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-1.2.0.tgz";
sha512 = "zNinzt6/YMr11HgeBlC9Z0UM3qHkYrGsWJTjrCmgBkKnaOLUzTP5K9N3z1RltyunItXtHAxb8DFPvMxlYRPv/Q==";
};
};
"emoji-regex-7.0.3" = {
name = "emoji-regex";
packageName = "emoji-regex";
@ -1427,6 +1454,15 @@ let
sha512 = "KBxPjc7J1CLw90jVateMKvMYMROZRTR7/QT2I3MxT+7I6KuUQUMNUFuS/eQXQnMnyElGKQ1iyPbe7GnEuYnFXw==";
};
};
"find-elm-dependencies-2.0.2" = {
name = "find-elm-dependencies";
packageName = "find-elm-dependencies";
version = "2.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-2.0.2.tgz";
sha512 = "nM5UCbccD1G8CGK2GsM7ykG3ksOAl9E+34jiDfl07CAl2OPnLpBVWY2hlxEmIkSBfdJjSopEowWHrO0cI8RhxQ==";
};
};
"find-parent-dir-0.3.0" = {
name = "find-parent-dir";
packageName = "find-parent-dir";
@ -1463,6 +1499,15 @@ let
sha1 = "b88673c42009f8821fac2926e99720acee924fae";
};
};
"firstline-2.0.2" = {
name = "firstline";
packageName = "firstline";
version = "2.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/firstline/-/firstline-2.0.2.tgz";
sha512 = "8KcmfI0jgSECnzdhucm0i7vrwef3BWwgjimW2YkRC5eSFwjb5DibVoA0YvgkYwwxuJi9c+7M7X3b3lX8o9B6wg==";
};
};
"follow-redirects-1.9.0" = {
name = "follow-redirects";
packageName = "follow-redirects";
@ -1571,6 +1616,15 @@ let
sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==";
};
};
"fs-extra-8.1.0" = {
name = "fs-extra";
packageName = "fs-extra";
version = "8.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz";
sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==";
};
};
"fs-minipass-1.2.7" = {
name = "fs-minipass";
packageName = "fs-minipass";
@ -1706,6 +1760,15 @@ let
sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
};
};
"glob-7.1.5" = {
name = "glob";
packageName = "glob";
version = "7.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz";
sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==";
};
};
"glob-parent-3.1.0" = {
name = "glob-parent";
packageName = "glob-parent";
@ -1814,6 +1877,15 @@ let
sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
};
};
"has-flag-4.0.0" = {
name = "has-flag";
packageName = "has-flag";
version = "4.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz";
sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
};
};
"has-symbol-support-x-1.4.2" = {
name = "has-symbol-support-x";
packageName = "has-symbol-support-x";
@ -2930,6 +3002,15 @@ let
sha512 = "I3CWm/ExYYQ/a9bjB0OL9VsGa3Lmgbb8QOs4y2kEiB/DTkTqkcTaCr/lVyOYjRpgR25TsmOBATscsg6H6aC9Hg==";
};
};
"node-elm-compiler-5.0.4" = {
name = "node-elm-compiler";
packageName = "node-elm-compiler";
version = "5.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-5.0.4.tgz";
sha512 = "VQsT8QSierYGkHzRed+b4MnccQVF1+qPHunE8jBoU7jD6YpuRqCDPzEoC2zfyEJS80qVnlMZrqobLnyjzX9lJg==";
};
};
"node-int64-0.4.0" = {
name = "node-int64";
packageName = "node-int64";
@ -3614,6 +3695,15 @@ let
sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==";
};
};
"readdirp-3.1.3" = {
name = "readdirp";
packageName = "readdirp";
version = "3.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz";
sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==";
};
};
"readdirp-3.2.0" = {
name = "readdirp";
packageName = "readdirp";
@ -3794,6 +3884,15 @@ let
sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
};
};
"rimraf-2.6.3" = {
name = "rimraf";
packageName = "rimraf";
version = "2.6.3";
src = fetchurl {
url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
};
};
"rimraf-2.7.1" = {
name = "rimraf";
packageName = "rimraf";
@ -4361,6 +4460,15 @@ let
sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
};
};
"supports-color-7.1.0" = {
name = "supports-color";
packageName = "supports-color";
version = "7.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz";
sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==";
};
};
"syncprompt-2.0.0" = {
name = "syncprompt";
packageName = "syncprompt";
@ -4388,6 +4496,15 @@ let
sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
};
};
"temp-0.9.0" = {
name = "temp";
packageName = "temp";
version = "0.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz";
sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==";
};
};
"through-2.3.8" = {
name = "through";
packageName = "through";
@ -4937,6 +5054,15 @@ let
sha512 = "+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg==";
};
};
"xmlbuilder-13.0.2" = {
name = "xmlbuilder";
packageName = "xmlbuilder";
version = "13.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz";
sha512 = "Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==";
};
};
"xmlbuilder-8.2.2" = {
name = "xmlbuilder";
packageName = "xmlbuilder";
@ -5015,349 +5141,148 @@ in
elm-test = nodeEnv.buildNodePackage {
name = "elm-test";
packageName = "elm-test";
version = "0.19.0-rev6";
version = "0.19.1";
src = fetchurl {
url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev6.tgz";
sha512 = "Qdy9QusZF+eT0203XBiT1Y/UhFeUjcSuyyzf3iyp32dsYpAfcoDTWHjlBVjia1CyvFauESQ4pc81nKaq6snClg==";
url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1.tgz";
sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA==";
};
dependencies = [
sources."ajv-6.10.2"
sources."ansi-styles-3.2.1"
(sources."anymatch-2.0.0" // {
dependencies = [
sources."normalize-path-2.1.1"
];
})
sources."arr-diff-4.0.0"
sources."arr-flatten-1.1.0"
sources."arr-union-3.1.0"
sources."array-unique-0.3.2"
sources."anymatch-3.1.1"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."assign-symbols-1.0.0"
sources."async-each-1.0.3"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
sources."balanced-match-1.0.0"
(sources."base-0.11.2" // {
dependencies = [
sources."define-property-1.0.0"
];
})
sources."bcrypt-pbkdf-1.0.2"
sources."binary-0.3.0"
sources."binary-extensions-1.13.1"
sources."binary-extensions-2.0.0"
sources."binwrap-0.2.2"
sources."bluebird-3.7.1"
sources."brace-expansion-1.1.11"
(sources."braces-2.3.2" // {
dependencies = [
sources."extend-shallow-2.0.1"
sources."is-extendable-0.1.1"
];
})
sources."braces-3.0.2"
sources."buffers-0.1.1"
sources."cache-base-1.0.1"
sources."caseless-0.12.0"
sources."chainsaw-0.1.0"
sources."chalk-2.1.0"
(sources."chokidar-2.1.2" // {
(sources."chalk-2.4.2" // {
dependencies = [
sources."fsevents-1.2.9"
sources."supports-color-5.5.0"
];
})
sources."chokidar-3.2.1"
sources."chownr-1.1.3"
(sources."class-utils-0.3.6" // {
dependencies = [
sources."define-property-0.2.5"
(sources."is-accessor-descriptor-0.1.6" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
(sources."is-data-descriptor-0.1.4" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
sources."is-descriptor-0.1.6"
sources."kind-of-5.1.0"
];
})
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."combined-stream-1.0.8"
sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
sources."copy-descriptor-0.1.1"
sources."core-util-is-1.0.2"
sources."cross-spawn-4.0.0"
(sources."cross-spawn-7.0.0" // {
dependencies = [
sources."which-1.3.1"
];
})
sources."dashdash-1.14.1"
sources."debug-2.6.9"
sources."decode-uri-component-0.2.0"
sources."define-property-2.0.2"
sources."delayed-stream-1.0.0"
sources."ecc-jsbn-0.1.2"
sources."elmi-to-json-0.19.1"
sources."elmi-to-json-1.2.0"
sources."escape-string-regexp-1.0.5"
(sources."expand-brackets-2.1.4" // {
dependencies = [
sources."define-property-0.2.5"
sources."extend-shallow-2.0.1"
(sources."is-accessor-descriptor-0.1.6" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
(sources."is-data-descriptor-0.1.4" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
sources."is-descriptor-0.1.6"
sources."is-extendable-0.1.1"
sources."kind-of-5.1.0"
];
})
sources."extend-3.0.2"
sources."extend-shallow-3.0.2"
(sources."extglob-2.0.4" // {
dependencies = [
sources."define-property-1.0.0"
sources."extend-shallow-2.0.1"
sources."is-extendable-0.1.1"
];
})
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
sources."fast-json-stable-stringify-2.0.0"
(sources."fill-range-4.0.0" // {
dependencies = [
sources."extend-shallow-2.0.1"
sources."is-extendable-0.1.1"
];
})
(sources."find-elm-dependencies-2.0.1" // {
sources."fill-range-7.0.1"
(sources."find-elm-dependencies-2.0.2" // {
dependencies = [
sources."firstline-1.2.0"
];
})
sources."find-parent-dir-0.3.0"
sources."firstline-1.2.1"
sources."for-in-1.0.2"
sources."firstline-2.0.2"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
sources."fragment-cache-0.2.1"
sources."fs-extra-0.30.0"
sources."fs-extra-8.1.0"
sources."fs-minipass-1.2.7"
sources."fs.realpath-1.0.0"
sources."fsevents-1.2.4"
sources."get-value-2.0.6"
sources."fsevents-2.1.1"
sources."getpass-0.1.7"
sources."glob-7.1.1"
(sources."glob-parent-3.1.0" // {
dependencies = [
sources."is-glob-3.1.0"
];
})
sources."glob-7.1.4"
sources."glob-parent-5.1.0"
sources."graceful-fs-4.2.2"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-flag-2.0.0"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
sources."kind-of-4.0.0"
];
})
sources."has-flag-3.0.0"
sources."http-signature-1.2.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."is-accessor-descriptor-1.0.0"
sources."is-binary-path-1.0.1"
sources."is-buffer-1.1.6"
sources."is-data-descriptor-1.0.0"
sources."is-descriptor-1.0.2"
sources."is-extendable-1.0.1"
sources."is-binary-path-2.1.0"
sources."is-extglob-2.1.1"
sources."is-glob-4.0.1"
(sources."is-number-3.0.0" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
sources."is-plain-object-2.0.4"
sources."is-number-7.0.0"
sources."is-typedarray-1.0.0"
sources."is-windows-1.0.2"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."isobject-3.0.1"
sources."isstream-0.1.2"
sources."jsbn-0.1.1"
sources."json-schema-0.2.3"
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsonfile-2.4.0"
sources."jsonfile-4.0.0"
sources."jsprim-1.4.1"
sources."kind-of-6.0.2"
sources."klaw-1.3.1"
sources."lodash-4.17.11"
sources."lru-cache-4.1.5"
sources."map-cache-0.2.2"
sources."map-visit-1.0.0"
sources."micromatch-3.1.10"
sources."lodash-4.17.15"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
(sources."minipass-2.9.0" // {
dependencies = [
sources."yallist-3.1.1"
];
})
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mixin-deep-1.3.2"
(sources."mkdirp-0.5.1" // {
dependencies = [
sources."minimist-0.0.8"
];
})
sources."ms-2.0.0"
sources."murmur-hash-js-1.0.0"
sources."mustache-3.1.0"
sources."nan-2.14.0"
sources."nanomatch-1.2.13"
sources."node-elm-compiler-5.0.3"
sources."normalize-path-3.0.0"
sources."oauth-sign-0.9.0"
(sources."object-copy-0.1.0" // {
sources."nice-try-1.0.5"
(sources."node-elm-compiler-5.0.4" // {
dependencies = [
sources."define-property-0.2.5"
sources."is-accessor-descriptor-0.1.6"
sources."is-data-descriptor-0.1.4"
(sources."is-descriptor-0.1.6" // {
dependencies = [
sources."kind-of-5.1.0"
];
})
sources."kind-of-3.2.2"
sources."cross-spawn-6.0.5"
sources."path-key-2.0.1"
sources."which-1.3.1"
];
})
sources."object-visit-1.0.1"
sources."object.pick-1.3.0"
sources."normalize-path-3.0.0"
sources."oauth-sign-0.9.0"
sources."once-1.4.0"
sources."os-tmpdir-1.0.2"
sources."pascalcase-0.1.1"
sources."path-dirname-1.0.2"
sources."path-is-absolute-1.0.1"
sources."path-key-3.1.0"
sources."performance-now-2.1.0"
sources."posix-character-classes-0.1.1"
sources."process-nextick-args-2.0.1"
sources."pseudomap-1.0.2"
sources."picomatch-2.0.7"
sources."psl-1.4.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."readable-stream-2.3.6"
sources."readdirp-2.2.1"
sources."regex-not-1.0.2"
sources."remove-trailing-separator-1.1.0"
sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1"
sources."readdirp-3.1.3"
sources."request-2.88.0"
sources."request-promise-4.2.4"
sources."request-promise-core-1.1.2"
sources."resolve-url-0.2.1"
sources."ret-0.1.15"
(sources."rimraf-2.7.1" // {
dependencies = [
sources."glob-7.1.4"
];
})
sources."safe-buffer-5.1.2"
sources."safe-regex-1.1.0"
sources."rimraf-2.6.3"
sources."safe-buffer-5.2.0"
sources."safer-buffer-2.1.2"
(sources."set-value-2.0.1" // {
dependencies = [
sources."extend-shallow-2.0.1"
sources."is-extendable-0.1.1"
];
})
(sources."snapdragon-0.8.2" // {
dependencies = [
sources."define-property-0.2.5"
sources."extend-shallow-2.0.1"
(sources."is-accessor-descriptor-0.1.6" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
(sources."is-data-descriptor-0.1.4" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
sources."is-descriptor-0.1.6"
sources."is-extendable-0.1.1"
sources."kind-of-5.1.0"
];
})
(sources."snapdragon-node-2.1.1" // {
dependencies = [
sources."define-property-1.0.0"
];
})
(sources."snapdragon-util-3.0.1" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
sources."source-map-0.5.7"
sources."source-map-resolve-0.5.2"
sources."source-map-url-0.4.0"
sources."semver-5.7.1"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
sources."split-1.0.1"
sources."split-string-3.1.0"
sources."sshpk-1.16.1"
(sources."static-extend-0.1.2" // {
dependencies = [
sources."define-property-0.2.5"
(sources."is-accessor-descriptor-0.1.6" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
(sources."is-data-descriptor-0.1.4" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
sources."is-descriptor-0.1.6"
sources."kind-of-5.1.0"
];
})
sources."stealthy-require-1.1.1"
sources."string_decoder-1.1.1"
sources."supports-color-4.2.0"
(sources."tar-4.4.13" // {
(sources."supports-color-7.1.0" // {
dependencies = [
sources."yallist-3.1.1"
];
})
(sources."temp-0.8.3" // {
dependencies = [
sources."rimraf-2.2.8"
sources."has-flag-4.0.0"
];
})
sources."tar-4.4.13"
sources."temp-0.9.0"
sources."through-2.3.8"
(sources."to-object-path-0.3.0" // {
dependencies = [
sources."kind-of-3.2.2"
];
})
sources."to-regex-3.0.2"
sources."to-regex-range-2.1.1"
sources."to-regex-range-5.0.1"
(sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
@ -5366,33 +5291,15 @@ in
sources."traverse-0.3.9"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
(sources."union-value-1.0.1" // {
dependencies = [
sources."is-extendable-0.1.1"
];
})
(sources."unset-value-1.0.0" // {
dependencies = [
(sources."has-value-0.3.1" // {
dependencies = [
sources."isobject-2.1.0"
];
})
sources."has-values-0.1.4"
];
})
sources."universalify-0.1.2"
sources."unzip-stream-0.3.0"
sources."upath-1.2.0"
sources."uri-js-4.2.2"
sources."urix-0.1.0"
sources."use-3.1.1"
sources."util-deprecate-1.0.2"
sources."uuid-3.3.3"
sources."verror-1.10.0"
sources."which-1.3.1"
sources."which-2.0.1"
sources."wrappy-1.0.2"
sources."xmlbuilder-8.2.2"
sources."yallist-2.1.2"
sources."xmlbuilder-13.0.2"
sources."yallist-3.1.1"
];
buildInputs = globalBuildInputs;
meta = {
@ -5692,7 +5599,7 @@ in
sources."ret-0.1.15"
(sources."rimraf-2.7.1" // {
dependencies = [
sources."glob-7.1.4"
sources."glob-7.1.5"
];
})
sources."safe-buffer-5.1.2"
@ -5867,7 +5774,7 @@ in
sources."extend-shallow-2.0.1"
];
})
sources."bser-2.1.0"
sources."bser-2.1.1"
sources."bytes-3.1.0"
sources."cache-base-1.0.1"
(sources."cacheable-request-2.1.4" // {
@ -5906,7 +5813,7 @@ in
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
sources."copy-descriptor-0.1.1"
sources."core-js-3.3.2"
sources."core-js-3.3.3"
sources."core-util-is-1.0.2"
sources."cross-spawn-6.0.5"
sources."debug-2.6.9"
@ -5983,7 +5890,7 @@ in
sources."function-bind-1.1.1"
sources."get-stream-3.0.0"
sources."get-value-2.0.6"
sources."glob-7.1.4"
sources."glob-7.1.5"
sources."got-8.3.2"
sources."has-1.0.3"
sources."has-flag-3.0.0"
@ -6270,7 +6177,7 @@ in
sources."fs.realpath-1.0.0"
sources."get-proxy-2.1.0"
sources."get-stream-3.0.0"
sources."glob-7.1.4"
sources."glob-7.1.5"
sources."got-6.7.1"
sources."graceful-fs-4.2.2"
sources."has-symbol-support-x-1.4.2"
@ -6319,13 +6226,13 @@ in
bypassCache = true;
reconstructLock = true;
};
"elm-analyse-0.16.3" = nodeEnv.buildNodePackage {
elm-analyse = nodeEnv.buildNodePackage {
name = "elm-analyse";
packageName = "elm-analyse";
version = "0.16.3";
version = "0.16.4";
src = fetchurl {
url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.3.tgz";
sha512 = "JFlGT0d6v3EPk1UnB5xb6VYWrKzwGD76wBwr2R0xwA3T6Rju7zEnzfs8LiBo+b3gSH5cmRDfnK9BLRFiosWEfQ==";
url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.4.tgz";
sha512 = "6F6JfcOfbRgTBJj7MF+CqGcatCep8ppZtfIAri+fpC76MsSohJAOfLgmbmd4BWOXcTiWCpvQaaFwUutm7cOlpA==";
};
dependencies = [
sources."accepts-1.3.7"
@ -6648,10 +6555,10 @@ in
"@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage {
name = "_at_elm-tooling_slash_elm-language-server";
packageName = "@elm-tooling/elm-language-server";
version = "1.4.2";
version = "1.4.3";
src = fetchurl {
url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.2.tgz";
sha512 = "66FzEfP1Pan3Hw417rRVTXFtYcKV6EB8HwEQ6uQcnP1ggpTqV/7D8Mp90Y3JzsDHyIwm7BlsksxY6K+dEOgXqg==";
url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.3.tgz";
sha512 = "UU8u3wHc1pDQUwupJyeKe34keE/m3SjWO22GCgM94pkFdHiGYuAsesQRX3olKycCsV1ZG7xwAD4eGvoUQmNTvQ==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.3"
@ -6660,7 +6567,7 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
sources."@types/node-12.11.1"
sources."@types/node-12.11.2"
sources."accepts-1.3.7"
sources."ajv-6.10.2"
sources."array-flatten-1.1.1"
@ -6737,7 +6644,7 @@ in
sources."fs.realpath-1.0.0"
sources."get-stream-5.1.0"
sources."getpass-0.1.7"
sources."glob-7.1.4"
sources."glob-7.1.5"
sources."glob-parent-5.1.0"
sources."globby-10.0.1"
sources."graceful-fs-4.2.2"

View File

@ -1,22 +0,0 @@
{stdenv, fetchurl, zlib, cmake}:
stdenv.mkDerivation {
name = "taglib-1.9.1";
src = fetchurl {
url = https://taglib.github.io/releases/taglib-1.9.1.tar.gz;
sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib ];
meta = {
homepage = https://taglib.org/;
repositories.git = git://github.com/taglib/taglib.git;
description = "A library for reading and editing the meta-data of several popular audio formats";
inherit (cmake.meta) platforms;
license = with stdenv.lib.licenses; [ lgpl21 mpl11 ];
};
}

View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
meta = with stdenv.lib; {
homepage = "http://taglib.org/";
homepage = "https://taglib.org/";
repositories.git = "git://github.com/taglib/taglib.git";
description = "A library for reading and editing audio file metadata.";
longDescription = ''

View File

@ -0,0 +1,38 @@
{ stdenv
, fetchFromGitHub
, python
, pyusb
}:
stdenv.mkDerivation rec {
pname = "py3buddy";
version = "unstable-2019-09-29";
src = fetchFromGitHub {
owner = "armijnhemel";
repo = pname;
rev = "2b28908454645117368ca56df67548c93f4e0b03";
sha256 = "12ar4kbplavndarkrbibxi5i607f5sfia5myscvalqy78lc33798";
};
propagatedBuildInputs = [ pyusb ];
dontConfigure = true;
dontBuild = true;
dontCheck = true;
installPhase = ''
install -D py3buddy.py $out/lib/${python.libPrefix}/site-packages/py3buddy.py
'';
postInstall = ''
install -D 99-ibuddy.rules $out/lib/udev/rules.d/99-ibuddy.rules
'';
meta = {
description = "Code to work with the iBuddy MSN figurine";
homepage = "https://github.com/armijnhemel/py3buddy";
license = with stdenv.lib.licenses; [ mit ];
maintainers = with stdenv.lib.maintainers; [ prusnak ];
};
}

View File

@ -29,6 +29,5 @@ buildPythonPackage rec {
description = "Python API for libminc using EZMINC";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ bcdarwin ];
broken = true;
};
}

View File

@ -391,12 +391,12 @@ let
coc-json = buildVimPluginFrom2Nix {
pname = "coc-json";
version = "2019-09-22";
version = "2019-10-26";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-json";
rev = "d47bbf74ccee5954be887845248251eb9b75635e";
sha256 = "08xr276n37x8wx5jzka0hw09mx20n4irdcq1mmy89w9p9rh54fgh";
rev = "82f2cbcbc9e29aec315357428cedee8614d15a70";
sha256 = "0vp735ibzifpz7mi8mcm02a1pdarjn7ax6bsi54wxclr4kniqil7";
};
};
@ -468,12 +468,12 @@ let
coc-rls = buildVimPluginFrom2Nix {
pname = "coc-rls";
version = "2019-10-02";
version = "2019-10-26";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-rls";
rev = "eea9357be6d1875e7af127a5fa54b3dd313c3978";
sha256 = "1wnfiqa5hvp74jllzhli7379w88c7jlzxxl9skmzyqmrvpmpc5z5";
rev = "077d20acc8dc2d8cee3d58907b3837d41c215303";
sha256 = "0vwx6bmc5qjxmn594w6sn0fzplv7dw6i2al4bq7cnw1b6h2k6lhz";
};
};
@ -1388,11 +1388,11 @@ let
indentLine = buildVimPluginFrom2Nix {
pname = "indentLine";
version = "2019-10-23";
version = "2019-10-26";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "indentLine";
rev = "9c6f8fe0b34adf3813a866bff16b031537cc346c";
rev = "bb548a975ebe4576073ca025eeb2743b4465ce1d";
sha256 = "0r3jppigc6i562par0l36z7g5zyk2djvjvbl61vjzi0jk1d0gvjn";
};
};
@ -2555,12 +2555,12 @@ let
tagbar = buildVimPluginFrom2Nix {
pname = "tagbar";
version = "2019-10-23";
version = "2019-10-25";
src = fetchFromGitHub {
owner = "majutsushi";
repo = "tagbar";
rev = "ede158656a25f0953e9b53074b8b87825f87d944";
sha256 = "1gid66v5w71q5hwb08qph2crdxpvxaxva4bzgf5dqnkis3z82bvm";
rev = "a0f51bd5a6514632bf3d2df1b001df27361892bd";
sha256 = "1drhdyyalg2sjgckgw8s026q2ydd07vfxr3i6vyvp3irlf86sbdy";
};
};
@ -3018,12 +3018,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2019-10-24";
version = "2019-10-25";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "62ec2196015c4bcd0e55ac3a970a4668a655b930";
sha256 = "0g5j8z87kc6qkm543jl8z36dpcdxdgp0rgq0w3zhfbjbq166xyd2";
rev = "a0e9b383c67174744ea2be6239f6c71eaa10434c";
sha256 = "0vdpcgm7925gmr15zr0nb75b2449fgw78aqchc6qqa07n6n2zgrd";
};
};
@ -3315,12 +3315,12 @@ let
vim-devicons = buildVimPluginFrom2Nix {
pname = "vim-devicons";
version = "2019-09-23";
version = "2019-10-26";
src = fetchFromGitHub {
owner = "ryanoasis";
repo = "vim-devicons";
rev = "fae1550b95f537b879da7ebb7bfaa0ac65859271";
sha256 = "1h0x6wck52ga8qq2phk718yn30yniljbhgrvp59qi5fskx8hsjd4";
rev = "72cb43727e3b87c99042e1f9dbae23b82c8ea59f";
sha256 = "022ikmrva76whv4gnc1c33z6b1pxg2avpay9yac57l0gs4rhccv4";
};
};
@ -3590,12 +3590,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2019-10-22";
version = "2019-10-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "b09c5d2523f9964add241a04862c2f8bbd7d428f";
sha256 = "0x6j4z85z23wk1j7ni1558iyssiimixv26rhbsp9n26a4g8mm042";
rev = "0356edf6b8a82d6654e94d1669c9d9dd6c5507ab";
sha256 = "1j9zfskkqdrligznn6wbncyqy2inaxg2ylw5w1whm2w5546gk3lr";
};
};
@ -3711,12 +3711,12 @@ let
vim-gutentags = buildVimPluginFrom2Nix {
pname = "vim-gutentags";
version = "2019-05-06";
version = "2019-10-26";
src = fetchFromGitHub {
owner = "ludovicchabant";
repo = "vim-gutentags";
rev = "eecb136fae97e30d5f01e71f0d3b775c8b017385";
sha256 = "0i8hq0qxjrsavs3a7saz5wqibib5qd3lgfbygpclvp24ylisa8vq";
rev = "aa67e48f6c071ef4179dc30ac24ddf93e5eb6338";
sha256 = "1fasld18g0f397369axfw39n106gdyb02dm05v6qsd7cg8j7vxyv";
};
};
@ -4097,12 +4097,12 @@ let
vim-ledger = buildVimPluginFrom2Nix {
pname = "vim-ledger";
version = "2019-10-08";
version = "2019-10-26";
src = fetchFromGitHub {
owner = "ledger";
repo = "vim-ledger";
rev = "4a8ee53029afa755f76b9e953ce3ca6beabdb63f";
sha256 = "0vjk2knvpx79qa27k9zgc5s9pw3r96ylydhimsf9wxsgz7ihfr4r";
rev = "e113a30ccca416fb8ae3f307e5f0d43a55e03597";
sha256 = "1sqgna0qnrqkll33x1waaaazqn2rwklccksm91zsd9k6p3q2hcgv";
};
};
@ -4152,12 +4152,12 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
version = "2019-10-21";
version = "2019-10-25";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
rev = "576c07a77570fee7b5e724516f9a3bb3de7d4a8a";
sha256 = "1qnpjb5rciv2c6zklhfn1flj2r8dj72wmv2wdmslh7csdqf3fyki";
rev = "730d901164497f17b15a42d531b346752cc10765";
sha256 = "1cq6rm46ak3z5jqja5w59x6387rvm5ksw04jgaln3fjp2k9zmllw";
};
};
@ -5329,12 +5329,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2019-10-24";
version = "2019-10-25";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "b7a95eb1ae1ff9ef1a565df8c54ac5152b7f0f7d";
sha256 = "0kwfck76pl02x9vqzvcqlb00pd1pqw0nx46l9cjvs54wf6lw39yk";
rev = "f6a84aec49d9577fab7486b72a6830b61ee093b0";
sha256 = "01aiasbysm0y23aid5v5r8avn70bc458gz3j8zbaq6c53bc1h3q0";
};
};
@ -5484,12 +5484,12 @@ let
youcompleteme = buildVimPluginFrom2Nix {
pname = "youcompleteme";
version = "2019-10-22";
version = "2019-10-26";
src = fetchFromGitHub {
owner = "valloric";
repo = "youcompleteme";
rev = "123f0c0794eb8e36b24649059090a2deeb34d1d5";
sha256 = "1rb35m6x3i692ln15a42g7dnc7lpg6lvf6kfdl67ygsgigcwflff";
rev = "3620fb550d6dd790376b18ed730dbc0f53239b35";
sha256 = "1wd2cx37b3567rzjiydn4n7mrr0n5av8227as74fd1blnwbdik7f";
fetchSubmodules = true;
};
};

View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "documize-community";
version = "3.3.2";
version = "3.4.0";
src = fetchFromGitHub {
owner = "documize";
repo = "community";
rev = "v${version}";
sha256 = "172h3v9absfc0p79a1v9m197x4aprryig0hhyq6bfhjyqd5nq0fd";
sha256 = "0gmr61ga8ik7awaqcq74bg7h7m8ijqvf4xvr5s6agkmzym83sjsz";
};
goPackagePath = "github.com/documize/community";

View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
doCheck = true;
doCheck = !stdenv.isDarwin;
checkInputs = [
python3Packages.pexpect
python3Packages.pytest

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "0gh6p912y8i295p3vwhlrsxky761zlvrykcl6jm6j2qhwl5k4k29";
sha256 = "1d2bl3i494h170b2q5jr3h7pqn5fij078jiv09lvahm0g1rn1154";
};
modSha256 = "0c8hbb73w1922qh895lsk0m9i7lk9kzrvxjc4crwsfpn9pv0qgd3";
modSha256 = "072zmvd5lfnss89mjdljxw9lb99x2m15s5gvqw1zcz322v5fsznd";
subPackages = [ "cmd/eksctl" ];

View File

@ -0,0 +1,25 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "zfsbackup";
version = "unstable-2019-03-05";
rev = "78fea6e99f0a5a4c8513d3a3d1d45fb6750cfddf";
goPackagePath = "github.com/someone1/zfsbackup-go";
src = fetchFromGitHub {
owner = "someone1";
repo = "zfsbackup-go";
inherit rev;
sha256 = "0yalsfvzmcnc8yfzm3r5dikqrp57spwa16l7gbzvgqqcz4vlnw3n";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "Backup ZFS snapshots to cloud storage such as Google, Amazon, Azure, etc";
homepage = "https://github.com/someone1/zfsbackup-go";
license = licenses.mit;
maintainers = [ maintainers.xfix ];
};
}

273
pkgs/tools/backup/zfsbackup/deps.nix generated Normal file
View File

@ -0,0 +1,273 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "cloud.google.com/go";
fetch = {
type = "git";
url = "https://code.googlesource.com/gocloud";
rev = "b9197a057a6cb1129f29cd21ca11d1bb043666d1";
sha256 = "0f1p361apzj30i9vcza60ldhhjxff8581gr5xqim7x4d5rgmpwil";
};
}
{
goPackagePath = "github.com/Azure/azure-pipeline-go";
fetch = {
type = "git";
url = "https://github.com/Azure/azure-pipeline-go";
rev = "232aee85e8e3a6223a11c0943f7df2ae0fac00e4";
sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6";
};
}
{
goPackagePath = "github.com/Azure/azure-storage-blob-go";
fetch = {
type = "git";
url = "https://github.com/Azure/azure-storage-blob-go";
rev = "fc700035fe4a7020f50d49f420b3c088aed57e03";
sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752";
};
}
{
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "3576772d916b5db1cb5516b772bcdc362349a177";
sha256 = "04clzbyg5cmqz98i5hxbik6sd7aclas1707rhaixmmckgisqxb8i";
};
}
{
goPackagePath = "github.com/cenkalti/backoff";
fetch = {
type = "git";
url = "https://github.com/cenkalti/backoff";
rev = "4b4cebaf850ec58f1bb1fec5bdebdf8501c2bc3f";
sha256 = "0vwd6nbadrqgaljb5grmw2iljvv963qd15axr5cvvgpd465q3kzc";
};
}
{
goPackagePath = "github.com/dustin/go-humanize";
fetch = {
type = "git";
url = "https://github.com/dustin/go-humanize";
rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e";
sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
};
}
{
goPackagePath = "github.com/golang/groupcache";
fetch = {
type = "git";
url = "https://github.com/golang/groupcache";
rev = "404acd9df4cc9859d64fb9eed42e5c026187287a";
sha256 = "1zmhdr758wn0kfh5xr4hg026f9qvy00s3midb5iqnpx1kh647j2g";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "1680a479a2cfb3fa22b972af7e36d0a0fde47bf8";
sha256 = "1w0aivn2rqf7bcpz84nbn0alh1q3nglqgp7il835fmvvc94rrkqn";
};
}
{
goPackagePath = "github.com/googleapis/gax-go";
fetch = {
type = "git";
url = "https://github.com/googleapis/gax-go";
rev = "a170e83f27ee4e20c66e51b66a99a4a349a1b75a";
sha256 = "0a5ir1v5cd6m40hscqy0qpc3ibd703kiw419m66ddxnkvzykvp0i";
};
}
{
goPackagePath = "github.com/juju/ratelimit";
fetch = {
type = "git";
url = "https://github.com/juju/ratelimit";
rev = "f60b32039441cd828005f82f3a54aafd00bc9882";
sha256 = "1qbjcm4y53awkqmpxb1nm9c1xdylc44vph4mn30qjb5wrcqy7c1r";
};
}
{
goPackagePath = "github.com/klauspost/compress";
fetch = {
type = "git";
url = "https://github.com/klauspost/compress";
rev = "30993c63e1b02b47dd3878e74c8db50833706ecc";
sha256 = "07d0r56ic91rdd0xvfr7zpn015kl6g9jwlgq5avczbz4fnyx5x8m";
};
}
{
goPackagePath = "github.com/klauspost/pgzip";
fetch = {
type = "git";
url = "https://github.com/klauspost/pgzip";
rev = "083b1c3f84dd6486588802e5ce295de3a7f41a8b";
sha256 = "0ddigh096fz3lixbdm679hjvnfivbpkijrclk5sn9091hyj38pb3";
};
}
{
goPackagePath = "github.com/kurin/blazer";
fetch = {
type = "git";
url = "https://github.com/kurin/blazer";
rev = "cf2f27cc0be3dac3c1a94c3c8b76834ce741439e";
sha256 = "02nwxrczg8c9zj3hdmbyg458qvhfwl60ci1pjl7f0y07kgiv1rg3";
};
}
{
goPackagePath = "github.com/mattn/go-ieproxy";
fetch = {
type = "git";
url = "https://github.com/mattn/go-ieproxy";
rev = "f9202b1cfdeb0c82ddd3dc1e8e9cd94b3c0c1b13";
sha256 = "0r8c17znlv32750qy3p96fbyp8ys8xfdccpzv0z9lr2y88jnzhpz";
};
}
{
goPackagePath = "github.com/miolini/datacounter";
fetch = {
type = "git";
url = "https://github.com/miolini/datacounter";
rev = "aa48df3a02c1fbcd3040271f631887991c3071fb";
sha256 = "12ldh5jhafjhh3jvh979mldwygkkcnm97axs7dhlai6gqwlhls87";
};
}
{
goPackagePath = "github.com/nightlyone/lockfile";
fetch = {
type = "git";
url = "https://github.com/nightlyone/lockfile";
rev = "0ad87eef1443f64d3d8c50da647e2b1552851124";
sha256 = "19vfswcvdy937da7w6hap3wp83drj5a084sqszy8r2ph4fbkln41";
};
}
{
goPackagePath = "github.com/op/go-logging";
fetch = {
type = "git";
url = "https://github.com/op/go-logging";
rev = "970db520ece77730c7e4724c61121037378659d9";
sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7";
sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y";
};
}
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
rev = "8a4b46fadf756f30eff047abf2f8edba4eac6fef";
sha256 = "0f9pxni3lghl205wrnssw58iliqifrxcdabrbww20887zwn3ki7q";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab";
sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31";
};
}
{
goPackagePath = "go.opencensus.io";
fetch = {
type = "git";
url = "https://github.com/census-instrumentation/opencensus-go";
rev = "3b5a343282fe4b4fccdb0f24cbd1d7169d20858a";
sha256 = "0qzx8p019r4qzm0knvs3kcx5vc9qg6ksgf1amk5djr1h00w460aw";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "87dc89f01550277dc22b74ffcf4cd89fa2f40f4c";
sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "da9a3fd4c5820e74b24a6cb7fb438dc9b0dd377c";
sha256 = "0iavs400534jn7drmdphx0f18vgg060p2r59xw5d85ji1l5rin1l";
};
}
{
goPackagePath = "golang.org/x/oauth2";
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33";
sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "cd5d95a43a6e21273425c7ae415d3df9ea832eeb";
sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "b09406accb4736d857a32bf9444cd7edae2ffa79";
sha256 = "00lbhsr2p3mi2n35mv3yy6lmgzjjav45yv9bmrxgyahbac5qnz5m";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "3d0f7978add91030e5e8976ff65ccdd828286cba";
sha256 = "0iagl5icarfrbiv6m3dhqy51r30cnl07r66im5c88dz7lrvpy5z3";
};
}
{
goPackagePath = "google.golang.org/api";
fetch = {
type = "git";
url = "https://code.googlesource.com/google-api-go-client";
rev = "e6ade80c6e2a122a6588f9f827207dcb99da433e";
sha256 = "1mk0ab6f2dyx1lack436zdhspq1hgip2s5m3pqjrqk18s8vvn4bd";
};
}
{
goPackagePath = "google.golang.org/genproto";
fetch = {
type = "git";
url = "https://github.com/google/go-genproto";
rev = "548a555dbc03994223efbaba0090152849259498";
sha256 = "15sbfwrh6m18fn3n369cb5c8qsmw17wibwmjssblgp64gvmx5b18";
};
}
{
goPackagePath = "google.golang.org/grpc";
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
rev = "7c8e60372e19da88fb3fe8ac6a8de781eef7f547";
sha256 = "03fb7j1gfglzp77hkhlm8dgg3if1j1pvry0nhx915ww0hmz6sr00";
};
}
]

View File

@ -4,10 +4,10 @@
stdenv.mkDerivation rec {
pname = "s3backer";
version = "1.5.2";
version = "1.5.4";
src = fetchFromGitHub {
sha256 = "1axxnhhf335xckwn43csqmvf1454izbk9dglc3r7isrk0lz1ricc";
sha256 = "1228qlfgz48k9vv72hrz488zg73zls99cppb9vmikc0pzv1xndsx";
rev = version;
repo = "s3backer";
owner = "archiecobbs";

View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase
, qtquickcontrols, qtsvg, qttools, qtwebengine, utillinux, glibc, tzdata
, ckbcomp, xkeyboard_config
, ckbcomp, xkeyboard_config, mkDerivation
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "calamares";
version = "3.2.15";
@ -54,10 +54,10 @@ stdenv.mkDerivation rec {
-i CMakeLists.txt
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Distribution-independent installer framework";
license = licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ manveru ];
maintainers = with lib.maintainers; [ manveru ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,454 @@
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 00000000000..630f81eae76
--- /dev/null
+++ b/pkgs/tools/misc/eva/Cargo.lock
@@ -0,0 +1,448 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "arrayvec"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "base64"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "blake2b_simd"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cc"
+version = "1.0.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "clap"
+version = "2.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "constant_time_eq"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "dirs"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "eva"
+version = "0.2.4"
+dependencies = [
+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "radix_fmt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustyline 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "log"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memchr"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "nix"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "nodrop"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "radix_fmt"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand_os"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "redox_users"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rust-argon2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rustyline"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "syn"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "utf8parse"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "vec_map"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "void"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
+"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
+"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
+"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182"
+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+"checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c"
+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
+"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
+"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
+"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
+"checksum nix 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4dbdc256eaac2e3bd236d93ad999d3479ef775c863dbda3068c4006a92eec51b"
+"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum radix_fmt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
+"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
+"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+"checksum rustyline 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0f47ea1ceb347d2deae482d655dc8eef4bd82363d3329baffa3818bd76fea48b"
+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"
+"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d"
+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

View File

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "eva";
version = "0.2.5";
cargoSha256 = "1zns4xspw9w1f84sf8cz30mp2fl1jyjc2ca09gkqhzhgaj055y7k";
src = fetchFromGitHub {
owner = "NerdyPepper";
repo = "${pname}";
rev = "v${version}";
sha256 = "1vqr6z4vicqx1lm5ll09za4jh8rki2qbav1pawz15hqqzps3y8h1";
};
cargoPatches = [ ./Cargo.lock.patch ];
meta = with stdenv.lib; {
description = "A calculator REPL, similar to bc";
homepage = https://github.com/NerdyPepper/eva;
license = licenses.mit;
maintainers = with maintainers; [ nrdxp ];
};
}

View File

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2019.10.16";
version = "2019.10.22";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "089bm68255b8af9y1mf1bmsnci9b2vdcm2a9x4rnrvhrwhxb9b7j";
sha256 = "06wg6wpyq0fawjxjrhd7zasfjr9b6w9wsk2amiqdl712zqlq2rwb";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "croc";
version = "6.1.4";
version = "6.2.0";
goPackagePath = "github.com/schollz/croc";
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "1qqmyqkzg8gcib6zzva9zqlv22zpg4lwc3dqi6yyaynmdgy9pk1m";
sha256 = "0pav0l7akzqgwj7yqkgbpl96kndlb41kg1vmb3g6xp7ykmbdsbbc";
};
modSha256 = "17vpfq3bsciq3vx5s2r3sv76aqsij3vvckqnk2w2sp346by5vavf";
modSha256 = "02w4p877nvv7dril7l9nmj8xf3fnghxnj8kglxkv541vabvlpq03";
subPackages = [ "." ];
meta = with stdenv.lib; {

View File

@ -1,24 +1,28 @@
{ lib, fetchFromGitHub, buildGoPackage, pigeon }:
{ lib
, fetchgit
, buildGoPackage
, pigeon
}:
buildGoPackage rec {
pname = "verifpal";
version = "0.2";
version = "0.7.5";
goPackagePath = "github.com/SymbolicSoft/verifpal";
goDeps = ./deps.nix;
src = fetchFromGitHub {
owner = "SymbolicSoft";
repo = pname;
src = fetchgit {
url = "https://source.symbolic.software/verifpal/verifpal.git";
rev = version;
sha256 = "08a0xvgg94k6vq91ylvgi97kpkjbw0rw172v2dzwl2rfpzkigk1r";
sha256 = "0njgn6j5qg5kgid6ddv23axhw5gwjbayhdjkj4ya08mnxndr284m";
};
nativeBuildInputs = [ pigeon ];
postPatch = ''
sed -e 's|/bin/echo |echo |g' -i Makefile
'';
buildInputs = [ pigeon ];
buildPhase = ''
make -C go/src/$goPackagePath parser linux
'';
@ -33,6 +37,6 @@ buildGoPackage rec {
description = "Cryptographic protocol analysis for students and engineers";
maintainers = with lib.maintainers; [ zimbatm ];
license = with lib.licenses; [ gpl3 ];
platforms = ["x86_64-linux"];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -3008,6 +3008,8 @@ in
evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { };
eva = callPackage ../tools/misc/eva { };
exa = callPackage ../tools/misc/exa { };
exempi = callPackage ../development/libraries/exempi {
@ -7285,6 +7287,8 @@ in
zerofree = callPackage ../tools/filesystems/zerofree { };
zfsbackup = callPackage ../tools/backup/zfsbackup { };
zfstools = callPackage ../tools/filesystems/zfstools { };
zile = callPackage ../applications/editors/zile { };
@ -13948,7 +13952,6 @@ in
};
taglib = callPackage ../development/libraries/taglib { };
taglib_1_9 = callPackage ../development/libraries/taglib/1.9.nix { };
taglib_extras = callPackage ../development/libraries/taglib-extras { };
@ -16585,10 +16588,6 @@ in
riscv-pk = callPackage ../misc/riscv-pk { };
riscv-pk-with-kernel = riscv-pk.override {
payload = "${linux_riscv}/vmlinux";
};
roccat-tools = callPackage ../os-specific/linux/roccat-tools { };
rtkit = callPackage ../os-specific/linux/rtkit { };
@ -20021,7 +20020,9 @@ in
mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };
mythtv = libsForQt5.callPackage ../applications/video/mythtv { };
mythtv = libsForQt5.callPackage ../applications/video/mythtv {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
};
micro = callPackage ../applications/editors/micro { };
@ -21165,12 +21166,6 @@ in
toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { };
tomahawk = callPackage ../applications/audio/tomahawk ({
taglib = taglib_1_9;
quazip = quazip_qt4;
boost = boost155;
} // (config.tomahawk or {}));
topydo = callPackage ../applications/misc/topydo {};
torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch {

View File

@ -245,6 +245,15 @@ let
'';
};
pcov = buildPecl {
version = "1.0.6";
pname = "pcov";
sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1";
buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
};
pcs = buildPecl {
version = "1.3.3";
pname = "pcs";
@ -392,12 +401,12 @@ let
};
phpstan = mkDerivation rec {
version = "0.11.16";
version = "0.11.19";
pname = "phpstan";
src = pkgs.fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "0c2417kwkj3nf1zya1flw7g1mz0dwhh27hjs3wz04b0kgnv4syzs";
sha256 = "0b04d2x07vipx1850v3d2hga3s6ssv7g21x58dhcjrg35i1bvq71";
};
phases = [ "installPhase" ];

View File

@ -906,6 +906,8 @@ in {
pybind11 = callPackage ../development/python-modules/pybind11 { };
py3buddy = callPackage ../development/python-modules/py3buddy { };
pybullet = callPackage ../development/python-modules/pybullet { };
pycairo = callPackage ../development/python-modules/pycairo {