diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-17 14:54:39 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-17 14:54:39 +0200 |
| commit | 0ac85bc455148e4a4b359fb230e3e3cca3b35b72 (patch) | |
| tree | 0774fb04a9a494a4d8048f013cc608b7afa605a7 | |
| parent | 566683ab5e76f570f34d0a4ec6484250859fae85 (diff) | |
| parent | 914b9788fd18a0eb908c7bf630cb206f5dabd25e (diff) | |
| download | nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar.gz nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar.bz2 nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar.lz nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar.xz nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar.zst nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.zip | |
Merge master into staging-next
531 files changed, 2776 insertions, 6272 deletions
diff --git a/.gitignore b/.gitignore index 05ada15f43a..b166a78d7d7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ result-* .DS_Store .mypy_cache +__pycache__ /pkgs/development/libraries/qt-5/*/tmp/ /pkgs/desktops/kde-5/*/tmp/ diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 419d7da19f8..6c51da87cab 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/BurntSushi/ripgrep"; license = licenses.unlicense; maintainers = [ maintainers.tailhook ]; - platforms = platforms.all; }; } ``` diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index 818e6c5da00..f97c2a145af 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -254,7 +254,7 @@ let f(h, h + 1, i) = i + h <variablelist> <title>Variables specifying dependencies</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-depsBuildBuild"> <term> <varname>depsBuildBuild</varname> </term> @@ -267,7 +267,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-nativeBuildInputs"> <term> <varname>nativeBuildInputs</varname> </term> @@ -280,7 +280,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-depsBuildTarget"> <term> <varname>depsBuildTarget</varname> </term> @@ -296,7 +296,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-depsHostHost"> <term> <varname>depsHostHost</varname> </term> @@ -306,7 +306,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-buildInputs"> <term> <varname>buildInputs</varname> </term> @@ -319,7 +319,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-depsTargetTarget"> <term> <varname>depsTargetTarget</varname> </term> @@ -329,7 +329,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-depsBuildBuildPropagated"> <term> <varname>depsBuildBuildPropagated</varname> </term> @@ -339,7 +339,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-propagatedNativeBuildInputs"> <term> <varname>propagatedNativeBuildInputs</varname> </term> @@ -349,7 +349,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-depsBuildTargetPropagated"> <term> <varname>depsBuildTargetPropagated</varname> </term> @@ -359,7 +359,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-depsHostHostPropagated"> <term> <varname>depsHostHostPropagated</varname> </term> @@ -369,7 +369,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-propagatedBuildInputs"> <term> <varname>propagatedBuildInputs</varname> </term> @@ -379,7 +379,7 @@ let f(h, h + 1, i) = i + h </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-depsTargetTargetPropagated"> <term> <varname>depsTargetTargetPropagated</varname> </term> @@ -396,7 +396,7 @@ let f(h, h + 1, i) = i + h <variablelist> <title>Variables affecting <literal>stdenv</literal> initialisation</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-NIX_DEBUG"> <term> <varname>NIX_DEBUG</varname> </term> @@ -410,7 +410,7 @@ let f(h, h + 1, i) = i + h <variablelist> <title>Attributes affecting build properties</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-enableParallelBuilding"> <term> <varname>enableParallelBuilding</varname> </term> @@ -427,7 +427,7 @@ let f(h, h + 1, i) = i + h <variablelist> <title>Special variables</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-passthru"> <term> <varname>passthru</varname> </term> @@ -504,7 +504,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] There are a number of variables that control what phases are executed and in what order: <variablelist> <title>Variables affecting phase control</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-phases"> <term> <varname>phases</varname> </term> @@ -517,7 +517,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-prePhases"> <term> <varname>prePhases</varname> </term> @@ -527,7 +527,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preConfigurePhases"> <term> <varname>preConfigurePhases</varname> </term> @@ -537,7 +537,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preBuildPhases"> <term> <varname>preBuildPhases</varname> </term> @@ -547,7 +547,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preInstallPhases"> <term> <varname>preInstallPhases</varname> </term> @@ -557,7 +557,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preFixupPhases"> <term> <varname>preFixupPhases</varname> </term> @@ -567,7 +567,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preDistPhases"> <term> <varname>preDistPhases</varname> </term> @@ -577,7 +577,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-postPhases"> <term> <varname>postPhases</varname> </term> @@ -635,7 +635,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] <variablelist> <title>Variables controlling the unpack phase</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-src"> <term> <varname>srcs</varname> / <varname>src</varname> </term> @@ -645,7 +645,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-sourceRoot"> <term> <varname>sourceRoot</varname> </term> @@ -655,7 +655,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-setSourceRoot"> <term> <varname>setSourceRoot</varname> </term> @@ -665,7 +665,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preUnpack"> <term> <varname>preUnpack</varname> </term> @@ -675,7 +675,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-postUnpack"> <term> <varname>postUnpack</varname> </term> @@ -685,7 +685,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontUnpack"> <term> <varname>dontUnpack</varname> </term> @@ -695,7 +695,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontMakeSourcesWritable"> <term> <varname>dontMakeSourcesWritable</varname> </term> @@ -705,7 +705,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-unpackCmd"> <term> <varname>unpackCmd</varname> </term> @@ -727,7 +727,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] <variablelist> <title>Variables controlling the patch phase</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontPatch"> <term> <varname>dontPatch</varname> </term> @@ -737,7 +737,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-patches"> <term> <varname>patches</varname> </term> @@ -747,7 +747,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-patchFlags"> <term> <varname>patchFlags</varname> </term> @@ -757,7 +757,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-prePatch"> <term> <varname>prePatch</varname> </term> @@ -767,7 +767,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-postPatch"> <term> <varname>postPatch</varname> </term> @@ -789,7 +789,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] <variablelist> <title>Variables controlling the configure phase</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-configureScript"> <term> <varname>configureScript</varname> </term> @@ -799,7 +799,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-configureFlags"> <term> <varname>configureFlags</varname> </term> @@ -809,7 +809,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontConfigure"> <term> <varname>dontConfigure</varname> </term> @@ -819,7 +819,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-configureFlagsArray"> <term> <varname>configureFlagsArray</varname> </term> @@ -829,7 +829,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontAddPrefix"> <term> <varname>dontAddPrefix</varname> </term> @@ -839,7 +839,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-prefix"> <term> <varname>prefix</varname> </term> @@ -849,7 +849,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-prefixKey"> <term> <varname>prefixKey</varname> </term> @@ -859,7 +859,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontAddDisableDepTrack"> <term> <varname>dontAddDisableDepTrack</varname> </term> @@ -869,7 +869,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontFixLibtool"> <term> <varname>dontFixLibtool</varname> </term> @@ -885,7 +885,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontDisableStatic"> <term> <varname>dontDisableStatic</varname> </term> @@ -898,7 +898,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-configurePlatforms"> <term> <varname>configurePlatforms</varname> </term> @@ -913,7 +913,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preConfigure"> <term> <varname>preConfigure</varname> </term> @@ -923,7 +923,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-postConfigure"> <term> <varname>postConfigure</varname> </term> @@ -945,7 +945,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] <variablelist> <title>Variables controlling the build phase</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontBuild"> <term> <varname>dontBuild</varname> </term> @@ -955,7 +955,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-makefile"> <term> <varname>makefile</varname> </term> @@ -965,7 +965,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-makeFlags"> <term> <varname>makeFlags</varname> </term> @@ -983,7 +983,7 @@ makeFlags = [ "PREFIX=$(out)" ]; </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-makeFlagsArray"> <term> <varname>makeFlagsArray</varname> </term> @@ -999,7 +999,7 @@ preBuild = '' </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-buildFlags"> <term> <varname>buildFlags</varname> / <varname>buildFlagsArray</varname> </term> @@ -1009,7 +1009,7 @@ preBuild = '' </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preBuild"> <term> <varname>preBuild</varname> </term> @@ -1019,7 +1019,7 @@ preBuild = '' </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-postBuild"> <term> <varname>postBuild</varname> </term> @@ -1049,7 +1049,7 @@ preBuild = '' <variablelist> <title>Variables controlling the check phase</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-doCheck"> <term> <varname>doCheck</varname> </term> @@ -1067,11 +1067,11 @@ preBuild = '' </term> <listitem> <para> - See the build phase for details. + See the <link xlink:href="#var-stdenv-makeFlags">build phase</link> for details. </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-checkTarget"> <term> <varname>checkTarget</varname> </term> @@ -1081,7 +1081,7 @@ preBuild = '' </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-checkFlags"> <term> <varname>checkFlags</varname> / <varname>checkFlagsArray</varname> </term> @@ -1091,7 +1091,7 @@ preBuild = '' </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-checkInputs"> <term> <varname>checkInputs</varname> </term> @@ -1101,7 +1101,7 @@ preBuild = '' </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preCheck"> <term> <varname>preCheck</varname> </term> @@ -1111,7 +1111,7 @@ preBuild = '' </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-postCheck"> <term> <varname>postCheck</varname> </term> @@ -1133,7 +1133,7 @@ preBuild = '' <variablelist> <title>Variables controlling the install phase</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontInstall"> <term> <varname>dontInstall</varname> </term> @@ -1149,11 +1149,11 @@ preBuild = '' </term> <listitem> <para> - See the build phase for details. + See the <link xlink:href="#var-stdenv-makeFlags">build phase</link> for details. </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-installTargets"> <term> <varname>installTargets</varname> </term> @@ -1165,7 +1165,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-installFlags"> <term> <varname>installFlags</varname> / <varname>installFlagsArray</varname> </term> @@ -1175,7 +1175,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preInstall"> <term> <varname>preInstall</varname> </term> @@ -1185,7 +1185,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-postInstall"> <term> <varname>postInstall</varname> </term> @@ -1229,7 +1229,7 @@ installTargets = "install-bin install-doc";</programlisting> <variablelist> <title>Variables controlling the fixup phase</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontFixup"> <term> <varname>dontFixup</varname> </term> @@ -1239,7 +1239,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontStrip"> <term> <varname>dontStrip</varname> </term> @@ -1249,7 +1249,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontStripHost"> <term> <varname>dontStripHost</varname> </term> @@ -1259,7 +1259,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontStripTarget"> <term> <varname>dontStripTarget</varname> </term> @@ -1269,7 +1269,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontMoveSbin"> <term> <varname>dontMoveSbin</varname> </term> @@ -1279,7 +1279,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-stripAllList"> <term> <varname>stripAllList</varname> </term> @@ -1289,7 +1289,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-stripAllFlags"> <term> <varname>stripAllFlags</varname> </term> @@ -1299,7 +1299,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-stripDebugList"> <term> <varname>stripDebugList</varname> </term> @@ -1309,7 +1309,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-stripDebugFlags"> <term> <varname>stripDebugFlags</varname> </term> @@ -1319,7 +1319,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontPatchELF"> <term> <varname>dontPatchELF</varname> </term> @@ -1329,7 +1329,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontPatchShebangs"> <term> <varname>dontPatchShebangs</varname> </term> @@ -1339,7 +1339,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontPruneLibtoolFiles"> <term> <varname>dontPruneLibtoolFiles</varname> </term> @@ -1349,7 +1349,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-forceShare"> <term> <varname>forceShare</varname> </term> @@ -1359,7 +1359,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-setupHook"> <term> <varname>setupHook</varname> </term> @@ -1370,7 +1370,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preFixup"> <term> <varname>preFixup</varname> </term> @@ -1380,7 +1380,7 @@ installTargets = "install-bin install-doc";</programlisting> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-postFixup"> <term> <varname>postFixup</varname> </term> @@ -1419,7 +1419,7 @@ set debug-file-directory ~/.nix-profile/lib/debug <variablelist> <title>Variables controlling the installCheck phase</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-doInstallCheck"> <term> <varname>doInstallCheck</varname> </term> @@ -1431,7 +1431,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-installCheckTarget"> <term> <varname>installCheckTarget</varname> </term> @@ -1441,7 +1441,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-installCheckFlags"> <term> <varname>installCheckFlags</varname> / <varname>installCheckFlagsArray</varname> </term> @@ -1451,7 +1451,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-installCheckInputs"> <term> <varname>installCheckInputs</varname> </term> @@ -1461,7 +1461,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preInstallCheck"> <term> <varname>preInstallCheck</varname> </term> @@ -1471,7 +1471,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-postInstallCheck"> <term> <varname>postInstallCheck</varname> </term> @@ -1493,7 +1493,7 @@ set debug-file-directory ~/.nix-profile/lib/debug <variablelist> <title>Variables controlling the distribution phase</title> - <varlistentry> + <varlistentry xml:id="var-stdenv-distTarget"> <term> <varname>distTarget</varname> </term> @@ -1503,7 +1503,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-distFlags"> <term> <varname>distFlags</varname> / <varname>distFlagsArray</varname> </term> @@ -1513,7 +1513,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-tarballs"> <term> <varname>tarballs</varname> </term> @@ -1523,7 +1523,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-dontCopyDist"> <term> <varname>dontCopyDist</varname> </term> @@ -1533,7 +1533,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-preDist"> <term> <varname>preDist</varname> </term> @@ -1543,7 +1543,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-stdenv-postDist"> <term> <varname>postDist</varname> </term> diff --git a/lib/modules.nix b/lib/modules.nix index c18fec66c70..55a53b3909a 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -58,6 +58,23 @@ rec { default = check; description = "Whether to check whether all option definitions have matching declarations."; }; + + _module.freeformType = mkOption { + # Disallow merging for now, but could be implemented nicely with a `types.optionType` + type = types.nullOr (types.uniq types.attrs); + internal = true; + default = null; + description = '' + If set, merge all definitions that don't have an associated option + together using this type. The result then gets combined with the + values of all declared options to produce the final <literal> + config</literal> value. + + If this is <literal>null</literal>, definitions without an option + will throw an error unless <option>_module.check</option> is + turned off. + ''; + }; }; config = { @@ -65,35 +82,44 @@ rec { }; }; - collected = collectModules - (specialArgs.modulesPath or "") - (modules ++ [ internalModule ]) - ({ inherit config options lib; } // specialArgs); - - options = mergeModules prefix (reverseList collected); - - # Traverse options and extract the option values into the final - # config set. At the same time, check whether all option - # definitions have matching declarations. - # !!! _module.check's value can't depend on any other config values - # without an infinite recursion. One way around this is to make the - # 'config' passed around to the modules be unconditionally unchecked, - # and only do the check in 'result'. - config = yieldConfig prefix options; - yieldConfig = prefix: set: - let res = removeAttrs (mapAttrs (n: v: - if isOption v then v.value - else yieldConfig (prefix ++ [n]) v) set) ["_definedNames"]; - in - if options._module.check.value && set ? _definedNames then - foldl' (res: m: - foldl' (res: name: - if set ? ${name} then res else throw "The option `${showOption (prefix ++ [name])}' defined in `${m.file}' does not exist.") - res m.names) - res set._definedNames - else - res; - result = { + merged = + let collected = collectModules + (specialArgs.modulesPath or "") + (modules ++ [ internalModule ]) + ({ inherit lib options config; } // specialArgs); + in mergeModules prefix (reverseList collected); + + options = merged.matchedOptions; + + config = + let + + # For definitions that have an associated option + declaredConfig = mapAttrsRecursiveCond (v: ! isOption v) (_: v: v.value) options; + + # If freeformType is set, this is for definitions that don't have an associated option + freeformConfig = + let + defs = map (def: { + file = def.file; + value = setAttrByPath def.prefix def.value; + }) merged.unmatchedDefns; + in if defs == [] then {} + else declaredConfig._module.freeformType.merge prefix defs; + + in if declaredConfig._module.freeformType == null then declaredConfig + # Because all definitions that had an associated option ended in + # declaredConfig, freeformConfig can only contain the non-option + # paths, meaning recursiveUpdate will never override any value + else recursiveUpdate freeformConfig declaredConfig; + + checkUnmatched = + if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then + let inherit (head merged.unmatchedDefns) file prefix; + in throw "The option `${showOption prefix}' defined in `${file}' does not exist." + else null; + + result = builtins.seq checkUnmatched { inherit options; config = removeAttrs config [ "_module" ]; inherit (config) _module; @@ -174,12 +200,16 @@ rec { /* Massage a module into canonical form, that is, a set consisting of ‘options’, ‘config’ and ‘imports’ attributes. */ unifyModuleSyntax = file: key: m: - let addMeta = config: if m ? meta - then mkMerge [ config { meta = m.meta; } ] - else config; + let + addMeta = config: if m ? meta + then mkMerge [ config { meta = m.meta; } ] + else config; + addFreeformType = config: if m ? freeformType + then mkMerge [ config { _module.freeformType = m.freeformType; } ] + else config; in if m ? config || m ? options then - let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta"]; in + let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta" "freeformType"]; in if badAttrs != {} then throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by introducing a top-level `config' or `options' attribute. Add configuration attributes immediately on the top level instead, or move all of them (namely: ${toString (attrNames badAttrs)}) into the explicit `config' attribute." else @@ -188,7 +218,7 @@ rec { disabledModules = m.disabledModules or []; imports = m.imports or []; options = m.options or {}; - config = addMeta (m.config or {}); + config = addFreeformType (addMeta (m.config or {})); } else { _file = m._file or file; @@ -196,7 +226,7 @@ rec { disabledModules = m.disabledModules or []; imports = m.require or [] ++ m.imports or []; options = {}; - config = addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports"]); + config = addFreeformType (addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports" "freeformType"])); }; applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then @@ -233,7 +263,23 @@ rec { declarations in all modules, combining them into a single set. At the same time, for each option declaration, it will merge the corresponding option definitions in all machines, returning them - in the ‘value’ attribute of each option. */ + in the ‘value’ attribute of each option. + + This returns a set like + { + # A recursive set of options along with their final values + matchedOptions = { + foo = { _type = "option"; value = "option value of foo"; ... }; + bar.baz = { _type = "option"; value = "option value of bar.baz"; ... }; + ... + }; + # A list of definitions that weren't matched by any option + unmatchedDefns = [ + { file = "file.nix"; prefix = [ "qux" ]; value = "qux"; } + ... + ]; + } + */ mergeModules = prefix: modules: mergeModules' prefix modules (concatMap (m: map (config: { file = m._file; inherit config; }) (pushDownProperties m.config)) modules); @@ -280,9 +326,9 @@ rec { defnsByName' = byName "config" (module: value: [{ inherit (module) file; inherit value; }] ) configs; - in - (flip mapAttrs declsByName (name: decls: - # We're descending into attribute ‘name’. + + resultsByName = flip mapAttrs declsByName (name: decls: + # We're descending into attribute ‘name’. let loc = prefix ++ [name]; defns = defnsByName.${name} or []; @@ -291,7 +337,10 @@ rec { in if nrOptions == length decls then let opt = fixupOptionType loc (mergeOptionDecls loc decls); - in evalOptionValue loc opt defns' + in { + matchedOptions = evalOptionValue loc opt defns'; + unmatchedDefns = []; + } else if nrOptions != 0 then let firstOption = findFirst (m: isOption m.options) "" decls; @@ -299,9 +348,27 @@ rec { in throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'." else - mergeModules' loc decls defns - )) - // { _definedNames = map (m: { inherit (m) file; names = attrNames m.config; }) configs; }; + mergeModules' loc decls defns); + + matchedOptions = mapAttrs (n: v: v.matchedOptions) resultsByName; + + # an attrset 'name' => list of unmatched definitions for 'name' + unmatchedDefnsByName = + # Propagate all unmatched definitions from nested option sets + mapAttrs (n: v: v.unmatchedDefns) resultsByName + # Plus the definitions for the current prefix that don't have a matching option + // removeAttrs defnsByName' (attrNames matchedOptions); + in { + inherit matchedOptions; + + # Transforms unmatchedDefnsByName into a list of definitions + unmatchedDefns = concatLists (mapAttrsToList (name: defs: + map (def: def // { + # Set this so we know when the definition first left unmatched territory + prefix = [name] ++ (def.prefix or []); + }) defs + ) unmatchedDefnsByName); + }; /* Merge multiple option declarations into a single declaration. In general, there should be only one declaration of each option. diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 6258244457a..943deebe3c0 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -210,6 +210,29 @@ checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-c checkConfigError 'The option value .* in .* is not of type .*' \ config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix +## Freeform modules +# Assigning without a declared option should work +checkConfigOutput 24 config.value ./freeform-attrsOf.nix ./define-value-string.nix +# No freeform assigments shouldn't make it error +checkConfigOutput '{ }' config ./freeform-attrsOf.nix +# but only if the type matches +checkConfigError 'The option value .* in .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix +# and properties should be applied +checkConfigOutput yes config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix +# Options should still be declarable, and be able to have a type that doesn't match the freeform type +checkConfigOutput false config.enable ./freeform-attrsOf.nix ./define-value-string.nix ./declare-enable.nix +checkConfigOutput 24 config.value ./freeform-attrsOf.nix ./define-value-string.nix ./declare-enable.nix +# and this should work too with nested values +checkConfigOutput false config.nest.foo ./freeform-attrsOf.nix ./freeform-nested.nix +checkConfigOutput bar config.nest.bar ./freeform-attrsOf.nix ./freeform-nested.nix +# Check whether a declared option can depend on an freeform-typed one +checkConfigOutput null config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix +checkConfigOutput 24 config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix ./define-value-string.nix +# Check whether an freeform-typed value can depend on a declared option, this can only work with lazyAttrsOf +checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix +checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix +checkConfigOutput 24 config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix + cat <<EOF ====== module tests ====== $pass Pass diff --git a/lib/tests/modules/define-value-string-properties.nix b/lib/tests/modules/define-value-string-properties.nix new file mode 100644 index 00000000000..972304c0112 --- /dev/null +++ b/lib/tests/modules/define-value-string-properties.nix @@ -0,0 +1,12 @@ +{ lib, ... }: { + + imports = [{ + value = lib.mkDefault "def"; + }]; + + value = lib.mkMerge [ + (lib.mkIf false "nope") + "yes" + ]; + +} diff --git a/lib/tests/modules/freeform-attrsOf.nix b/lib/tests/modules/freeform-attrsOf.nix new file mode 100644 index 00000000000..8cc577f38a6 --- /dev/null +++ b/lib/tests/modules/freeform-attrsOf.nix @@ -0,0 +1,3 @@ +{ lib, ... }: { + freeformType = with lib.types; attrsOf (either str (attrsOf str)); +} diff --git a/lib/tests/modules/freeform-lazyAttrsOf.nix b/lib/tests/modules/freeform-lazyAttrsOf.nix new file mode 100644 index 00000000000..36d6c0b13fc --- /dev/null +++ b/lib/tests/modules/freeform-lazyAttrsOf.nix @@ -0,0 +1,3 @@ +{ lib, ... }: { + freeformType = with lib.types; lazyAttrsOf (either str (lazyAttrsOf str)); +} diff --git a/lib/tests/modules/freeform-nested.nix b/lib/tests/modules/freeform-nested.nix new file mode 100644 index 00000000000..5da27f5a8b4 --- /dev/null +++ b/lib/tests/modules/freeform-nested.nix @@ -0,0 +1,7 @@ +{ lib, ... }: { + options.nest.foo = lib.mkOption { + type = lib.types.bool; + default = false; + }; + config.nest.bar = "bar"; +} diff --git a/lib/tests/modules/freeform-str-dep-unstr.nix b/lib/tests/modules/freeform-str-dep-unstr.nix new file mode 100644 index 00000000000..a2dfbc80cfa --- /dev/null +++ b/lib/tests/modules/freeform-str-dep-unstr.nix @@ -0,0 +1,8 @@ +{ lib, config, ... }: { + options.foo = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + }; + + config.foo = lib.mkIf (config ? value) config.value; +} diff --git a/lib/tests/modules/freeform-unstr-dep-str.nix b/lib/tests/modules/freeform-unstr-dep-str.nix new file mode 100644 index 00000000000..549d89afeca --- /dev/null +++ b/lib/tests/modules/freeform-unstr-dep-str.nix @@ -0,0 +1,8 @@ +{ lib, config, ... }: { + options.value = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + }; + + config.foo = lib.mkIf (config.value != null) config.value; +} diff --git a/lib/types.nix b/lib/types.nix index 6fd6de7e1fd..1845b6ae339 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -486,9 +486,15 @@ rec { else value ) defs; + freeformType = (evalModules { + inherit modules specialArgs; + args.name = "‹name›"; + })._module.freeformType; + in mkOptionType rec { name = "submodule"; + description = freeformType.description or name; check = x: isAttrs x || isFunction x || path.check x; merge = loc: defs: (evalModules { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23bd8026d01..cc3c6b2a221 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3042,12 +3042,6 @@ githubId = 313929; name = "Gabriel Ebner"; }; - geistesk = { - email = "post@0x21.biz"; - github = "geistesk"; - githubId = 8402811; - name = "Alvar Penning"; - }; genesis = { email = "ronan@aimao.org"; github = "bignaux"; @@ -3259,6 +3253,10 @@ github = "haozeke"; githubId = 4336207; name = "Rohit Goswami"; + keys = [{ + longkeyid = "rsa4096/0x9CCCE36402CB49A6"; + fingerprint = "74B1 F67D 8E43 A94A 7554 0768 9CCC E364 02CB 49A6"; + }]; }; haslersn = { email = "haslersn@fius.informatik.uni-stuttgart.de"; @@ -6202,6 +6200,16 @@ fingerprint = "514B B966 B46E 3565 0508 86E8 0E6C A66E 5C55 7AA8"; }]; }; + oxzi = { + email = "post@0x21.biz"; + github = "oxzi"; + githubId = 8402811; + name = "Alvar Penning"; + keys = [{ + longkeyid = "rsa4096/0xF32A45637FA25E31"; + fingerprint = "EB14 4E67 E57D 27E2 B5A4 CD8C F32A 4563 7FA2 5E31"; + }]; + }; oyren = { email = "m.scheuren@oyra.eu"; github = "oyren"; @@ -7940,6 +7948,12 @@ githubId = 332289; name = "Rafał Łasocha"; }; + syberant = { + email = "sybrand@neuralcoding.com"; + github = "syberant"; + githubId = 20063502; + name = "Sybrand Aarnoutse"; + }; symphorien = { email = "symphorien_nixpkgs@xlumurb.eu"; github = "symphorien"; @@ -8402,6 +8416,12 @@ githubId = 207457; name = "Matthieu Chevrier"; }; + trepetti = { + email = "trepetti@cs.columbia.edu"; + github = "trepetti"; + githubId = 25440339; + name = "Tom Repetti"; + }; trevorj = { email = "nix@trevor.joynson.io"; github = "akatrevorjay"; @@ -8729,6 +8749,14 @@ githubId = 13259982; name = "Vanessa McHale"; }; + + voidless = { + email = "julius.schmitt@yahoo.de"; + github = "voidIess"; + githubId = 45292658; + name = "Julius Schmitt"; + }; + volhovm = { email = "volhovm.cs@gmail.com"; github = "volhovm"; diff --git a/nixos/doc/manual/development/freeform-modules.xml b/nixos/doc/manual/development/freeform-modules.xml new file mode 100644 index 00000000000..257e6b11bf0 --- /dev/null +++ b/nixos/doc/manual/development/freeform-modules.xml @@ -0,0 +1,68 @@ +<section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-freeform-modules"> + <title>Freeform modules</title> + <para> + Freeform modules allow you to define values for option paths that have not been declared explicitly. This can be used to add attribute-specific types to what would otherwise have to be <literal>attrsOf</literal> options in order to accept all attribute names. + </para> + <para> + This feature can be enabled by using the attribute <literal>freeformType</literal> to define a freeform type. By doing this, all assignments without an associated option will be merged using the freeform type and combined into the resulting <literal>config</literal> set. Since this feature nullifies name checking for entire option trees, it is only recommended for use in submodules. + </para> + <example xml:id="ex-freeform-module"> + <title>Freeform submodule</title> + <para> + The following shows a submodule assigning a freeform type that allows arbitrary attributes with <literal>str</literal> values below <literal>settings</literal>, but also declares an option for the <literal>settings.port</literal> attribute to have it type-checked and assign a default value. See <xref linkend="ex-settings-typed-attrs"/> for a more complete example. + </para> + <programlisting> +{ lib, config, ... }: { + + options.settings = lib.mkOption { + type = lib.types.submodule { + + freeformType = with lib.types; attrsOf str; + + # We want this attribute to be checked for the correct type + options.port = lib.mkOption { + type = lib.types.port; + # Declaring the option also allows defining a default value + default = 8080; + }; + + }; + }; +} + </programlisting> + <para> + And the following shows what such a module then allows + </para> + <programlisting> +{ + # Not a declared option, but the freeform type allows this + settings.logLevel = "debug"; + + # Not allowed because the the freeform type only allows strings + # settings.enable = true; + + # Allowed because there is a port option declared + settings.port = 80; + + # Not allowed because the port option doesn't allow strings + # settings.port = "443"; +} + </programlisting> + </example> + <note> + <para> + Freeform attributes cannot depend on other attributes of the same set without infinite recursion: +<programlisting> +{ + # This throws infinite recursion encountered + settings.logLevel = lib.mkIf (config.settings.port == 80) "debug"; +} +</programlisting> + To prevent this, declare options for all attributes that need to depend on others. For above example this means to declare <literal>logLevel</literal> to be an option. + </para> + </note> +</section> diff --git a/nixos/doc/manual/development/settings-options.xml b/nixos/doc/manual/development/settings-options.xml index 84895adb444..c99c3af92f8 100644 --- a/nixos/doc/manual/development/settings-options.xml +++ b/nixos/doc/manual/development/settings-options.xml @@ -137,7 +137,7 @@ in { description = '' Configuration for foo, see <link xlink:href="https://example.com/docs/foo"/> - for supported values. + for supported settings. ''; }; }; @@ -167,13 +167,50 @@ in { # We know that the `user` attribute exists because we set a default value # for it above, allowing us to use it without worries here - users.users.${cfg.settings.user} = {} + users.users.${cfg.settings.user} = {}; # ... }; } </programlisting> </example> + <section xml:id="sec-settings-attrs-options"> + <title>Option declarations for attributes</title> + <para> + Some <literal>settings</literal> attributes may deserve some extra care. They may need a different type, default or merging behavior, or they are essential options that should show their documentation in the manual. This can be done using <xref linkend='sec-freeform-modules'/>. + <example xml:id="ex-settings-typed-attrs"> + <title>Declaring a type-checked <literal>settings</literal> attribute</title> + <para> + We extend above example using freeform modules to declare an option for the port, which will enforce it to be a valid integer and make it show up in the manual. + </para> +<programlisting> +settings = lib.mkOption { + type = lib.types.submodule { + + freeformType = settingsFormat.type; + + # Declare an option for the port such that the type is checked and this option + # is shown in the manual. + options.port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = '' + Which port this service should listen on. + ''; + }; + + }; + default = {}; + description = '' + Configuration for Foo, see + <link xlink:href="https://example.com/docs/foo"/> + for supported values. + ''; +}; +</programlisting> + </example> + </para> + </section> </section> </section> diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index 602f134f9cb..d244356dbed 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -183,5 +183,6 @@ in { <xi:include href="meta-attributes.xml" /> <xi:include href="importing-modules.xml" /> <xi:include href="replace-modules.xml" /> + <xi:include href="freeform-modules.xml" /> <xi:include href="settings-options.xml" /> </chapter> diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 36f3e7af873..b09f4ca47a3 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -63,8 +63,8 @@ in { fsType = "ext4"; configFile = pkgs.writeText "configuration.nix" '' - { - imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ]; + { modulesPath, ... }: { + imports = [ "''${modulesPath}/virtualisation/amazon-image.nix" ]; ${optionalString config.ec2.hvm '' ec2.hvm = true; ''} diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 873b8073fed..941ab78f863 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -27,6 +27,7 @@ with lib; fonts.fontconfig.enable = false; nixpkgs.overlays = singleton (const (super: { + cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; @@ -35,6 +36,7 @@ with lib; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; + qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; })); }; } diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh index 25106733087..2a6c3ab1149 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh +++ b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh @@ -1,4 +1,4 @@ -#! @shell@ -e +#! @runtimeShell@ -e # Shows the usage of this command to the user diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index 1fdd4627a90..c72ef6e9c28 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -1,4 +1,4 @@ -#! @shell@ +#! @runtimeShell@ set -e diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 0b62bca8367..e0252befdfd 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -1,4 +1,4 @@ -#! @shell@ +#! @runtimeShell@ set -e shopt -s nullglob diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 354274478a3..437199bae1d 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -1,6 +1,6 @@ -#! @shell@ +#! @runtimeShell@ -if [ -x "@shell@" ]; then export SHELL="@shell@"; fi; +if [ -x "@runtimeShell@" ]; then export SHELL="@runtimeShell@"; fi; set -e set -o pipefail diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index fb0fe26116a..f5e3f32b3c6 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -1,4 +1,4 @@ -#! @shell@ +#! @runtimeShell@ case "$1" in -h|--help) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 11128621424..1582f049309 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -14,11 +14,13 @@ let nixos-build-vms = makeProg { name = "nixos-build-vms"; src = ./nixos-build-vms/nixos-build-vms.sh; + inherit (pkgs) runtimeShell; }; nixos-install = makeProg { name = "nixos-install"; src = ./nixos-install.sh; + inherit (pkgs) runtimeShell; nix = config.nix.package.out; path = makeBinPath [ nixos-enter ]; }; @@ -28,6 +30,7 @@ let makeProg { name = "nixos-rebuild"; src = ./nixos-rebuild.sh; + inherit (pkgs) runtimeShell; nix = config.nix.package.out; nix_x86_64_linux = fallback.x86_64-linux; nix_i686_linux = fallback.i686-linux; @@ -50,6 +53,7 @@ let nixos-version = makeProg { name = "nixos-version"; src = ./nixos-version.sh; + inherit (pkgs) runtimeShell; inherit (config.system.nixos) version codeName revision; inherit (config.system) configurationRevision; json = builtins.toJSON ({ @@ -64,6 +68,7 @@ let nixos-enter = makeProg { name = "nixos-enter"; src = ./nixos-enter.sh; + inherit (pkgs) runtimeShell; }; in diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 4692ea32656..bdb7fa3b12c 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -198,7 +198,7 @@ in bosun = 161; kubernetes = 162; peerflix = 163; - chronos = 164; + #chronos = 164; # removed 2020-08-15 gitlab = 165; tox-bootstrapd = 166; cadvisor = 167; @@ -247,7 +247,7 @@ in bepasty = 215; # pumpio = 216; # unused, removed 2018-02-24 nm-openvpn = 217; - mathics = 218; + # mathics = 218; # unused, removed 2020-08-15 ejabberd = 219; postsrsd = 220; opendkim = 221; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2cc36078223..08ed6e63e72 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -466,14 +466,11 @@ ./services/misc/leaps.nix ./services/misc/lidarr.nix ./services/misc/mame.nix - ./services/misc/mathics.nix ./services/misc/matrix-appservice-discord.nix ./services/misc/matrix-synapse.nix ./services/misc/mautrix-telegram.nix ./services/misc/mbpfan.nix ./services/misc/mediatomb.nix - ./services/misc/mesos-master.nix - ./services/misc/mesos-slave.nix ./services/misc/metabase.nix ./services/misc/mwlib.nix ./services/misc/nix-daemon.nix @@ -786,10 +783,8 @@ ./services/networking/znc/default.nix ./services/printing/cupsd.nix ./services/scheduling/atd.nix - ./services/scheduling/chronos.nix ./services/scheduling/cron.nix ./services/scheduling/fcron.nix - ./services/scheduling/marathon.nix ./services/search/elasticsearch.nix ./services/search/elasticsearch-curator.nix ./services/search/hound.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index cfe216d512b..ef7e3354112 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -17,8 +17,11 @@ with lib; (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]) # Completely removed modules + (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") + (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed") @@ -28,6 +31,7 @@ with lib; (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") (mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed") (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") + (mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed") (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] '' diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index a0fadb018ec..2def74f8535 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -160,8 +160,11 @@ in config = { security.wrappers = { + # These are mount related wrappers that require the +s permission. fusermount.source = "${pkgs.fuse}/bin/fusermount"; fusermount3.source = "${pkgs.fuse3}/bin/fusermount3"; + mount.source = "${lib.getBin pkgs.utillinux}/bin/mount"; + umount.source = "${lib.getBin pkgs.utillinux}/bin/umount"; }; boot.specialFileSystems.${parentWrapperDir} = { diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index d791b387665..00d9eaad9eb 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -15,26 +15,27 @@ let fi ''; -desktopApplicationFile = pkgs.writeTextFile { - name = "emacsclient.desktop"; - destination = "/share/applications/emacsclient.desktop"; - text = '' -[Desktop Entry] -Name=Emacsclient -GenericName=Text Editor -Comment=Edit text -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=emacseditor %F -Icon=emacs -Type=Application -Terminal=false -Categories=Development;TextEditor; -StartupWMClass=Emacs -Keywords=Text;Editor; -''; -}; - -in { + desktopApplicationFile = pkgs.writeTextFile { + name = "emacsclient.desktop"; + destination = "/share/applications/emacsclient.desktop"; + text = '' + [Desktop Entry] + Name=Emacsclient + GenericName=Text Editor + Comment=Edit text + MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; + Exec=emacseditor %F + Icon=emacs + Type=Application + Terminal=false + Categories=Development;TextEditor; + StartupWMClass=Emacs + Keywords=Text;Editor; + ''; + }; + +in +{ options.services.emacs = { enable = mkOption { @@ -86,10 +87,10 @@ in { description = "Emacs: the extensible, self-documenting text editor"; serviceConfig = { - Type = "forking"; + Type = "forking"; ExecStart = "${pkgs.bash}/bin/bash -c 'source ${config.system.build.setEnvironment}; exec ${cfg.package}/bin/emacs --daemon'"; - ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)"; - Restart = "always"; + ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)"; + Restart = "always"; }; } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index fa393de3219..5d8de3b1bbd 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -696,7 +696,6 @@ in { "L+ /run/gitlab/shell-config.yml - - - - ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)}" "L+ ${cfg.statePath}/config/unicorn.rb - - - - ${./defaultUnicornConfig.rb}" - "L+ ${cfg.statePath}/config/initializers/extra-gitlab.rb - - - - ${extraGitlabRb}" ]; systemd.services.gitlab-sidekiq = { @@ -816,6 +815,7 @@ in { rm -f ${cfg.statePath}/lib cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db + ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb ${cfg.packages.gitlab-shell}/bin/install diff --git a/nixos/modules/services/misc/mathics.nix b/nixos/modules/services/misc/mathics.nix deleted file mode 100644 index c588a30d76c..00000000000 --- a/nixos/modules/services/misc/mathics.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, lib, config, ... }: - -with lib; - -let - cfg = config.services.mathics; - -in { - options = { - services.mathics = { - enable = mkEnableOption "Mathics notebook service"; - - external = mkOption { - type = types.bool; - default = false; - description = "Listen on all interfaces, rather than just localhost?"; - }; - - port = mkOption { - type = types.int; - default = 8000; - description = "TCP port to listen on."; - }; - }; - }; - - config = mkIf cfg.enable { - - users.users.mathics = { - group = config.users.groups.mathics.name; - description = "Mathics user"; - home = "/var/lib/mathics"; - createHome = true; - uid = config.ids.uids.mathics; - }; - - users.groups.mathics.gid = config.ids.gids.mathics; - - systemd.services.mathics = { - description = "Mathics notebook server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - User = config.users.users.mathics.name; - Group = config.users.groups.mathics.name; - ExecStart = concatStringsSep " " [ - "${pkgs.mathics}/bin/mathicsserver" - "--port" (toString cfg.port) - (if cfg.external then "--external" else "") - ]; - }; - }; - }; -} diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix deleted file mode 100644 index 572a9847e46..00000000000 --- a/nixos/modules/services/misc/mesos-master.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.mesos.master; - -in { - - options.services.mesos = { - - master = { - enable = mkOption { - description = "Whether to enable the Mesos Master."; - default = false; - type = types.bool; - }; - - ip = mkOption { - description = "IP address to listen on."; - default = "0.0.0.0"; - type = types.str; - }; - - port = mkOption { - description = "Mesos Master port"; - default = 5050; - type = types.int; - }; - - advertiseIp = mkOption { - description = "IP address advertised to reach this master."; - default = null; - type = types.nullOr types.str; - }; - - advertisePort = mkOption { - description = "Port advertised to reach this Mesos master."; - default = null; - type = types.nullOr types.int; - }; - - zk = mkOption { - description = '' - ZooKeeper URL (used for leader election amongst masters). - May be one of: - zk://host1:port1,host2:port2,.../mesos - zk://username:password@host1:port1,host2:port2,.../mesos - ''; - type = types.str; - }; - - workDir = mkOption { - description = "The Mesos work directory."; - default = "/var/lib/mesos/master"; - type = types.str; - }; - - extraCmdLineOptions = mkOption { - description = '' - Extra command line options for Mesos Master. - - See https://mesos.apache.org/documentation/latest/configuration/ - ''; - default = [ "" ]; - type = types.listOf types.str; - example = [ "--credentials=VALUE" ]; - }; - - quorum = mkOption { - description = '' - The size of the quorum of replicas when using 'replicated_log' based - registry. It is imperative to set this value to be a majority of - masters i.e., quorum > (number of masters)/2. - - If 0 will fall back to --registry=in_memory. - ''; - default = 0; - type = types.int; - }; - - logLevel = mkOption { - description = '' - The logging level used. Possible values: - 'INFO', 'WARNING', 'ERROR' - ''; - default = "INFO"; - type = types.str; - }; - - }; - - - }; - - - config = mkIf cfg.enable { - systemd.tmpfiles.rules = [ - "d '${cfg.workDir}' 0700 - - - -" - ]; - systemd.services.mesos-master = { - description = "Mesos Master"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - ExecStart = '' - ${pkgs.mesos}/bin/mesos-master \ - --ip=${cfg.ip} \ - --port=${toString cfg.port} \ - ${optionalString (cfg.advertiseIp != null) "--advertise_ip=${cfg.advertiseIp}"} \ - ${optionalString (cfg.advertisePort != null) "--advertise_port=${toString cfg.advertisePort}"} \ - ${if cfg.quorum == 0 - then "--registry=in_memory" - else "--zk=${cfg.zk} --registry=replicated_log --quorum=${toString cfg.quorum}"} \ - --work_dir=${cfg.workDir} \ - --logging_level=${cfg.logLevel} \ - ${toString cfg.extraCmdLineOptions} - ''; - Restart = "on-failure"; - }; - }; - }; - -} - diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix deleted file mode 100644 index 170065d0065..00000000000 --- a/nixos/modules/services/misc/mesos-slave.nix +++ /dev/null @@ -1,220 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.mesos.slave; - - mkAttributes = - attrs: concatStringsSep ";" (mapAttrsToList - (k: v: "${k}:${v}") - (filterAttrs (k: v: v != null) attrs)); - attribsArg = optionalString (cfg.attributes != {}) - "--attributes=${mkAttributes cfg.attributes}"; - - containerizersArg = concatStringsSep "," ( - lib.unique ( - cfg.containerizers ++ (optional cfg.withDocker "docker") - ) - ); - - imageProvidersArg = concatStringsSep "," ( - lib.unique ( - cfg.imageProviders ++ (optional cfg.withDocker "docker") - ) - ); - - isolationArg = concatStringsSep "," ( - lib.unique ( - cfg.isolation ++ (optionals cfg.withDocker [ "filesystem/linux" "docker/runtime"]) - ) - ); - -in { - - options.services.mesos = { - slave = { - enable = mkOption { - description = "Whether to enable the Mesos Slave."; - default = false; - type = types.bool; - }; - - ip = mkOption { - description = "IP address to listen on."; - default = "0.0.0.0"; - type = types.str; - }; - - port = mkOption { - description = "Port to listen on."; - default = 5051; - type = types.int; - }; - - advertiseIp = mkOption { - description = "IP address advertised to reach this agent."; - default = null; - type = types.nullOr types.str; - }; - - advertisePort = mkOption { - description = "Port advertised to reach this agent."; - default = null; - type = types.nullOr types.int; - }; - - containerizers = mkOption { - description = '' - List of containerizer implementations to compose in order to provide - containerization. Available options are mesos and docker. - The order the containerizers are specified is the order they are tried. - ''; - default = [ "mesos" ]; - type = types.listOf types.str; - }; - - imageProviders = mkOption { - description = "List of supported image providers, e.g., APPC,DOCKER."; - default = [ ]; - type = types.listOf types.str; - }; - - imageProvisionerBackend = mkOption { - description = '' - Strategy for provisioning container rootfs from images, - e.g., aufs, bind, copy, overlay. - ''; - default = "copy"; - type = types.str; - }; - - isolation = mkOption { - description = '' - Isolation mechanisms to use, e.g., posix/cpu,posix/mem, or - cgroups/cpu,cgroups/mem, or network/port_mapping, or `gpu/nvidia` for nvidia - specific gpu isolation. - ''; - default = [ "posix/cpu" "posix/mem" ]; - type = types.listOf types.str; - }; - - master = mkOption { - description = '' - May be one of: - zk://host1:port1,host2:port2,.../path - zk://username:password@host1:port1,host2:port2,.../path - ''; - type = types.str; - }; - - withHadoop = mkOption { - description = "Add the HADOOP_HOME to the slave."; - default = false; - type = types.bool; - }; - - withDocker = mkOption { - description = "Enable the docker containerizer."; - default = config.virtualisation.docker.enable; - type = types.bool; - }; - - dockerRegistry = mkOption { - description = '' - The default url for pulling Docker images. - It could either be a Docker registry server url, - or a local path in which Docker image archives are stored. - ''; - default = null; - type = types.nullOr (types.either types.str types.path); - }; - - workDir = mkOption { - description = "The Mesos work directory."; - default = "/var/lib/mesos/slave"; - type = types.str; - }; - - extraCmdLineOptions = mkOption { - description = '' - Extra command line options for Mesos Slave. - - See https://mesos.apache.org/documentation/latest/configuration/ - ''; - default = [ "" ]; - type = types.listOf types.str; - example = [ "--gc_delay=3days" ]; - }; - - logLevel = mkOption { - description = '' - The logging level used. Possible values: - 'INFO', 'WARNING', 'ERROR' - ''; - default = "INFO"; - type = types.str; - }; - - attributes = mkOption { - description = '' - Machine attributes for the slave instance. - - Use caution when changing this; you may need to manually reset slave - metadata before the slave can re-register. - ''; - default = {}; - type = types.attrsOf types.str; - example = { rack = "aa"; - host = "aabc123"; - os = "nixos"; }; - }; - - executorEnvironmentVariables = mkOption { - description = '' - The environment variables that should be passed to the executor, and thus subsequently task(s). - ''; - default = { - PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"; - }; - type = types.attrsOf types.str; - }; - }; - - }; - - config = mkIf cfg.enable { - systemd.tmpfiles.rules = [ - "d '${cfg.workDir}' 0701 - - - -" - ]; - systemd.services.mesos-slave = { - description = "Mesos Slave"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ; - path = [ pkgs.runtimeShellPackage ]; - serviceConfig = { - ExecStart = '' - ${pkgs.mesos}/bin/mesos-slave \ - --containerizers=${containerizersArg} \ - --image_providers=${imageProvidersArg} \ - --image_provisioner_backend=${cfg.imageProvisionerBackend} \ - --isolation=${isolationArg} \ - --ip=${cfg.ip} \ - --port=${toString cfg.port} \ - ${optionalString (cfg.advertiseIp != null) "--advertise_ip=${cfg.advertiseIp}"} \ - ${optionalString (cfg.advertisePort != null) "--advertise_port=${toString cfg.advertisePort}"} \ - --master=${cfg.master} \ - --work_dir=${cfg.workDir} \ - --logging_level=${cfg.logLevel} \ - ${attribsArg} \ - ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \ - ${optionalString cfg.withDocker "--docker=${pkgs.docker}/libexec/docker/docker"} \ - ${optionalString (cfg.dockerRegistry != null) "--docker_registry=${cfg.dockerRegistry}"} \ - --executor_environment_variables=${lib.escapeShellArg (builtins.toJSON cfg.executorEnvironmentVariables)} \ - ${toString cfg.extraCmdLineOptions} - ''; - }; - }; - }; - -} diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 26ddd4e811e..ccb34163d5f 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -129,13 +129,17 @@ in { systemd.services."kresd@".serviceConfig = { ExecStart = "${package}/bin/kresd --noninteractive " + "-c ${package}/lib/knot-resolver/distro-preconfig.lua -c ${configFile}"; - # Ensure correct ownership in case UID or GID changes. + # Ensure /run/knot-resolver exists + RuntimeDirectory = "knot-resolver"; + RuntimeDirectoryMode = "0770"; + # Ensure /var/lib/knot-resolver exists + StateDirectory = "knot-resolver"; + StateDirectoryMode = "0770"; + # Ensure /var/cache/knot-resolver exists CacheDirectory = "knot-resolver"; - CacheDirectoryMode = "0750"; + CacheDirectoryMode = "0770"; }; - systemd.tmpfiles.packages = [ package ]; - # Try cleaning up the previously default location of cache file. # Note that /var/cache/* should always be safe to remove. # TODO: remove later, probably between 20.09 and 21.03 diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix deleted file mode 100644 index 9a8ed4c09ac..00000000000 --- a/nixos/modules/services/scheduling/chronos.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.chronos; - -in { - - ###### interface - - options.services.chronos = { - enable = mkOption { - description = "Whether to enable graphite web frontend."; - default = false; - type = types.bool; - }; - - httpPort = mkOption { - description = "Chronos listening port"; - default = 4400; - type = types.int; - }; - - master = mkOption { - description = "Chronos mesos master zookeeper address"; - default = "zk://${head cfg.zookeeperHosts}/mesos"; - type = types.str; - }; - - zookeeperHosts = mkOption { - description = "Chronos mesos zookepper addresses"; - default = [ "localhost:2181" ]; - type = types.listOf types.str; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - systemd.services.chronos = { - description = "Chronos Service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "zookeeper.service" ]; - - serviceConfig = { - ExecStart = "${pkgs.chronos}/bin/chronos --master ${cfg.master} --zk_hosts ${concatStringsSep "," cfg.zookeeperHosts} --http_port ${toString cfg.httpPort}"; - User = "chronos"; - }; - }; - - users.users.chronos.uid = config.ids.uids.chronos; - }; -} diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix deleted file mode 100644 index 2e0d20c64b2..00000000000 --- a/nixos/modules/services/scheduling/marathon.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.marathon; - -in { - - ###### interface - - options.services.marathon = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the marathon mesos framework. - ''; - }; - - master = mkOption { - type = types.str; - default = "zk://${concatStringsSep "," cfg.zookeeperHosts}/mesos"; - example = "zk://1.2.3.4:2181,2.3.4.5:2181,3.4.5.6:2181/mesos"; - description = '' - Mesos master address. See <link xlink:href="https://mesosphere.github.io/marathon/docs/"/> for details. - ''; - }; - - zookeeperHosts = mkOption { - type = types.listOf types.str; - default = [ "localhost:2181" ]; - example = [ "1.2.3.4:2181" "2.3.4.5:2181" "3.4.5.6:2181" ]; - description = '' - ZooKeeper hosts' addresses. - ''; - }; - - user = mkOption { - type = types.str; - default = "marathon"; - example = "root"; - description = '' - The user that the Marathon framework will be launched as. If the user doesn't exist it will be created. - If you want to run apps that require root access or you want to launch apps using arbitrary users, that - is using the `--mesos_user` flag then you need to change this to `root`. - ''; - }; - - httpPort = mkOption { - type = types.int; - default = 8080; - description = '' - Marathon listening port for HTTP connections. - ''; - }; - - extraCmdLineOptions = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "--https_port=8443" "--zk_timeout=10000" "--marathon_store_timeout=2000" ]; - description = '' - Extra command line options to pass to Marathon. - See <link xlink:href="https://mesosphere.github.io/marathon/docs/command-line-flags.html"/> for all possible flags. - ''; - }; - - environment = mkOption { - default = { }; - type = types.attrs; - example = { JAVA_OPTS = "-Xmx512m"; MESOSPHERE_HTTP_CREDENTIALS = "username:password"; }; - description = '' - Environment variables passed to Marathon. - ''; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - systemd.services.marathon = { - description = "Marathon Service"; - environment = cfg.environment; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "zookeeper.service" "mesos-master.service" "mesos-slave.service" ]; - - serviceConfig = { - ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${concatStringsSep "," cfg.zookeeperHosts}/marathon --http_port ${toString cfg.httpPort} ${concatStringsSep " " cfg.extraCmdLineOptions}"; - User = cfg.user; - Restart = "always"; - RestartSec = "2"; - }; - }; - - users.users.${cfg.user}.isSystemUser = true; - }; -} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index d9660852528..7da119758fc 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -47,8 +47,18 @@ let in { imports = [ - ( mkRemovedOptionModule [ "services" "nextcloud" "nginx" "enable" ] - "The nextcloud module dropped support for other webservers than nginx.") + (mkRemovedOptionModule [ "services" "nextcloud" "nginx" "enable" ] '' + The nextcloud module supports `nginx` as reverse-proxy by default and doesn't + support other reverse-proxies officially. + + However it's possible to use an alternative reverse-proxy by + + * disabling nginx + * setting `listen.owner` & `listen.group` in the phpfpm-pool to a different value + + Further details about this can be found in the `Nextcloud`-section of the NixOS-manual + (which can be openend e.g. by running `nixos-help`). + '') ]; options.services.nextcloud = { @@ -544,36 +554,40 @@ in { ''; }; "/" = { - priority = 200; - extraConfig = "rewrite ^ /index.php;"; + priority = 900; + extraConfig = "try_files $uri $uri/ /index.php$request_uri;"; }; "~ ^/store-apps" = { priority = 201; extraConfig = "root ${cfg.home};"; }; - "= /.well-known/carddav" = { + "^~ /.well-known" = { priority = 210; - extraConfig = "return 301 $scheme://$host/remote.php/dav;"; - }; - "= /.well-known/caldav" = { - priority = 210; - extraConfig = "return 301 $scheme://$host/remote.php/dav;"; - }; - "~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = { - priority = 300; - extraConfig = "deny all;"; - }; - "~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = { - priority = 300; - extraConfig = "deny all;"; + extraConfig = '' + location = /.well-known/carddav { + return 301 $scheme://$host/remote.php/dav; + } + location = /.well-known/caldav { + return 301 $scheme://$host/remote.php/dav; + } + try_files $uri $uri/ =404; + ''; }; - "~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = { + "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)".extraConfig = '' + return 404; + ''; + "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = '' + return 404; + ''; + "~ \\.php(?:$|/)" = { priority = 500; extraConfig = '' include ${config.services.nginx.package}/conf/fastcgi.conf; - fastcgi_split_path_info ^(.+\.php)(\\/.*)$; + fastcgi_split_path_info ^(.+?\.php)(\\/.*)$; + set $path_info $fastcgi_path_info; try_files $fastcgi_script_name =404; - fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param PATH_INFO $path_info; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; fastcgi_param modHeadersAvailable true; fastcgi_param front_controller_active true; @@ -583,28 +597,24 @@ in { fastcgi_read_timeout 120s; ''; }; - "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' - try_files $uri/ =404; - index index.php; - ''; - "~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = '' + "~ \\.(?:css|js|svg|gif|map)$".extraConfig = '' try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463"; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options sameorigin; - add_header Referrer-Policy no-referrer; + expires 6M; access_log off; ''; - "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' + "~ \\.woff2?$".extraConfig = '' try_files $uri /index.php$request_uri; + expires 7d; access_log off; ''; + "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' + try_files $uri/ =404; + index index.php; + ''; }; extraConfig = '' + index index.php index.html /index.php$request_uri; + expires 1m; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; @@ -613,8 +623,6 @@ in { add_header X-Frame-Options sameorigin; 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}; fastcgi_buffers 64 4K; fastcgi_hide_header X-Powered-By; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index f8b92244c89..02e4dba2861 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -123,6 +123,61 @@ </para> </section> + <section xml:id="module-services-nextcloud-httpd"> + <title>Using an alternative webserver as reverse-proxy (e.g. <literal>httpd</literal>)</title> + <para> + By default, <package>nginx</package> is used as reverse-proxy for <package>nextcloud</package>. + However, it's possible to use e.g. <package>httpd</package> by explicitly disabling + <package>nginx</package> using <xref linkend="opt-services.nginx.enable" /> and fixing the + settings <literal>listen.owner</literal> & <literal>listen.group</literal> in the + <link linkend="opt-services.phpfpm.pools">corresponding <literal>phpfpm</literal> pool</link>. + </para> + <para> + An exemplary configuration may look like this: +<programlisting>{ config, lib, pkgs, ... }: { + <link linkend="opt-services.nginx.enable">services.nginx.enable</link> = false; + services.nextcloud = { + <link linkend="opt-services.nextcloud.enable">enable</link> = true; + <link linkend="opt-services.nextcloud.hostName">hostName</link> = "localhost"; + + /* further, required options */ + }; + <link linkend="opt-services.phpfpm.pools._name_.settings">services.phpfpm.pools.nextcloud.settings</link> = { + "listen.owner" = config.services.httpd.user; + "listen.group" = config.services.httpd.group; + }; + services.httpd = { + <link linkend="opt-services.httpd.enable">enable</link> = true; + <link linkend="opt-services.httpd.adminAddr">adminAddr</link> = "webmaster@localhost"; + <link linkend="opt-services.httpd.extraModules">extraModules</link> = [ "proxy_fcgi" ]; + virtualHosts."localhost" = { + <link linkend="opt-services.httpd.virtualHosts._name_.documentRoot">documentRoot</link> = config.services.nextcloud.package; + <link linkend="opt-services.httpd.virtualHosts._name_.extraConfig">extraConfig</link> = '' + <Directory "${config.services.nextcloud.package}"> + <FilesMatch "\.php$"> + <If "-f %{REQUEST_FILENAME}"> + SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud.socket}|fcgi://localhost/" + </If> + </FilesMatch> + <IfModule mod_rewrite.c> + RewriteEngine On + RewriteBase / + RewriteRule ^index\.php$ - [L] + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule . /index.php [L] + </IfModule> + DirectoryIndex index.php + Require all granted + Options +FollowSymLinks + </Directory> + ''; + }; + }; +}</programlisting> + </para> + </section> + <section xml:id="module-services-nextcloud-maintainer-info"> <title>Maintainer information</title> diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index 65dcdbed000..894271d1e55 100644 --- a/nixos/modules/services/web-servers/unit/default.nix +++ b/nixos/modules/services/web-servers/unit/default.nix @@ -120,9 +120,12 @@ in { ProtectHome = true; PrivateTmp = true; PrivateDevices = true; + PrivateUsers = false; ProtectHostname = true; + ProtectClock = true; ProtectKernelTunables = true; ProtectKernelModules = true; + ProtectKernelLogs = true; ProtectControlGroups = true; RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; LockPersonality = true; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 39be069ad0e..b215392f250 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -81,10 +81,6 @@ let "systemd-coredump.socket" "systemd-coredump@.service" - # SysV init compatibility. - "systemd-initctl.socket" - "systemd-initctl.service" - # Kernel module loading. "systemd-modules-load.service" "kmod-static-nodes.service" @@ -1012,18 +1008,18 @@ in "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; - "tmpfiles.d".source = (pkgs.symlinkJoin { + "tmpfiles.d".source = pkgs.symlinkJoin { name = "tmpfiles.d"; - paths = cfg.tmpfiles.packages; + paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages; postBuild = '' for i in $(cat $pathsPath); do - (test -d $i/lib/tmpfiles.d && test $(ls $i/lib/tmpfiles.d/*.conf | wc -l) -ge 1) || ( - echo "ERROR: The path $i was passed to systemd.tmpfiles.packages but either does not contain the folder lib/tmpfiles.d or if it contains that folder, there are no files ending in .conf in it." + (test -d "$i" && test $(ls "$i"/*.conf | wc -l) -ge 1) || ( + echo "ERROR: The path '$i' from systemd.tmpfiles.packages contains no *.conf files." exit 1 ) done ''; - }) + "/lib/tmpfiles.d"; + }; "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index c9d9c6c1657..9ca7c6fb343 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -191,13 +191,14 @@ in }; requestEncryptionCredentials = mkOption { - type = types.bool; + type = types.either types.bool (types.listOf types.str); default = true; + example = [ "tank" "data" ]; description = '' - Request encryption keys or passwords for all encrypted datasets on import. - For root pools the encryption key can be supplied via both an - interactive prompt (keylocation=prompt) and from a file - (keylocation=file://). + If true on import encryption keys or passwords for all encrypted datasets + are requested. To only decrypt selected datasets supply a list of dataset + names instead. For root pools the encryption key can be supplied via both + an interactive prompt (keylocation=prompt) and from a file (keylocation=file://). ''; }; @@ -419,9 +420,13 @@ in fi poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. fi - ${lib.optionalString cfgZfs.requestEncryptionCredentials '' - zfs load-key -a - ''} + ${if isBool cfgZfs.requestEncryptionCredentials + then optionalString cfgZfs.requestEncryptionCredentials '' + zfs load-key -a + '' + else concatMapStrings (fs: '' + zfs load-key ${fs} + '') cfgZfs.requestEncryptionCredentials} '') rootPools)); }; @@ -517,9 +522,16 @@ in done poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. if poolImported "${pool}"; then - ${optionalString cfgZfs.requestEncryptionCredentials '' + ${optionalString (if isBool cfgZfs.requestEncryptionCredentials + then cfgZfs.requestEncryptionCredentials + else cfgZfs.requestEncryptionCredentials != []) '' ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do - (case "$kl" in + (${optionalString (!isBool cfgZfs.requestEncryptionCredentials) '' + if ! echo '${concatStringsSep "\n" cfgZfs.requestEncryptionCredentials}' | grep -qFx "$ds"; then + continue + fi + ''} + case "$kl" in none ) ;; prompt ) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 1baeab53b0c..a6b34e36d20 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -55,7 +55,12 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; systemd.services."serial-getty@hvc0".enable = false; # Only use a serial console, no TTY. - virtualisation.qemu.consoles = [ qemuSerialDevice ]; + # NOTE: optionalAttrs + # test-instrumentation.nix appears to be used without qemu-vm.nix, so + # we avoid defining consoles if not possible. + # TODO: refactor such that test-instrumentation can import qemu-vm + # or declare virtualisation.qemu.console option in a module that's always imported + virtualisation = lib.optionalAttrs (options ? virtualisation.qemu.consoles) { qemu.consoles = [ qemuSerialDevice ]; }; boot.initrd.preDeviceCommands = '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 10432e1cb52..a4a62d85a59 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -195,12 +195,10 @@ in mailcatcher = handleTest ./mailcatcher.nix {}; mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {}; mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {}; - mathics = handleTest ./mathics.nix {}; matomo = handleTest ./matomo.nix {}; matrix-synapse = handleTest ./matrix-synapse.nix {}; mediawiki = handleTest ./mediawiki.nix {}; memcached = handleTest ./memcached.nix {}; - mesos = handleTest ./mesos.nix {}; metabase = handleTest ./metabase.nix {}; miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; diff --git a/nixos/tests/mathics.nix b/nixos/tests/mathics.nix deleted file mode 100644 index fcbeeb18a72..00000000000 --- a/nixos/tests/mathics.nix +++ /dev/null @@ -1,20 +0,0 @@ -import ./make-test.nix ({ pkgs, ... }: { - name = "mathics"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ benley ]; - }; - - nodes = { - machine = { ... }: { - services.mathics.enable = true; - services.mathics.port = 8888; - }; - }; - - testScript = '' - startAll; - $machine->waitForUnit("mathics.service"); - $machine->waitForOpenPort(8888); - $machine->succeed("curl http://localhost:8888/"); - ''; -}) diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix deleted file mode 100644 index 2e6dc0eda06..00000000000 --- a/nixos/tests/mesos.nix +++ /dev/null @@ -1,92 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : rec { - name = "mesos"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline kamilchm cstrahan ]; - }; - - nodes = { - master = { ... }: { - networking.firewall.enable = false; - services.zookeeper.enable = true; - services.mesos.master = { - enable = true; - zk = "zk://master:2181/mesos"; - }; - }; - - slave = { ... }: { - networking.firewall.enable = false; - networking.nat.enable = true; - virtualisation.docker.enable = true; - services.mesos = { - slave = { - enable = true; - master = "master:5050"; - dockerRegistry = registry; - executorEnvironmentVariables = { - PATH = "/run/current-system/sw/bin"; - }; - }; - }; - }; - }; - - simpleDocker = pkgs.dockerTools.buildImage { - name = "echo"; - tag = "latest"; - contents = [ pkgs.stdenv.shellPackage pkgs.coreutils ]; - config = { - Env = [ - # When shell=true, mesos invokes "sh -c '<cmd>'", so make sure "sh" is - # on the PATH. - "PATH=${pkgs.stdenv.shellPackage}/bin:${pkgs.coreutils}/bin" - ]; - Entrypoint = [ "echo" ]; - }; - }; - - registry = pkgs.runCommand "registry" { } '' - mkdir -p $out - cp ${simpleDocker} $out/echo:latest.tar - ''; - - testFramework = pkgs.pythonPackages.buildPythonPackage { - name = "mesos-tests"; - propagatedBuildInputs = [ pkgs.mesos ]; - catchConflicts = false; - src = ./mesos_test.py; - phases = [ "installPhase" "fixupPhase" ]; - installPhase = '' - install -Dvm 0755 $src $out/bin/mesos_test.py - - echo "done" > test.result - tar czf $out/test.tar.gz test.result - ''; - }; - - testScript = - '' - startAll; - $master->waitForUnit("zookeeper.service"); - $master->waitForUnit("mesos-master.service"); - $slave->waitForUnit("docker.service"); - $slave->waitForUnit("mesos-slave.service"); - $master->waitForOpenPort(2181); - $master->waitForOpenPort(5050); - $slave->waitForOpenPort(5051); - - # is slave registered? - $master->waitUntilSucceeds("curl -s --fail http://master:5050/master/slaves". - " | grep -q \"\\\"hostname\\\":\\\"slave\\\"\""); - - # try to run docker image - $master->succeed("${pkgs.mesos}/bin/mesos-execute --master=master:5050". - " --resources=\"cpus:0.1;mem:32\" --name=simple-docker". - " --containerizer=mesos --docker_image=echo:latest". - " --shell=true --command=\"echo done\" | grep -q TASK_FINISHED"); - - # simple command with .tar.gz uri - $master->succeed("${testFramework}/bin/mesos_test.py master ". - "${testFramework}/test.tar.gz"); - ''; -}) diff --git a/nixos/tests/mesos_test.py b/nixos/tests/mesos_test.py deleted file mode 100644 index be8bb32e49a..00000000000 --- a/nixos/tests/mesos_test.py +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python -import uuid -import time -import subprocess -import os - -import sys - -from mesos.interface import Scheduler -from mesos.native import MesosSchedulerDriver -from mesos.interface import mesos_pb2 - -def log(msg): - process = subprocess.Popen("systemd-cat", stdin=subprocess.PIPE) - (out,err) = process.communicate(msg) - -class NixosTestScheduler(Scheduler): - def __init__(self): - self.master_ip = sys.argv[1] - self.download_uri = sys.argv[2] - - def resourceOffers(self, driver, offers): - log("XXX got resource offer") - - offer = offers[0] - task = self.new_task(offer) - uri = task.command.uris.add() - uri.value = self.download_uri - task.command.value = "cat test.result" - driver.launchTasks(offer.id, [task]) - - def statusUpdate(self, driver, update): - log("XXX status update") - if update.state == mesos_pb2.TASK_FAILED: - log("XXX test task failed with message: " + update.message) - driver.stop() - sys.exit(1) - elif update.state == mesos_pb2.TASK_FINISHED: - driver.stop() - sys.exit(0) - - def new_task(self, offer): - task = mesos_pb2.TaskInfo() - id = uuid.uuid4() - task.task_id.value = str(id) - task.slave_id.value = offer.slave_id.value - task.name = "task {}".format(str(id)) - - cpus = task.resources.add() - cpus.name = "cpus" - cpus.type = mesos_pb2.Value.SCALAR - cpus.scalar.value = 0.1 - - mem = task.resources.add() - mem.name = "mem" - mem.type = mesos_pb2.Value.SCALAR - mem.scalar.value = 32 - - return task - -if __name__ == '__main__': - log("XXX framework started") - - framework = mesos_pb2.FrameworkInfo() - framework.user = "root" - framework.name = "nixos-test-framework" - driver = MesosSchedulerDriver( - NixosTestScheduler(), - framework, - sys.argv[1] + ":5050" - ) - driver.run() diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 17260ce6406..ae150553273 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -20,12 +20,24 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { { fsType = "tmpfs"; options = [ "mode=1777" "noauto" ]; }; + # Tests https://discourse.nixos.org/t/how-to-make-a-derivations-executables-have-the-s-permission/8555 + "/user-mount/point" = { + device = "/user-mount/source"; + fsType = "none"; + options = [ "bind" "rw" "user" "noauto" ]; + }; + "/user-mount/denied-point" = { + device = "/user-mount/denied-source"; + fsType = "none"; + options = [ "bind" "rw" "noauto" ]; + }; }; systemd.automounts = singleton { wantedBy = [ "multi-user.target" ]; where = "/tmp2"; }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; + users.users.alice = { isNormalUser = true; }; security.sudo = { enable = true; wheelNeedsPassword = false; }; boot.kernel.sysctl."vm.swappiness" = 1; boot.kernelParams = [ "vsyscall=emulate" ]; @@ -112,6 +124,26 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { machine.succeed("touch /tmp2/x") machine.succeed("grep '/tmp2 tmpfs' /proc/mounts") + with subtest( + "Whether mounting by a user is possible with the `user` option in fstab (#95444)" + ): + machine.succeed("mkdir -p /user-mount/source") + machine.succeed("touch /user-mount/source/file") + machine.succeed("chmod -R a+Xr /user-mount/source") + machine.succeed("mkdir /user-mount/point") + machine.succeed("chown alice:users /user-mount/point") + machine.succeed("su - alice -c 'mount /user-mount/point'") + machine.succeed("su - alice -c 'ls /user-mount/point/file'") + with subtest( + "Whether mounting by a user is denied without the `user` option in fstab" + ): + machine.succeed("mkdir -p /user-mount/denied-source") + machine.succeed("touch /user-mount/denied-source/file") + machine.succeed("chmod -R a+Xr /user-mount/denied-source") + machine.succeed("mkdir /user-mount/denied-point") + machine.succeed("chown alice:users /user-mount/denied-point") + machine.fail("su - alice -c 'mount /user-mount/denied-point'") + with subtest("shell-vars"): machine.succeed('[ -n "$NIX_PATH" ]') diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index 50e1c76e9fd..5437a286043 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -172,32 +172,32 @@ import ./../make-test-python.nix ({ pkgs, ...} : { "echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42" ) - # Check if TokuDB plugin works + # Check if RocksDB plugin works mariadb.succeed( - "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser" + "echo 'use testdb; create table rocksdb (test_id INT, PRIMARY KEY (test_id)) ENGINE = RocksDB;' | sudo -u testuser mysql -u testuser" ) mariadb.succeed( - "echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser" + "echo 'use testdb; insert into rocksdb values (28);' | sudo -u testuser mysql -u testuser" ) mariadb.succeed( - "echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25" + "echo 'use testdb; select test_id from rocksdb;' | sudo -u testuser mysql -u testuser -N | grep 28" ) mariadb.succeed( - "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser" + "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser" ) - - # Check if RocksDB plugin works + '' + pkgs.stdenv.lib.optionalString pkgs.stdenv.isx86_64 '' + # Check if TokuDB plugin works mariadb.succeed( - "echo 'use testdb; create table rocksdb (test_id INT, PRIMARY KEY (test_id)) ENGINE = RocksDB;' | sudo -u testuser mysql -u testuser" + "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser" ) mariadb.succeed( - "echo 'use testdb; insert into rocksdb values (28);' | sudo -u testuser mysql -u testuser" + "echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser" ) mariadb.succeed( - "echo 'use testdb; select test_id from rocksdb;' | sudo -u testuser mysql -u testuser -N | grep 28" + "echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25" ) mariadb.succeed( - "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser" + "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser" ) ''; }) diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 7ba60ee9806..87e6c900c98 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -46,6 +46,17 @@ let "zpool destroy rpool", "udevadm settle", ) + + machine.succeed( + 'echo password | zpool create -o altroot="/tmp/mnt" ' + + "-O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1", + "zfs create -o mountpoint=legacy rpool/root", + "mount -t zfs rpool/root /tmp/mnt", + "udevadm settle", + "umount /tmp/mnt", + "zpool destroy rpool", + "udevadm settle", + ) '' + extraTest; }; @@ -57,18 +68,6 @@ in { unstable = makeZfsTest "unstable" { enableUnstable = true; - extraTest = '' - machine.succeed( - 'echo password | zpool create -o altroot="/tmp/mnt" ' - + "-O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1", - "zfs create -o mountpoint=legacy rpool/root", - "mount -t zfs rpool/root /tmp/mnt", - "udevadm settle", - "umount /tmp/mnt", - "zpool destroy rpool", - "udevadm settle", - ) - ''; }; installer = (import ./installer.nix { }).zfsroot; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index e65414b2bca..de90bd038be 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -5,7 +5,8 @@ , pkgconfig , cmake , llvm -, emscripten +# TODO: put back when it builds again +# , emscripten , openssl , libsndfile , libmicrohttpd @@ -20,13 +21,13 @@ with stdenv.lib.strings; let - version = "unstable-2020-06-08"; + version = "unstable-2020-08-03"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "f0037e289987818b65d3f6fb1ad943aaad2a2b28"; - sha256 = "0h08902rgx7rhzpng4h1qw8i2nzv50f79vrlbzdk5d35wa4zibh4"; + rev = "b6045f4592384076d3b383d116e602a95a000eb3"; + sha256 = "1wcpilwnkc7rrbv9gbkj5hb7kamkh8nrc3r4hbcvbz5ar2pfc6d5"; fetchSubmodules = true; }; @@ -46,7 +47,7 @@ let inherit src; nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; - buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; + buildInputs = [ llvm /*emscripten*/ openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; passthru = { diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 90bd8bc60ad..03ca4ce8eb0 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,26 +1,34 @@ { stdenv, fetchFromGitHub , llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl -, bc, coreutils, which +, bc, coreutils, which, libsndfile, pkg-config }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "faustlive"; - version = "2017-12-05"; + version = "2.5.4"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; - rev = "281fcb852dcd94f8c57ade1b2a7a3937542e1b2d"; - sha256 = "0sw44yd9928rid9ib0b5mx2x129m7zljrayfm6jz6hrwdc5q3k9a"; + rev = version; + sha256 = "0npn8fvq8iafyamq4wrj1k1bmk4xd0my2sp3gi5jdjfx6hc1sm3n"; + fetchSubmodules = true; }; buildInputs = [ llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl - bc coreutils which + bc coreutils which libsndfile pkg-config ]; makeFlags = [ "PREFIX=$(out)" ]; - preBuild = "patchShebangs Build/Linux/buildversion"; + postPatch = "cd Build"; + + installPhase = '' + install -d "$out/bin" + install -d "$out/share/applications" + install FaustLive/FaustLive "$out/bin" + install rsrc/FaustLive.desktop "$out/share/applications" + ''; meta = with stdenv.lib; { description = "A standalone just-in-time Faust compiler"; diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix new file mode 100644 index 00000000000..a3e33471cee --- /dev/null +++ b/pkgs/applications/audio/mamba/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, cairo +, libX11 +, libjack2 +, liblo +, libsigcxx +, libsmf +}: + +stdenv.mkDerivation rec { + pname = "mamba"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "brummer10"; + repo = "Mamba"; + rev = "v${version}"; + sha256 = "1wa3f9c4l239mpxa7nxx8hajy4icn40vpvaxq5l1qzskl74w072d"; + fetchSubmodules = true; + }; + + patches = [ ./fix-build.patch ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cairo libX11 libjack2 liblo libsigcxx libsmf ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/brummer10/Mamba"; + description = "Virtual MIDI keyboard for Jack Audio Connection Kit"; + license = licenses.bsd0; + maintainers = with maintainers; [ magnetophon orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/mamba/fix-build.patch b/pkgs/applications/audio/mamba/fix-build.patch new file mode 100644 index 00000000000..ed366963676 --- /dev/null +++ b/pkgs/applications/audio/mamba/fix-build.patch @@ -0,0 +1,10 @@ +--- a/libxputty/Build/Makefile ++++ b/libxputty/Build/Makefile +@@ -20,1 +20,1 @@ +- LDFLAGS += -fPIC `pkg-config --static --cflags --libs cairo x11` -lm ++ LDFLAGS += -fPIC `pkg-config --cflags --libs cairo x11` -lm +--- a/src/Makefile ++++ b/src/Makefile +@@ -84,1 +83,1 @@ ifneq ("$(wildcard ./$(BUILD_DIR))","") +- update-desktop-database ++ update-desktop-database || true diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 9d6b7dcf7f1..c5d20d965b9 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "padthv1"; - version = "0.9.15"; + version = "0.9.16"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "18ma429kamifcvjmsv0hysxk7qn2r9br4fia929bvfccapck98y1"; + sha256 = "1f2v60dpja0rnml60g463fjiz0f84v32yjwpvr56z79h1i6fssmv"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index acec8c54e53..b4ff5fc56d5 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sfizz"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "sfztools"; repo = pname; rev = version; - sha256 = "1px22x9lb6wyqfbv1jg1sbl1rsnwrzs8sm4dnas1w4ifchiv3ymd"; + sha256 = "0zpmvmh7n0064rxfqxb7z9rnz493k7yq7nl0vxppqnasg97jn5f3"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 16c8623bd7b..dd063b2d039 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Rigellute/spotify-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jwijenbergh ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 9a8db94401c..39d2197626a 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -7,14 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - pname = "btcdeb"; - version = "0.2.19"; + pname = "btcdeb-unstable"; + version = "200806"; src = fetchFromGitHub { - owner = "kallewoof"; - repo = pname; - rev = "fb2dace4cd115dc9529a81515cee855b8ce94784"; - sha256 = "0l0niamcjxmgyvc6w0wiygfgwsjam3ypv8mvjglgsj50gyv1vnb3"; + owner = "bitcoin-core"; + repo = "btcdeb"; + rev = "f6708c397c64894c9f9e31bea2d22285d9462de7"; + sha256 = "0qkmf89z2n7s95vhw3n9vh9dbi14zy4vqw3ffdh1w911jwm5ry3z"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/blockchains/mist.nix b/pkgs/applications/blockchains/mist.nix deleted file mode 100644 index 9dd564d715c..00000000000 --- a/pkgs/applications/blockchains/mist.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv, gtk2 }: - -let - version = "0.11.1"; - pname = "mist"; - - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - meta = with stdenv.lib; { - description = "Browse and use Ðapps on the Ethereum network"; - homepage = "https://github.com/ethereum/mist"; - license = licenses.gpl3; - maintainers = with maintainers; []; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; - - urlVersion = builtins.replaceStrings ["."] ["-"] version; - - desktopItem = makeDesktopItem rec { - name = "Mist"; - exec = "mist"; - icon = "mist"; - desktopName = name; - genericName = "Mist Browser"; - categories = "Network;"; - }; - - mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation { - inherit pname version meta; - - src = { - i686-linux = fetchurl { - url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux32-${urlVersion}.zip"; - sha256 = "1ffzp9aa0g6w3d5pzp69fljk3sd51cbqdgxa1x16vj106sqm0gj7"; - }; - x86_64-linux = fetchurl { - url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux64-${urlVersion}.zip"; - sha256 = "0yx4x72l8gk68yh9saki48zgqx8k92xnkm79dc651wdpd5c25cz3"; - }; - }.${stdenv.hostPlatform.system} or throwSystem; - - buildInputs = [ unzip makeWrapper ]; - - buildCommand = '' - mkdir -p $out/lib/mist $out/bin - unzip -d $out/lib/mist $src - ln -s $out/lib/mist/mist $out/bin - fixupPhase - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:${gtk2}/lib:$out/lib/mist" \ - $out/lib/mist/mist - ''; - }); -in -buildFHSUserEnv { - name = "mist"; - inherit meta; - - targetPkgs = pkgs: with pkgs; [ - mist - ]; - - extraInstallCommands = '' - mkdir -p "$out/share/applications" - cp "${desktopItem}/share/applications/"* $out/share/applications - ''; - - runScript = "mist"; -} diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index e42f0ddc96e..6ea075e2a36 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.16.0.2"; + version = "0.16.0.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1b1m8vhs0hdh81ysm8s8vfwqskqsihylb51wz16kc98ba40r9gqg"; + sha256 = "0iwjp8x5swy8i8pzrlm5v55awhm54cf48pm1vz98lcq361lhfzk6"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index d52d87b9571..548213a52fd 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "nc0.20.0"; + version = "nc0.20.1"; name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = version; - sha256 = "115nlsq5g169mj4qjmkhxx1bnx740871zqyng9zbm2y4i0xf71c4"; + sha256 = "1wpfp9y95lmfg2nk1xqzchwck1wk6gwkya1rj07mf5in9jngxk9z"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 1bfe9be6175..dfa917ac572 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -11,7 +11,7 @@ , withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true -, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null +, srcRepo ? false, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el , nativeComp ? false , toolkit ? ( @@ -56,6 +56,15 @@ in stdenv.mkDerivation { rm -fr .git '') + '' + substituteInPlace lisp/international/mule-cmds.el \ + --replace /usr/share/locale ${gettext}/share/locale + + for makefile_in in $(find . -name Makefile.in -print); do + substituteInPlace $makefile_in --replace /bin/pwd pwd + done + '' + # Make native compilation work both inside and outside of nix build (lib.optionalString nativeComp (let libPath = lib.concatStringsSep ":" [ @@ -78,7 +87,7 @@ in stdenv.mkDerivation { LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else ""; nativeBuildInputs = [ pkgconfig makeWrapper ] - ++ lib.optionals srcRepo [ autoconf automake texinfo ] + ++ lib.optionals srcRepo [ autoreconfHook texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; buildInputs = @@ -107,24 +116,13 @@ in stdenv.mkDerivation { (if withNS then [ "--disable-ns-self-contained" ] else if withX - then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] + then [ "--with-x-toolkit=${toolkit}" "--with-xft" "--with-cairo" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" "--with-gif=no" "--with-tiff=no" ]) ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional nativeComp "--with-nativecomp" ; - preConfigure = lib.optionalString srcRepo '' - ./autogen.sh - '' + '' - substituteInPlace lisp/international/mule-cmds.el \ - --replace /usr/share/locale ${gettext}/share/locale - - for makefile_in in $(find . -name Makefile.in -print); do - substituteInPlace $makefile_in --replace /bin/pwd pwd - done - ''; - installTargets = [ "tags" "install" ]; postInstall = '' diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 79e0027d509..9722854b980 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -20,6 +20,5 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/Luz/hexdino"; license = licenses.mit; maintainers = [ maintainers.luz ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index 4e92887bccb..915a5a9ec93 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -9,5 +9,6 @@ kak-fzf = pkgs.callPackage ./kak-fzf.nix { }; kak-plumb = pkgs.callPackage ./kak-plumb.nix { }; kak-powerline = pkgs.callPackage ./kak-powerline.nix { }; + kak-prelude = pkgs.callPackage ./kak-prelude.nix { }; kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { }; } diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix index dd0faf63453..657f4a19bbf 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix @@ -4,12 +4,12 @@ assert stdenv.lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ]; stdenv.mkDerivation { name = "kak-fzf"; - version = "2019-07-16"; + version = "2020-05-24"; src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "ede90d3e02bceb714f997adfcbab8260b42e0a19"; - sha256 = "18w90j3fpk2ddn68497s33n66aap8phw5636y1r7pqsa641zdxcv"; + rev = "b2aeb26473962ab0bf3b51ba5c81c50c1d8253d3"; + sha256 = "0bg845i814xh4y688p2zx726rsg0pd6nb4a7qv2fckmk639f4wzc"; }; configurePhase = '' diff --git a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix new file mode 100644 index 00000000000..ee9c125827c --- /dev/null +++ b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation { + name = "kak-prelude"; + version = "2020-03-15"; + + src = fetchFromGitHub { + owner = "alexherbo2"; + repo = "prelude.kak"; + rev = "05b2642b1e014bd46423f9d738cc38a624947b63"; + sha256 = "180p8hq8z7mznzd9w9ma5as3ijs7zbzcj96prcpswqg263a0b329"; + }; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins + cp -r rc $out/share/kak/autoload/plugins/auto-pairs + ''; + + meta = with stdenv.lib; + { description = "Prelude of shell blocks for Kakoune."; + homepage = "https://github.com/alexherbo2/prelude.kak"; + license = licenses.unlicense; + maintainers = with maintainers; [ buffet ]; + platform = platforms.all; + }; +} diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index cbb9f7bd5b8..869c20c1d6c 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,18 +1,18 @@ { stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper -, boost, xercesc -, qtbase, qttools, qtwebkit, qtxmlpatterns -, python3, python3Packages +, boost, xercesc, hunspell, zlib, pcre16 +, qtbase, qttools, qtwebengine, qtxmlpatterns +, python3Packages }: mkDerivation rec { pname = "sigil"; - version = "0.9.14"; + version = "1.3.0"; src = fetchFromGitHub { - sha256 = "0fmfbfpnmhclbbv9cbr1xnv97si6ls7331kk3ix114iqkngqwgl1"; - rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; + rev = version; + sha256 = "02bkyi9xpaxdcivm075y3praxgvfay9z0189gvr6g8yc3ml1miyr"; }; pythonPath = with python3Packages; [ lxml ]; @@ -20,8 +20,9 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ - boost xercesc qtbase qttools qtwebkit qtxmlpatterns - python3Packages.lxml ]; + boost xercesc qtbase qttools qtwebengine qtxmlpatterns + python3Packages.lxml + ]; dontWrapQtApps = true; diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 053272b1efa..716972342ed 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,27 +1,90 @@ -{ stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, - libharu, opencv2, vigra, postgresql, Cocoa, - unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: +{ stdenv +, fetchurl +# native +, autoreconfHook +, pkg-config +# not native +, gdal +, wxGTK31-gtk3 +, proj_5 +, dxflib +, curl +, libiodbc +, lzma +, libharu +, opencv +, vigra +, postgresql +, Cocoa +, unixODBC +, poppler +, hdf4 +, hdf5 +, netcdf +, sqlite +, qhull +, giflib +, libsvm +, fftw +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "saga"; - version = "7.6.3"; + version = "7.7.0"; + src = fetchurl { + url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${stdenv.lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; + sha256 = "1nmvrlcpcm2pas9pnav13iydnym9d8yqqnwq47lm0j6b0a2wy9zk"; + }; + + nativeBuildInputs = [ + # Upstream's gnerated ./configure is not reliable + autoreconfHook + pkg-config + ]; + configureFlags = [ + "--with-system-svm" + # hdf is no detected otherwise + "HDF5_LIBS=-l${hdf5}/lib" + "HDF5_CFLAGS=-I${hdf5.dev}/include" + ]; + buildInputs = [ + curl + dxflib + fftw + libsvm + hdf5 + gdal + wxGTK31-gtk3 + proj_5 + libharu + opencv + vigra + postgresql + libiodbc + lzma + qhull + giflib + ] # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - buildInputs = [ gdal wxGTK30 proj libharu opencv2 vigra postgresql libiodbc lzma - qhull giflib ] - ++ stdenv.lib.optionals stdenv.isDarwin - [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ + Cocoa + unixODBC + poppler + netcdf + sqlite + ]; + + patches = [ + # See https://sourceforge.net/p/saga-gis/bugs/280/ + ./opencv4.patch + ]; enableParallelBuilding = true; CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; - src = fetchurl { - url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.6.3/saga-7.6.3.tar.gz"; - sha256 = "0f1qy2y929gd9y7h45bkv9x71xapbzyn06v6wqivjaiydsi1qycb"; - }; - meta = with stdenv.lib; { description = "System for Automated Geoscientific Analyses"; homepage = "http://www.saga-gis.org"; diff --git a/pkgs/applications/gis/saga/opencv4.patch b/pkgs/applications/gis/saga/opencv4.patch new file mode 100644 index 00000000000..0b26192bf09 --- /dev/null +++ b/pkgs/applications/gis/saga/opencv4.patch @@ -0,0 +1,14 @@ +--- a/src/tools/imagery/imagery_opencv/Makefile.am ++++ b/src/tools/imagery/imagery_opencv/Makefile.am +@@ -7,9 +7,9 @@ + + if HAVE_CV + DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +-CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv ++CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags` + AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS) +-AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs` ++AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs` + pkglib_LTLIBRARIES = libimagery_opencv.la + libimagery_opencv_la_SOURCES =\ + MLB_Interface.cpp\ diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index c26243c0c59..0ac19c0d133 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -19,6 +19,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; license = licenses.mit; maintainers = [ maintainers.mpickering ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 8da44a7a060..e7abc94a426 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-25"; - sha256 = "15y07kgy4mx3qyxsbd9g6s2yaa2mxnfvfzas35jw0vz6qjjyaw5c"; + version = "7.0.10-27"; + sha256 = "1fqwbg2ws6ix3bymx7ncb4k4f6bg8q44n9xnlvngjapflnrmhcph"; patches = []; }; in diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 8969298a9d7..a1c354b2ac5 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://pdfcpu.io"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/applications/graphics/yeetgif/default.nix index 3ae1b98661a..84bcdee5b76 100644 --- a/pkgs/applications/graphics/yeetgif/default.nix +++ b/pkgs/applications/graphics/yeetgif/default.nix @@ -18,6 +18,5 @@ buildGoPackage rec { homepage = "https://github.com/sgreben/yeetgif"; license = with licenses; [ mit asl20 cc-by-nc-sa-40 ]; maintainers = with maintainers; [ ajs124 ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 034dd4f7e0a..114021eb78f 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -23,6 +23,5 @@ buildGoModule rec { homepage = "https://github.com/mholt/archiver"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix index aa8d68f2a33..f8adc7f61f6 100644 --- a/pkgs/applications/misc/effitask/default.nix +++ b/pkgs/applications/misc/effitask/default.nix @@ -46,6 +46,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sanpii/effitask"; maintainers = with maintainers; [ davidak ]; license = with licenses; [ mit ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index 2cf8813aac4..9ab3fda96dc 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1.2"; src = fetchFromGitHub { - owner = "geistesk"; + owner = "oxzi"; repo = "et"; rev = version; sha256 = "0i0lgmnly8n7y4y6pb10pxgxyz8s5zk26k8z1g1578v1wan01lnq"; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimal libnotify-based (egg) timer"; - homepage = "https://github.com/geistesk/et"; + homepage = "https://github.com/oxzi/et"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/applications/misc/fslint/default.nix b/pkgs/applications/misc/fslint/default.nix new file mode 100644 index 00000000000..f6e1071ac5e --- /dev/null +++ b/pkgs/applications/misc/fslint/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: + +let pythonEnv = python2.withPackages(ps: [ ps.pyGtkGlade]); +in stdenv.mkDerivation rec { + pname = "fslint"; + version = "2.46"; + + src = fetchFromGitHub { + owner = "pixelb"; + repo = "fslint"; + rev = version; + sha256 = "048pc1rsslbsrfchl2wmdd4hpa2gycglib7kdx8vqs947zcm0sfv"; + }; + + buildInputs = [ + pythonEnv makeWrapper + ]; + + prePatch = '' + substituteInPlace fslint-gui --replace "liblocation=os.path.dirname(os.path.abspath(sys.argv[0]))" "liblocation='$out'" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp * -R $out/ + cp fslint-gui $out/bin/fslint + + wrapProgram "$out/bin/fslint" \ + --prefix PYTHONPATH : "${pythonEnv.interpreter}" + runHook postInstall + ''; + + meta = with lib; { + description = "A utility to find and clean various forms of lint on a filesystem."; + homepage = "https://www.pixelbeat.org/fslint/"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.dasj19 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 7370939be7a..cef58b353a3 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.3.0"; + version = "1.4.1"; src = fetchgit { url = "https://codeberg.org/dnkl/fuzzel"; rev = "${version}"; - sha256 = "12jv5iwmksygw8nfkxbd9rbi03wnpgb30hczq009aqgy7lyi5zmp"; + sha256 = "18pg46xry7q4i19mpjfz942c6vkqlrj4q18p85zldzv9gdsxnm9c"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 45abc25ebb2..ee6ed27ddda 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -19,7 +19,6 @@ buildGoModule rec { description = "Automatic GeoIP database updater"; homepage = "https://github.com/maxmind/geoipupdate"; license = with licenses; [ asl20 ]; - platforms = platforms.all; maintainers = with maintainers; [ das_j ]; }; } diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index def70d7df3c..35e9d16f9df 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; - doCheck = true; + doCheck = !stdenv.isDarwin; mesonFlags = [ "-Ddocs=disabled" # docs do not seem to be installed diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index d576d2b5b47..9af6e39cb9b 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitLab +, fetchurl , pkgconfig , autoconf , automake @@ -26,7 +26,8 @@ , goocanvasmm2 , evince , isocodes -, gtksourceviewmm4 +, gtksourceview +, gtksourceviewmm , postgresql , gobject-introspection , yelp-tools @@ -48,16 +49,13 @@ let boost_python = boost.override { enablePython = true; inherit python; }; in stdenv.mkDerivation rec { pname = "glom"; - version = "unstable-2018-12-16"; + version = "1.32.0"; outputs = [ "out" "lib" "dev" "doc" "devdoc" ]; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = "fa5ff04f209f35bf3e97bc1c3eb1d1138d6172ce"; - sha256 = "145hnk96xa4v35i3a3mbf3fnx4nlk8cksc0qhm7nrh8cnnrbdfgn"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1wcd4kd3crwqjv0jfp73jkyyf5ws8mvykg37kqxmcb58piz21gsk"; }; nativeBuildInputs = [ @@ -93,7 +91,8 @@ in stdenv.mkDerivation rec { evince isocodes python3.pkgs.pygobject3 - gtksourceviewmm4 + gtksourceview + gtksourceviewmm postgresql # for pg_config ]; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 323fc501c84..257cacf69a0 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -2,21 +2,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "khal"; - version = "0.10.1"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"; + sha256 = "11qhrga44knlnp88py9p547d4nr5kn041d2nszwa3dqw7mf22ks9"; }; - # Include a khal.desktop file via upstream commit. - # This patch should be removed when updating to the next version, probably. patches = [ - (fetchpatch { - name = "add-khal-dot-desktop.patch"; - url = "https://github.com/pimutils/khal/commit/1f93d238fec7c934dd2f8e48f54925d22130e3aa.patch"; - sha256 = "06skn3van7zd93348fc6axllx71ckkc7h2zljqlvwa339vca608c"; - }) ./skip-broken-test.patch ]; diff --git a/pkgs/applications/misc/khal/skip-broken-test.patch b/pkgs/applications/misc/khal/skip-broken-test.patch index c3c982547ae..fc37f6acc86 100644 --- a/pkgs/applications/misc/khal/skip-broken-test.patch +++ b/pkgs/applications/misc/khal/skip-broken-test.patch @@ -1,3 +1,15 @@ +diff --git a/tests/cli_test.py b/tests/cli_test.py +index 5e354a5..d8fbcd5 100644 +--- a/tests/cli_test.py ++++ b/tests/cli_test.py +@@ -493,6 +493,7 @@ def test_import_invalid_choice_and_prefix(runner): + assert result.output == '09.04.-09.04. An Event\n' + + ++@pytest.mark.skip(reason="Mocking breaks in this testcase") + def test_import_from_stdin(runner, monkeypatch): + ics_data = 'This is some really fake icalendar data' + diff --git a/tests/ui/test_editor.py b/tests/ui/test_editor.py index 27b7fa5..5978d72 100644 --- a/tests/ui/test_editor.py diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 98cd8a5a4fb..a3e4c1309ff 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,12 +1,12 @@ { stdenv, glibcLocales, python3 }: python3.pkgs.buildPythonApplication rec { - version = "0.16.1"; + version = "0.17.0"; pname = "khard"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0fg4qh5gzki5wg958wlpc8a2icnk74gzg33lqxjm755cfnjng7qd"; + sha256 = "062nv4xkfsjc11k9m52dh6xjn9z68a4a6x1s8z05wwv4jbp1lkhn"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 784656b8b96..5f6c679f3ba 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.26.5"; + version = "0.26.6"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "1zv8yazhdyxm33vdn0m5cciw7zzg45nwdg4rdcsydnrwg7d667r6"; + sha256 = "0z17pdjdc2r2m5yi5bfz504dzzs978z8p6bhlf08v2npvigp8vz1"; }; postPatch = '' diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 6fcd86596fb..993596aabe1 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { version = "2.4.2"; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; + checkInputs = [ which ]; installPhase = '' mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index 81c23658965..be817608924 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -26,6 +26,5 @@ buildGoPackage rec { description = "Simple stock tracker implemented in go"; homepage = "https://github.com/mop-tracker/mop"; license = licenses.mit; - platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 07ca64518e5..63d7077d32e 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -45,11 +45,11 @@ let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.20"; + version = "8.0.21"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "0c0ig2fqfpli7fwb4v4iwvfh4szzj3grx8j9rbh40kllkc8v5qh6"; + sha256 = "0rqgr1dcbf6yp60hninbw5dnwykx5ngbyhhx0sbhgv0m0cq5a44h"; }; patches = [ @@ -142,7 +142,7 @@ in stdenv.mkDerivation rec { "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" - # mysql-workbench 8.0.20 depends on libmysqlconnectorcpp 1.1.8. + # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8. # Newer versions of connector still provide the legacy library when enabled # but the headers are in a different location. "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc" diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index f3dafb78bca..7682b56e4d6 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-python-libs" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A framework for controlling entertainment lighting equipment."; homepage = "https://www.openlighting.org/ola/"; diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 348ea4b991e..aaaf6dc778b 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -21,6 +21,5 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ davidtwco ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 9470e7aaab7..f159cd852e8 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -21,6 +21,5 @@ buildGoModule rec { changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3; maintainers = [ maintainers.nickhu ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index b508a73de1d..e1ae63e09fd 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -18,6 +18,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/valebes/rsClock"; license = licenses.mit; maintainers = with maintainers; [valebes]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 01dd6a19d44..6adf24f617c 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://tools.suckless.org/slstatus/"; description = "status monitor for window managers that use WM_NAME like dwm"; license = licenses.isc; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index 38826b7735f..1cb5bb441ed 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -23,6 +23,5 @@ buildGoPackage rec { homepage = "https://github.com/alex2108/syncthing-tray"; license = licenses.mit; maintainers = with maintainers; [ nickhu ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index f5143767791..52116a52fbb 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -19,7 +19,6 @@ buildGoModule rec { description = "Shows colorful, animated party parrot in your terminial"; homepage = "https://github.com/jmhobbs/terminal-parrot"; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.heel ]; }; } diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index f55b3852e5b..431f922eeee 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Ekleog/todiff"; maintainers = with maintainers; [ ekleog ]; license = licenses.mit; - platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/x3270/default.nix b/pkgs/applications/misc/x3270/default.nix new file mode 100644 index 00000000000..747d2653876 --- /dev/null +++ b/pkgs/applications/misc/x3270/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, openssl, m4, expat +, libX11, libXt, libXaw, libXmu, bdftopcf, mkfontdir +, fontadobe100dpi, fontadobeutopia100dpi, fontbh100dpi +, fontbhlucidatypewriter100dpi, fontbitstream100dpi +, tcl +, ncurses }: + +let + majorVersion = "4"; + minorVersion = "0"; + versionSuffix = "ga9"; +in stdenv.mkDerivation rec { + pname = "x3270"; + version = "${majorVersion}.${minorVersion}${versionSuffix}"; + + src = fetchurl { + url = "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${version}-src.tgz"; + sha256 = "0km24rgll0s4ji6iz8lvy5ra76ds162s95y33w5px6697cwqkp9j"; + }; + + buildFlags = "unix"; + + postConfigure = '' + pushd c3270 ; ./configure ; popd + ''; + + nativeBuildInputs = [ m4 ]; + buildInputs = [ + expat + libX11 libXt libXaw libXmu bdftopcf mkfontdir + fontadobe100dpi fontadobeutopia100dpi fontbh100dpi + fontbhlucidatypewriter100dpi fontbitstream100dpi + tcl + ncurses + expat + ]; + + meta = with stdenv.lib; { + description = "IBM 3270 terminal emulator for the X Window System"; + homepage = "http://x3270.bgp.nu/index.html"; + license = licenses.bsd3; + maintainers = [ maintainers.anna328p ]; + }; +} diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 44f200174d9..58b1a81c90f 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -24,18 +24,17 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsqlite=enabled" "-Dmagic=enabled" - # "-Dseccomp=enabled" "-Dmanpages=enabled" "-Dconvert-icon=enabled" "-Dsynctex=enabled" # Make sure tests are enabled for doCheck "-Dtests=enabled" - ]; + ] ++ optional (!stdenv.isLinux) "-Dseccomp=disabled"; nativeBuildInputs = [ meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx - gettext wrapGAppsHook libxml2 check - ] ++ optional stdenv.isLinux appstream-glib; + gettext wrapGAppsHook libxml2 check appstream-glib + ]; buildInputs = [ gtk girara libintl sqlite glib file librsvg diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index d88d7296fd6..710d824df11 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -31,6 +31,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.getzola.org/"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 3f2e4ca99be..0796e117311 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.8.0"; + version = "2.8.2"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256:09j1kijs31yk3iw2lj7szv1nwkqiqydj3zkkmr49qlib1qj717wh"; + hash = "sha256:0figpfm5cgbryq6v26k9gj42zgbk335bsa3bzyxpvz2slq8rzb2y"; }; profile = '' diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index 3ce04842c6e..b302be4e013 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -16,7 +16,6 @@ buildGoPackage rec { description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; homepage = "https://blog.filippo.io/captive-browser"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ volth ]; }; } diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 7c234c42c26..2da44bd4ed9 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -45,7 +45,6 @@ rustPlatform.buildRustPackage rec { description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; homepage = "https://sr.ht/~julienxx/Castor"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; }; } diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 911030dee53..c59d23ecdba 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, makeDesktopItem +{ stdenv, lib, fetchFromGitHub, writeScript, desktop-file-utils , pkgconfig, autoconf213, alsaLib, bzip2, cairo , dbus, dbus-glib, ffmpeg_3, file, fontconfig, freetype , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg @@ -16,35 +16,33 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.10.0"; + version = "28.12.0"; - src = fetchgit { - url = "https://github.com/MoonchildProductions/Pale-Moon.git"; + src = fetchFromGitHub { + owner = "MoonchildProductions"; + repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "0c64vmrp46sbl1dgl9dq2vkmpgz9gvgd59dk02jqwyhx4lln1g2l"; + sha256 = "1cc75972nhmxkkynkky1m2fijbf3qlzvpxsd98mxlx0b7h4d3l5l"; fetchSubmodules = true; }; - desktopItem = makeDesktopItem { - name = "palemoon"; - exec = "palemoon %U"; - icon = "palemoon"; - desktopName = "Pale Moon"; - genericName = "Web Browser"; - categories = "Network;WebBrowser;"; - mimeType = lib.concatStringsSep ";" [ - "text/html" - "text/xml" - "application/xhtml+xml" - "application/vnd.mozilla.xul+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - "x-scheme-handler/ftp" - ]; - }; + passthru.updateScript = writeScript "update-${pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl libxml2 + + set -eu -o pipefail + + # Only release note announcement == finalized release + version="$( + curl -s 'http://www.palemoon.org/releasenotes.shtml' | + xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 | + sed 's/v\(\S*\).*/\1/' + )" + update-source-version ${pname} "$version" + ''; nativeBuildInputs = [ - file gnum4 makeWrapper perl pkgconfig python2 wget which + desktop-file-utils file gnum4 makeWrapper perl pkgconfig python2 wget which ]; buildInputs = [ @@ -106,7 +104,7 @@ in stdenv.mkDerivation rec { ac_add_options --prefix=$out - mk_add_options MOZ_MAKE_FLAGS="-j$NIX_BUILD_CORES" + mk_add_options MOZ_MAKE_FLAGS="-j${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"}" mk_add_options AUTOCONF=${autoconf213}/bin/autoconf ' ''; @@ -116,14 +114,13 @@ in stdenv.mkDerivation rec { installPhase = '' $src/mach install - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications + desktop-file-install --dir=$out/share/applications \ + $src/palemoon/branding/official/palemoon.desktop - for n in 16 22 24 32 48 256; do + for iconname in default{16,22,24,32,48,256} mozicon128; do + n=''${iconname//[^0-9]/} size=$n"x"$n - mkdir -p $out/share/icons/hicolor/$size/apps - cp $src/palemoon/branding/official/default$n.png \ - $out/share/icons/hicolor/$size/apps/palemoon.png + install -Dm644 $src/palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png done wrapProgram $out/lib/palemoon-${version}/palemoon \ diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 2ed8adb85b1..86d1b80d061 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -20,7 +20,6 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/runatlantis/atlantis"; description = "Terraform Pull Request Automation"; - platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ jpotier ]; }; diff --git a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix deleted file mode 100644 index aac0dd10e15..00000000000 --- a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, curl}: - -stdenv.mkDerivation { - name = "chronos-maven-deps"; - builder = ./fetch-chronos-deps.sh; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0mm2sb1p5zz6b0z2s4zhdlix6fafydsxmqjy8zbkwzw4f6lazzyl"; - - nativeBuildInputs = [ curl ]; - - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; -} diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix deleted file mode 100644 index e0cc780841b..00000000000 --- a/pkgs/applications/networking/cluster/chronos/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, makeWrapper, fetchgit, curl, jdk, maven, nodejs, mesos }: - -stdenv.mkDerivation rec { - pname = "chronos"; - version = "286b2ccb8e4695f8e413406ceca85b60d3a87e22"; - - src = fetchgit { - url = "https://github.com/airbnb/chronos"; - rev = version; - sha256 = "0hrln3ad2g2cq2xqmy5mq32cdxxb9vb6v6jp6kcq03f8km6v3g9c"; - }; - - buildInputs = [ makeWrapper curl jdk maven nodejs mesos ]; - - mavenRepo = import ./chronos-deps.nix { inherit stdenv curl; }; - - buildPhase = '' - ln -s $mavenRepo .m2 - mvn package -Dmaven.repo.local=$(pwd)/.m2 - ''; - - installPhase = '' - mkdir -p $out/{bin,libexec/chronos} - cp target/chronos*.jar $out/libexec/chronos/${pname}-${version}.jar - - makeWrapper ${jdk.jre}/bin/java $out/bin/chronos \ - --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${pname}-${version}.jar com.airbnb.scheduler.Main" \ - --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY" - ''; - - meta = with lib; { - homepage = "http://airbnb.github.io/chronos"; - license = licenses.asl20; - description = "Fault tolerant job scheduler for Mesos which handles dependencies and ISO8601 based schedules"; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - broken = true; # doesn't build https://hydra.nixos.org/build/25768319 - }; -} diff --git a/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh b/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh deleted file mode 100644 index 2e337076107..00000000000 --- a/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh +++ /dev/null @@ -1,1672 +0,0 @@ -source $stdenv/setup -header "fetching Chronos maven repo" - -function fetchArtifact { - repoPath="$1" - echo "fetching $repoPath" - mkdir -p $(dirname $out/$repoPath) - curl --fail --location --insecure --max-redirs 20 "http://repo.maven.apache.org/maven2/$repoPath" --output "$out/$repoPath" || - curl --fail --location --insecure --max-redirs 20 "https://repository.apache.org/content/repositories/release/$repoPath" --output "$out/$repoPath" || - curl --fail --location --insecure --max-redirs 20 "http://downloads.mesosphere.io/maven/$repoPath" --output "$out/$repoPath" -} - -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom -fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom -fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1 -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1 -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar -fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom -fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1 -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1 -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1 -fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.pom -fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.jar -fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.jar.sha1 -fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.pom.sha1 -fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.jar -fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.pom.sha1 -fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.pom -fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.jar.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar -fetchArtifact net/kencochrane/raven/raven-all/4.1.2/raven-all-4.1.2.pom -fetchArtifact net/kencochrane/raven/raven-all/4.1.2/raven-all-4.1.2.pom.sha1 -fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.jar -fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.pom -fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.jar.sha1 -fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.pom.sha1 -fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.jar.sha1 -fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.jar -fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.pom.sha1 -fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.pom -fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.jar.sha1 -fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.pom -fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.jar -fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.pom.sha1 -fetchArtifact net/java/jvnet-parent/4/jvnet-parent-4.pom -fetchArtifact net/java/jvnet-parent/4/jvnet-parent-4.pom.sha1 -fetchArtifact net/java/jvnet-parent/1/jvnet-parent-1.pom -fetchArtifact net/java/jvnet-parent/1/jvnet-parent-1.pom.sha1 -fetchArtifact net/java/jvnet-parent/3/jvnet-parent-3.pom.sha1 -fetchArtifact net/java/jvnet-parent/3/jvnet-parent-3.pom -fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.jar.sha1 -fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.pom.sha1 -fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.pom -fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.jar -fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.jar -fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.pom -fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.jar.sha1 -fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.pom.sha1 -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1 -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar.sha1 -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1 -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar -fetchArtifact xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.pom.sha1 -fetchArtifact xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.pom -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1 -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1 -fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.pom -fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.jar -fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.jar.sha1 -fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.pom.sha1 -fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.jar.sha1 -fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.jar -fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.pom.sha1 -fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.pom -fetchArtifact io/dropwizard/metrics/metrics-parent/3.1.0/metrics-parent-3.1.0.pom.sha1 -fetchArtifact io/dropwizard/metrics/metrics-parent/3.1.0/metrics-parent-3.1.0.pom -fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.jar.sha1 -fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.pom -fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.jar -fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.pom.sha1 -fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.pom.sha1 -fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.jar -fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.pom -fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1 -fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom -fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1 -fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.jar.sha1 -fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.pom.sha1 -fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.jar -fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.pom -fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.pom.sha1 -fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.jar -fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.jar.sha1 -fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.pom -fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom -fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 -fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom -fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom -fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom -fetchArtifact com/google/inject/guice-parent/3.0/guice-parent-3.0.pom.sha1 -fetchArtifact com/google/inject/guice-parent/3.0/guice-parent-3.0.pom -fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.pom.sha1 -fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar -fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar.sha1 -fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.pom -fetchArtifact com/google/inject/extensions/extensions-parent/3.0/extensions-parent-3.0.pom.sha1 -fetchArtifact com/google/inject/extensions/extensions-parent/3.0/extensions-parent-3.0.pom -fetchArtifact com/google/inject/guice/3.0/guice-3.0.jar -fetchArtifact com/google/inject/guice/3.0/guice-3.0.jar.sha1 -fetchArtifact com/google/inject/guice/3.0/guice-3.0.pom.sha1 -fetchArtifact com/google/inject/guice/3.0/guice-3.0.pom -fetchArtifact com/google/google/1/google-1.pom -fetchArtifact com/google/google/1/google-1.pom.sha1 -fetchArtifact com/google/google/5/google-5.pom.sha1 -fetchArtifact com/google/google/5/google-5.pom -fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom -fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1 -fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom -fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar.sha1 -fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar -fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar -fetchArtifact com/google/guava/guava-parent/15.0/guava-parent-15.0.pom -fetchArtifact com/google/guava/guava-parent/15.0/guava-parent-15.0.pom.sha1 -fetchArtifact com/google/guava/guava-parent/13.0.1/guava-parent-13.0.1.pom.sha1 -fetchArtifact com/google/guava/guava-parent/13.0.1/guava-parent-13.0.1.pom -fetchArtifact com/google/guava/guava-parent/17.0/guava-parent-17.0.pom.sha1 -fetchArtifact com/google/guava/guava-parent/17.0/guava-parent-17.0.pom -fetchArtifact com/google/guava/guava-parent/16.0.1/guava-parent-16.0.1.pom -fetchArtifact com/google/guava/guava-parent/16.0.1/guava-parent-16.0.1.pom.sha1 -fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom -fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1 -fetchArtifact com/google/guava/guava/15.0/guava-15.0.pom.sha1 -fetchArtifact com/google/guava/guava/15.0/guava-15.0.pom -fetchArtifact com/google/guava/guava/13.0.1/guava-13.0.1.pom -fetchArtifact com/google/guava/guava/13.0.1/guava-13.0.1.pom.sha1 -fetchArtifact com/google/guava/guava/17.0/guava-17.0.pom -fetchArtifact com/google/guava/guava/17.0/guava-17.0.pom.sha1 -fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.pom.sha1 -fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.pom -fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.jar -fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.jar.sha1 -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1 -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1 -fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.pom -fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.pom.sha1 -fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.jar -fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.jar.sha1 -fetchArtifact com/github/spullara/mustache/java/mustache.java/0.8.12/mustache.java-0.8.12.pom -fetchArtifact com/github/spullara/mustache/java/mustache.java/0.8.12/mustache.java-0.8.12.pom.sha1 -fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.jar -fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.pom.sha1 -fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.jar.sha1 -fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.pom -fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.jar.sha1 -fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.pom -fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.pom.sha1 -fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.jar -fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.pom -fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.pom.sha1 -fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.jar.sha1 -fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.jar -fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.jar.sha1 -fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.pom -fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.jar -fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.pom.sha1 -fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.pom.sha1 -fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.jar -fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.jar.sha1 -fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.pom -fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.pom.sha1 -fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.jar -fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.jar.sha1 -fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.pom -fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.jar.sha1 -fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.pom.sha1 -fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.jar -fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.pom -fetchArtifact com/codahale/metrics/metrics-parent/3.0.2/metrics-parent-3.0.2.pom.sha1 -fetchArtifact com/codahale/metrics/metrics-parent/3.0.2/metrics-parent-3.0.2.pom -fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.pom -fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.pom.sha1 -fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.jar -fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.jar.sha1 -fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.pom.sha1 -fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.jar.sha1 -fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.pom -fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.jar -fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-providers/2.4.1/jackson-jaxrs-providers-2.4.1.pom.sha1 -fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-providers/2.4.1/jackson-jaxrs-providers-2.4.1.pom -fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.jar -fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.pom -fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.pom.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.jar.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.0/jackson-annotations-2.4.0.pom -fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.0/jackson-annotations-2.4.0.pom.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.2.2/jackson-annotations-2.2.2.pom -fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.2.2/jackson-annotations-2.2.2.pom.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1/jackson-databind-2.4.1.pom.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1/jackson-databind-2.4.1.pom -fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.jar.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.jar -fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.pom.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.pom -fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.2.2/jackson-databind-2.2.2.pom.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.2.2/jackson-databind-2.2.2.pom -fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.pom -fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.jar.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.pom.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.jar -fetchArtifact com/fasterxml/jackson/core/jackson-core/2.4.1/jackson-core-2.4.1.pom.sha1 -fetchArtifact com/fasterxml/jackson/core/jackson-core/2.4.1/jackson-core-2.4.1.pom -fetchArtifact com/fasterxml/jackson/core/jackson-core/2.2.2/jackson-core-2.2.2.pom -fetchArtifact com/fasterxml/jackson/core/jackson-core/2.2.2/jackson-core-2.2.2.pom.sha1 -fetchArtifact com/fasterxml/jackson/jackson-parent/2.4/jackson-parent-2.4.pom -fetchArtifact com/fasterxml/jackson/jackson-parent/2.4/jackson-parent-2.4.pom.sha1 -fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.pom -fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.jar -fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.pom.sha1 -fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.jar.sha1 -fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.jar -fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.pom.sha1 -fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.jar.sha1 -fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.pom -fetchArtifact com/fasterxml/oss-parent/16/oss-parent-16.pom -fetchArtifact com/fasterxml/oss-parent/16/oss-parent-16.pom.sha1 -fetchArtifact com/fasterxml/oss-parent/11/oss-parent-11.pom.sha1 -fetchArtifact com/fasterxml/oss-parent/11/oss-parent-11.pom -fetchArtifact com/fasterxml/oss-parent/10/oss-parent-10.pom.sha1 -fetchArtifact com/fasterxml/oss-parent/10/oss-parent-10.pom -fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.pom.sha1 -fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.jar -fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.pom -fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.jar.sha1 -fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.jar -fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.pom.sha1 -fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.pom -fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.jar.sha1 -fetchArtifact com/datastax/cassandra/cassandra-driver-parent/2.1.0/cassandra-driver-parent-2.1.0.pom.sha1 -fetchArtifact com/datastax/cassandra/cassandra-driver-parent/2.1.0/cassandra-driver-parent-2.1.0.pom -fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0.pom.sha1 -fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0-sources.jar -fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0.pom -fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0-sources.jar.sha1 -fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.jar.sha1 -fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.jar -fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.pom -fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.pom.sha1 -fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.jar.sha1 -fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.pom.sha1 -fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.jar -fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.pom -fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.pom.sha1 -fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.jar.sha1 -fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.pom -fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.jar -fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.jar -fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.pom.sha1 -fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.pom -fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.jar.sha1 -fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.pom.sha1 -fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.jar.sha1 -fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.pom -fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.jar -fetchArtifact com/thoughtworks/paranamer/paranamer-parent/2.6/paranamer-parent-2.6.pom.sha1 -fetchArtifact com/thoughtworks/paranamer/paranamer-parent/2.6/paranamer-parent-2.6.pom -fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.pom -fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.jar.sha1 -fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.pom.sha1 -fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.jar -fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.pom -fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.jar.sha1 -fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.pom.sha1 -fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.jar -fetchArtifact com/sun/jersey/jersey-server/1.17.1/jersey-server-1.17.1.pom.sha1 -fetchArtifact com/sun/jersey/jersey-server/1.17.1/jersey-server-1.17.1.pom -fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.jar.sha1 -fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.jar -fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.pom -fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.pom.sha1 -fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.pom.sha1 -fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.jar -fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.pom -fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.jar.sha1 -fetchArtifact com/sun/jersey/jersey-core/1.17.1/jersey-core-1.17.1.pom -fetchArtifact com/sun/jersey/jersey-core/1.17.1/jersey-core-1.17.1.pom.sha1 -fetchArtifact com/sun/jersey/jersey-project/1.18.1/jersey-project-1.18.1.pom.sha1 -fetchArtifact com/sun/jersey/jersey-project/1.18.1/jersey-project-1.18.1.pom -fetchArtifact com/sun/jersey/jersey-project/1.17.1/jersey-project-1.17.1.pom.sha1 -fetchArtifact com/sun/jersey/jersey-project/1.17.1/jersey-project-1.17.1.pom -fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.pom.sha1 -fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.jar.sha1 -fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.jar -fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.pom -fetchArtifact com/sun/jersey/contribs/jersey-contribs/1.18.1/jersey-contribs-1.18.1.pom -fetchArtifact com/sun/jersey/contribs/jersey-contribs/1.18.1/jersey-contribs-1.18.1.pom.sha1 -fetchArtifact com/sun/mail/all/1.4.5/all-1.4.5.pom -fetchArtifact com/sun/mail/all/1.4.5/all-1.4.5.pom.sha1 -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1 -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1 -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1 -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1 -fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.jar -fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.pom -fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.pom.sha1 -fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.jar.sha1 -fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom -fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1 -fetchArtifact asm/asm-parent/3.1/asm-parent-3.1.pom.sha1 -fetchArtifact asm/asm-parent/3.1/asm-parent-3.1.pom -fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom -fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar -fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1 -fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1 -fetchArtifact asm/asm/3.1/asm-3.1.pom.sha1 -fetchArtifact asm/asm/3.1/asm-3.1.pom -fetchArtifact jline/jline/0.9.94/jline-0.9.94.pom -fetchArtifact jline/jline/0.9.94/jline-0.9.94.pom.sha1 -fetchArtifact jline/jline/0.9.94/jline-0.9.94.jar.sha1 -fetchArtifact jline/jline/0.9.94/jline-0.9.94.jar -fetchArtifact xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.pom -fetchArtifact xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.pom.sha1 -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1 -fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom -fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1 -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1 -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1 -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1 -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1 -fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.jar -fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.jar.sha1 -fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.pom -fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.pom.sha1 -fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.jar.sha1 -fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.jar -fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.pom -fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.pom.sha1 -fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom -fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar.sha1 -fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom.sha1 -fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar -fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar -fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.pom.sha1 -fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.pom -fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar.sha1 -fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.pom.sha1 -fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.jar -fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.pom -fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.jar.sha1 -fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.pom -fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.jar -fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.jar.sha1 -fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.pom.sha1 -fetchArtifact org/javabits/jgrapht/jgrapht/0.9.1/jgrapht-0.9.1.pom.sha1 -fetchArtifact org/javabits/jgrapht/jgrapht/0.9.1/jgrapht-0.9.1.pom -fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.pom -fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.jar.sha1 -fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.jar -fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.pom.sha1 -fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.jar.sha1 -fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.jar -fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.pom.sha1 -fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.pom -fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.jar -fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.pom.sha1 -fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.pom -fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.jar.sha1 -fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar.sha1 -fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar -fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.pom -fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.pom.sha1 -fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.pom.sha1 -fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.jar.sha1 -fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.pom -fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.jar -fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.pom -fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.pom.sha1 -fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.jar -fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.jar.sha1 -fetchArtifact org/scala-lang/scala-library/2.11.0/scala-library-2.11.0.pom -fetchArtifact org/scala-lang/scala-library/2.11.0/scala-library-2.11.0.pom.sha1 -fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.pom.sha1 -fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.pom -fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.jar.sha1 -fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.jar -fetchArtifact org/scala-lang/scala-reflect/2.11.1/scala-reflect-2.11.1.pom.sha1 -fetchArtifact org/scala-lang/scala-reflect/2.11.1/scala-reflect-2.11.1.pom -fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.jar -fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.jar.sha1 -fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.pom -fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.pom.sha1 -fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.pom.sha1 -fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.jar.sha1 -fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.pom -fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.jar -fetchArtifact org/scala-lang/scala-reflect/2.11.0/scala-reflect-2.11.0.pom.sha1 -fetchArtifact org/scala-lang/scala-reflect/2.11.0/scala-reflect-2.11.0.pom -fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.pom -fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.pom.sha1 -fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.jar -fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.jar.sha1 -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.jar.sha1 -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.jar -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.pom -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.pom.sha1 -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.pom.sha1 -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.pom -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.jar.sha1 -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.jar -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.jar.sha1 -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.jar -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.pom.sha1 -fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.pom -fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.jar.sha1 -fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.pom -fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.jar -fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.pom.sha1 -fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.pom.sha1 -fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar.sha1 -fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.pom -fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar -fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.jar.sha1 -fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.pom.sha1 -fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.pom -fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.jar -fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.jar.sha1 -fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.pom.sha1 -fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.pom -fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.jar -fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.jar -fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.pom -fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.jar.sha1 -fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.pom.sha1 -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1 -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1 -fetchArtifact org/jboss/shrinkwrap/shrinkwrap-bom/1.0.1/shrinkwrap-bom-1.0.1.pom -fetchArtifact org/jboss/shrinkwrap/shrinkwrap-bom/1.0.1/shrinkwrap-bom-1.0.1.pom.sha1 -fetchArtifact org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-bom/2.0.0-alpha-3/shrinkwrap-descriptors-bom-2.0.0-alpha-3.pom.sha1 -fetchArtifact org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-bom/2.0.0-alpha-3/shrinkwrap-descriptors-bom-2.0.0-alpha-3.pom -fetchArtifact org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-bom/1.0.0-beta-7/shrinkwrap-resolver-bom-1.0.0-beta-7.pom -fetchArtifact org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-bom/1.0.0-beta-7/shrinkwrap-resolver-bom-1.0.0-beta-7.pom.sha1 -fetchArtifact org/jboss/jboss-parent/9/jboss-parent-9.pom.sha1 -fetchArtifact org/jboss/jboss-parent/9/jboss-parent-9.pom -fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.pom -fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.jar -fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.jar.sha1 -fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.pom.sha1 -fetchArtifact org/jboss/arquillian/arquillian-bom/1.0.2.Final/arquillian-bom-1.0.2.Final.pom -fetchArtifact org/jboss/arquillian/arquillian-bom/1.0.2.Final/arquillian-bom-1.0.2.Final.pom.sha1 -fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.jar.sha1 -fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.pom -fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.pom.sha1 -fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.jar -fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.pom -fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.jar.sha1 -fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.jar -fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.pom.sha1 -fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.jar.sha1 -fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.pom -fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.jar -fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.pom.sha1 -fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.jar -fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.pom -fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.jar.sha1 -fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.pom.sha1 -fetchArtifact org/hibernate/hibernate-validator-parent/5.1.2.Final/hibernate-validator-parent-5.1.2.Final.pom.sha1 -fetchArtifact org/hibernate/hibernate-validator-parent/5.1.2.Final/hibernate-validator-parent-5.1.2.Final.pom -fetchArtifact org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.pom.sha1 -fetchArtifact org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.pom -fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar -fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.pom -fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.pom.sha1 -fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar.sha1 -fetchArtifact org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.pom -fetchArtifact org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.pom.sha1 -fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar -fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.pom -fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.pom.sha1 -fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar.sha1 -fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.jar.sha1 -fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.pom.sha1 -fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.pom -fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.jar -fetchArtifact org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5.pom -fetchArtifact org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5.pom.sha1 -fetchArtifact org/slf4j/slf4j-parent/1.7.7/slf4j-parent-1.7.7.pom -fetchArtifact org/slf4j/slf4j-parent/1.7.7/slf4j-parent-1.7.7.pom.sha1 -fetchArtifact org/slf4j/slf4j-parent/1.7.6/slf4j-parent-1.7.6.pom.sha1 -fetchArtifact org/slf4j/slf4j-parent/1.7.6/slf4j-parent-1.7.6.pom -fetchArtifact org/slf4j/slf4j-parent/1.6.1/slf4j-parent-1.6.1.pom -fetchArtifact org/slf4j/slf4j-parent/1.6.1/slf4j-parent-1.6.1.pom.sha1 -fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.jar -fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.pom -fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.jar.sha1 -fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.pom.sha1 -fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1 -fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom -fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1 -fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1 -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom -fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1 -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar -fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom -fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1 -fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom -fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom -fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1 -fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.jar.sha1 -fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.jar -fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.pom -fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.pom.sha1 -fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.jar -fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.pom.sha1 -fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.pom -fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.jar.sha1 -fetchArtifact org/apache/ant/ant-parent/1.8.2/ant-parent-1.8.2.pom.sha1 -fetchArtifact org/apache/ant/ant-parent/1.8.2/ant-parent-1.8.2.pom -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1 -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.pom -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.jar -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.jar -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.pom -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.pom -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.jar -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar -fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.pom -fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.jar -fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/25/maven-plugins-25.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/25/maven-plugins-25.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.pom -fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.jar -fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.jar -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar -fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.pom -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.pom -fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.jar -fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1 -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1 -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar -fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.jar -fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.pom -fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.10/maven-artifact-manager-2.0.10.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.10/maven-artifact-manager-2.0.10.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.11/maven-artifact-manager-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.11/maven-artifact-manager-2.0.11.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/plugin-tools/maven-plugin-tools/3.2/maven-plugin-tools-3.2.pom -fetchArtifact org/apache/maven/plugin-tools/maven-plugin-tools/3.2/maven-plugin-tools-3.2.pom.sha1 -fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.pom.sha1 -fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.jar -fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.pom -fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom -fetchArtifact org/apache/maven/maven-profile/2.0.10/maven-profile-2.0.10.pom -fetchArtifact org/apache/maven/maven-profile/2.0.10/maven-profile-2.0.10.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom -fetchArtifact org/apache/maven/maven-profile/2.0.11/maven-profile-2.0.11.pom -fetchArtifact org/apache/maven/maven-profile/2.0.11/maven-profile-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom -fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.10/maven-project-2.0.10.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.10/maven-project-2.0.10.pom -fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom -fetchArtifact org/apache/maven/maven-project/2.0.11/maven-project-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.11/maven-project-2.0.11.pom -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar -fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom -fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.10/maven-model-2.0.10.pom -fetchArtifact org/apache/maven/maven-model/2.0.10/maven-model-2.0.10.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom -fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.11/maven-model-2.0.11.pom -fetchArtifact org/apache/maven/maven-model/2.0.11/maven-model-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire/2.14.1/surefire-2.14.1.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire/2.14.1/surefire-2.14.1.pom -fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.jar -fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.jar.sha1 -fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.pom -fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.pom -fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.jar.sha1 -fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.jar -fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.pom.sha1 -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.jar.sha1 -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.pom -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.pom.sha1 -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.jar -fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.jar -fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.pom -fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.jar.sha1 -fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.pom -fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.jar -fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.jar.sha1 -fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-providers/2.14.1/surefire-providers-2.14.1.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-providers/2.14.1/surefire-providers-2.14.1.pom -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.10/maven-repository-metadata-2.0.10.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.10/maven-repository-metadata-2.0.10.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.11/maven-repository-metadata-2.0.11.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.11/maven-repository-metadata-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom -fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom -fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom -fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom -fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom -fetchArtifact org/apache/maven/maven/2.0.10/maven-2.0.10.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.10/maven-2.0.10.pom -fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom -fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom -fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom -fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.11/maven-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.11/maven-2.0.11.pom -fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom -fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.10/maven-artifact-2.0.10.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.10/maven-artifact-2.0.10.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.11/maven-artifact-2.0.11.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.11/maven-artifact-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom -fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom -fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom -fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom -fetchArtifact org/apache/maven/maven-settings/2.0.10/maven-settings-2.0.10.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.10/maven-settings-2.0.10.pom -fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom -fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.11/maven-settings-2.0.11.pom -fetchArtifact org/apache/maven/maven-settings/2.0.11/maven-settings-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.10/maven-plugin-registry-2.0.10.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.10/maven-plugin-registry-2.0.10.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.11/maven-plugin-registry-2.0.11.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.11/maven-plugin-registry-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar -fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom -fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/4/maven-parent-4.pom -fetchArtifact org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom -fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/22/maven-parent-22.pom -fetchArtifact org/apache/maven/maven-parent/22/maven-parent-22.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom -fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/24/maven-parent-24.pom -fetchArtifact org/apache/maven/maven-parent/24/maven-parent-24.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom -fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom -fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom -fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom -fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/12/maven-parent-12.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/12/maven-parent-12.pom -fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom -fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom -fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom -fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom -fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom -fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.10/maven-plugin-api-2.0.10.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.10/maven-plugin-api-2.0.10.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.11/maven-plugin-api-2.0.11.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.11/maven-plugin-api-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1 -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.4/doxia-modules-1.1.4.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.4/doxia-modules-1.1.4.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.2/doxia-modules-1.1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.2/doxia-modules-1.1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.2/doxia-decoration-model-1.1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.2/doxia-decoration-model-1.1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.jar -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.2/doxia-module-fml-1.1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.2/doxia-module-fml-1.1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.4/doxia-sitetools-1.1.4.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.4/doxia-sitetools-1.1.4.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.2/doxia-sitetools-1.1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.2/doxia-sitetools-1.1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.jar -fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.1.2/doxia-core-1.1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.1.2/doxia-core-1.1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.jar -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.pom -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.2/doxia-module-xhtml-1.1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.2/doxia-module-xhtml-1.1.2.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.1.4/doxia-1.1.4.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.1.4/doxia-1.1.4.pom -fetchArtifact org/apache/maven/doxia/doxia/1.1.2/doxia-1.1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.1.2/doxia-1.1.2.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.jar -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.2/doxia-site-renderer-1.1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.2/doxia-site-renderer-1.1.2.pom.sha1 -fetchArtifact org/apache/apache/7/apache-7.pom -fetchArtifact org/apache/apache/7/apache-7.pom.sha1 -fetchArtifact org/apache/apache/4/apache-4.pom -fetchArtifact org/apache/apache/4/apache-4.pom.sha1 -fetchArtifact org/apache/apache/1/apache-1.pom -fetchArtifact org/apache/apache/1/apache-1.pom.sha1 -fetchArtifact org/apache/apache/9/apache-9.pom -fetchArtifact org/apache/apache/9/apache-9.pom.sha1 -fetchArtifact org/apache/apache/14/apache-14.pom.sha1 -fetchArtifact org/apache/apache/14/apache-14.pom -fetchArtifact org/apache/apache/13/apache-13.pom -fetchArtifact org/apache/apache/13/apache-13.pom.sha1 -fetchArtifact org/apache/apache/3/apache-3.pom -fetchArtifact org/apache/apache/3/apache-3.pom.sha1 -fetchArtifact org/apache/apache/5/apache-5.pom -fetchArtifact org/apache/apache/5/apache-5.pom.sha1 -fetchArtifact org/apache/apache/6/apache-6.pom.sha1 -fetchArtifact org/apache/apache/6/apache-6.pom -fetchArtifact org/apache/apache/11/apache-11.pom -fetchArtifact org/apache/apache/11/apache-11.pom.sha1 -fetchArtifact org/apache/apache/10/apache-10.pom -fetchArtifact org/apache/apache/10/apache-10.pom.sha1 -fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.pom -fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.pom.sha1 -fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.jar.sha1 -fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.jar -fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.pom -fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.jar -fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.pom.sha1 -fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.jar.sha1 -fetchArtifact org/apache/curator/apache-curator/2.6.0/apache-curator-2.6.0.pom -fetchArtifact org/apache/curator/apache-curator/2.6.0/apache-curator-2.6.0.pom.sha1 -fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.pom.sha1 -fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.jar -fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.pom -fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.jar.sha1 -fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.jar -fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.jar.sha1 -fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.pom.sha1 -fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.pom -fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.pom.sha1 -fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.jar -fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.pom -fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.jar.sha1 -fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.jar.sha1 -fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.pom.sha1 -fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.pom -fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.jar -fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.pom -fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar.sha1 -fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar -fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.pom.sha1 -fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.jar.sha1 -fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.pom -fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.jar -fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.pom.sha1 -fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.jar -fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.jar.sha1 -fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.pom.sha1 -fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.pom -fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.jar -fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.pom.sha1 -fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.pom -fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.jar.sha1 -fetchArtifact org/apache/commons/commons-parent/28/commons-parent-28.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/28/commons-parent-28.pom -fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom -fetchArtifact org/apache/commons/commons-parent/22/commons-parent-22.pom -fetchArtifact org/apache/commons/commons-parent/22/commons-parent-22.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom -fetchArtifact org/apache/commons/commons-parent/24/commons-parent-24.pom -fetchArtifact org/apache/commons/commons-parent/24/commons-parent-24.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom -fetchArtifact org/apache/commons/commons-parent/32/commons-parent-32.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/32/commons-parent-32.pom -fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom -fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/18/commons-parent-18.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/18/commons-parent-18.pom -fetchArtifact org/apache/commons/commons-parent/11/commons-parent-11.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/11/commons-parent-11.pom -fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.pom.sha1 -fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar.sha1 -fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar -fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.pom -fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.pom -fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.jar -fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.pom.sha1 -fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.jar.sha1 -fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.jar -fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.pom.sha1 -fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.pom -fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.jar.sha1 -fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom -fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.jar -fetchArtifact org/codehaus/plexus/plexus-compilers/1.8.1/plexus-compilers-1.8.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compilers/1.8.1/plexus-compilers-1.8.1.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom -fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom -fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom -fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler/1.8.1/plexus-compiler-1.8.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler/1.8.1/plexus-compiler-1.8.1.pom.sha1 -fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.pom.sha1 -fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.pom -fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.jar.sha1 -fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.jar -fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.jar -fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.jar.sha1 -fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.pom -fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.pom.sha1 -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1 -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1 -fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1 -fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom -fetchArtifact org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520.pom -fetchArtifact org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.jar -fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.pom -fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.jar.sha1 -fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520.pom -fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.pom -fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.jar -fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.jar.sha1 -fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.jar -fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.jar.sha1 -fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.pom -fetchArtifact org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.pom -fetchArtifact org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.jar.sha1 -fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.pom -fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.jar -fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-project/8.1.11.v20130520/jetty-project-8.1.11.v20130520.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-project/8.1.11.v20130520/jetty-project-8.1.11.v20130520.pom -fetchArtifact org/eclipse/jetty/jetty-project/8.1.15.v20140411/jetty-project-8.1.15.v20140411.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-project/8.1.15.v20140411/jetty-project-8.1.15.v20140411.pom -fetchArtifact org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.pom -fetchArtifact org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.jar.sha1 -fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.jar -fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.pom -fetchArtifact org/eclipse/jetty/jetty-parent/20/jetty-parent-20.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-parent/20/jetty-parent-20.pom -fetchArtifact org/eclipse/jetty/jetty-parent/18/jetty-parent-18.pom -fetchArtifact org/eclipse/jetty/jetty-parent/18/jetty-parent-18.pom.sha1 -fetchArtifact org/eclipse/jetty/orbit/jetty-orbit/1/jetty-orbit-1.pom -fetchArtifact org/eclipse/jetty/orbit/jetty-orbit/1/jetty-orbit-1.pom.sha1 -fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar -fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.pom.sha1 -fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar.sha1 -fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.pom -fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.pom -fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.jar -fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.jar.sha1 -fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.pom -fetchArtifact org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.pom -fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.jar -fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.jar.sha1 -fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.pom.sha1 -fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.pom -fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.jar -fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.jar.sha1 -fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.jar.sha1 -fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.pom.sha1 -fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.jar -fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.pom -fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.jar -fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.pom -fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.jar.sha1 -fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar -fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom -fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar.sha1 -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom -fetchArtifact org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom -fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1 -fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom -fetchArtifact org/sonatype/oss/oss-parent/5/oss-parent-5.pom -fetchArtifact org/sonatype/oss/oss-parent/5/oss-parent-5.pom.sha1 -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1 -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom -fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom -fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom -fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom -fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1 -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom -fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom -fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom -fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom -fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom -fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom -fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom -fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom -fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1 -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1 -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar -fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.pom -fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.pom.sha1 -fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar.sha1 -fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar -fetchArtifact org/ow2/asm/asm-parent/5.0.2/asm-parent-5.0.2.pom.sha1 -fetchArtifact org/ow2/asm/asm-parent/5.0.2/asm-parent-5.0.2.pom -fetchArtifact org/ow2/asm/asm-parent/4.1/asm-parent-4.1.pom -fetchArtifact org/ow2/asm/asm-parent/4.1/asm-parent-4.1.pom.sha1 -fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.jar -fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.pom.sha1 -fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.pom -fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.jar.sha1 -fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.pom -fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.jar -fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.pom.sha1 -fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.jar.sha1 -fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.jar.sha1 -fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.pom.sha1 -fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.pom -fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.jar -fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.jar.sha1 -fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.pom.sha1 -fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.pom -fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.jar -fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.pom -fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.jar -fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.pom.sha1 -fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.jar.sha1 -fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.jar -fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.pom -fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.pom.sha1 -fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.jar.sha1 -fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.jar -fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.jar.sha1 -fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.pom -fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.pom.sha1 -fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.jar -fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.pom.sha1 -fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.jar.sha1 -fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.pom -fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.pom -fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.jar -fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.jar.sha1 -fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.pom.sha1 -fetchArtifact org/ow2/ow2/1.3/ow2-1.3.pom.sha1 -fetchArtifact org/ow2/ow2/1.3/ow2-1.3.pom -fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.jar.sha1 -fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.jar -fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.pom -fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.pom.sha1 -fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.jar.sha1 -fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.pom -fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.pom.sha1 -fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.jar -fetchArtifact junit/junit/4.11/junit-4.11.jar -fetchArtifact junit/junit/4.11/junit-4.11.pom -fetchArtifact junit/junit/4.11/junit-4.11.jar.sha1 -fetchArtifact junit/junit/4.11/junit-4.11.pom.sha1 -fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom -fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar -fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1 -fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1 -fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom -fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1 -fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.pom -fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.jar.sha1 -fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.jar -fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.pom.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom -fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1 -fetchArtifact javax/inject/javax.inject/1/javax.inject-1.pom -fetchArtifact javax/inject/javax.inject/1/javax.inject-1.jar -fetchArtifact javax/inject/javax.inject/1/javax.inject-1.jar.sha1 -fetchArtifact javax/inject/javax.inject/1/javax.inject-1.pom.sha1 -fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.pom.sha1 -fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.jar.sha1 -fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.jar -fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.pom -fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.pom -fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar.sha1 -fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.pom.sha1 -fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar -fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.pom.sha1 -fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.jar -fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.pom -fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.jar.sha1 -fetchArtifact javax/activation/activation/1.1/activation-1.1.pom.sha1 -fetchArtifact javax/activation/activation/1.1/activation-1.1.pom -fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.jar.sha1 -fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.pom -fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.jar -fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.pom.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom -fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.jar -fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.pom -fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.jar.sha1 -fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.pom.sha1 -fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.jar.sha1 -fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.pom -fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.pom.sha1 -fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.jar -fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom -fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1 -fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1 -fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 0e9e34fd261..91fa9e8b4ff 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.18.6"; + version = "1.18.8"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0ijcssalzb0gx23va23q6q6haj2m9dy36l9i7lq1726m75fa5yjv"; + sha256 = "1dswgxxbybwllf2lf89saarsrn4pkb2617wycim07cd7i1l1dv5n"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 724448c9b1a..72dfe3ecc33 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/instrumenta/kubeval"; license = licenses.asl20; maintainers = with maintainers; [ johanot nicknovitski ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix deleted file mode 100644 index df571f4cf86..00000000000 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, makeWrapper, jdk, mesos, fetchurl }: - -stdenv.mkDerivation rec { - pname = "marathon"; - version = "1.4.2"; - - src = fetchurl { - url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz"; - sha256 = "6eab65a95c87a989e922aca2b49ba872b50a94e46a8fd4831d1ab41f319d6932"; - }; - - buildInputs = [ makeWrapper jdk mesos ]; - - installPhase = '' - mkdir -p $out/{bin,libexec/marathon} - cp target/scala-*/marathon*.jar $out/libexec/marathon/${pname}-${version}.jar - - makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \ - --add-flags "-Xmx512m -jar $out/libexec/marathon/${pname}-${version}.jar" \ - --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY" - ''; - - meta = with stdenv.lib; { - homepage = "https://mesosphere.github.io/marathon"; - description = "Cluster-wide init and control system for services in cgroups or Docker containers"; - license = licenses.asl20; - maintainers = with maintainers; [ kamilchm pradeepchhetri ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix deleted file mode 100644 index ac1feee5d72..00000000000 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ /dev/null @@ -1,263 +0,0 @@ -{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh -, unzip, gnutar, jdk, python, wrapPython -, setuptools, boto, pythonProtobuf, apr, subversion, gzip -, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent -, ethtool, coreutils, which, iptables, maven -, bash, autoreconfHook -, utf8proc, lz4 -, withJava ? !stdenv.isDarwin -}: - -let - mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; }; - # `tar -z` requires gzip on $PATH, so wrap tar. - # At some point, we should try to patch mesos so we add gzip to the PATH when - # tar is invoked. I think that only needs to be done here: - # src/common/command_utils.cpp - # https://github.com/NixOS/nixpkgs/issues/13783 - tarWithGzip = lib.overrideDerivation gnutar (oldAttrs: { - # Original builder is bash 4.3.42 from bootstrap tools, too old for makeWrapper. - builder = "${bash}/bin/bash"; - buildInputs = (oldAttrs.buildInputs or []) ++ [ makeWrapper ]; - postInstall = (oldAttrs.postInstall or "") + '' - wrapProgram $out/bin/tar --prefix PATH ":" "${gzip}/bin" - ''; - }); - -in stdenv.mkDerivation rec { - version = "1.4.1"; - pname = "mesos"; - - enableParallelBuilding = true; - dontDisableStatic = true; - - src = fetchurl { - url = "mirror://apache/mesos/${version}/${pname}-${version}.tar.gz"; - sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr"; - }; - - patches = [ - # https://reviews.apache.org/r/36610/ - # TODO: is this still needed? - ./rb36610.patch - - # see https://github.com/cstrahan/mesos/tree/nixos-${version} - ./nixos.patch - ]; - nativeBuildInputs = [ - autoreconfHook - ]; - buildInputs = [ - makeWrapper curl sasl - python wrapPython boto setuptools leveldb - subversion apr glog openssl libevent - utf8proc lz4 - ] ++ lib.optionals stdenv.isLinux [ - libnl - ] ++ lib.optionals withJava [ - jdk maven - ]; - - propagatedBuildInputs = [ - pythonProtobuf - ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow -Wno-error=class-memaccess"; - - preConfigure = '' - # https://issues.apache.org/jira/browse/MESOS-6616 - configureFlagsArray+=( - "CXXFLAGS=-O2 -Wno-error=strict-aliasing" - ) - - substituteInPlace 3rdparty/stout/include/stout/jsonify.hpp \ - --replace '<xlocale.h>' '<locale.h>' - # Fix cases where makedev(),major(),minor() are referenced through - # <sys/types.h> instead of <sys/sysmacros.h> - sed 1i'#include <sys/sysmacros.h>' -i src/linux/fs.cpp - sed 1i'#include <sys/sysmacros.h>' -i src/slave/containerizer/mesos/isolators/gpu/isolator.cpp - substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \ - --subst-var-by chown ${coreutils}/bin/chown - - substituteInPlace 3rdparty/stout/Makefile.am \ - --replace "-lprotobuf" \ - "${pythonProtobuf.protobuf}/lib/libprotobuf.a" - - substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \ - --subst-var-by sh ${bash}/bin/bash - - substituteInPlace 3rdparty/stout/include/stout/posix/os.hpp \ - --subst-var-by tar ${tarWithGzip}/bin/tar - - substituteInPlace src/cli/mesos-scp \ - --subst-var-by scp ${openssh}/bin/scp - - substituteInPlace src/common/command_utils.cpp \ - --subst-var-by curl ${curl}/bin/curl \ - --subst-var-by gzip ${gzip}/bin/gzip \ - --subst-var-by sha512sum ${coreutils}/bin/sha512sum \ - --subst-var-by tar ${tarWithGzip}/bin/tar - - substituteInPlace src/launcher/fetcher.cpp \ - --subst-var-by cp ${coreutils}/bin/cp \ - --subst-var-by gzip ${gzip}/bin/gzip \ - --subst-var-by tar ${tarWithGzip}/bin/tar \ - --subst-var-by unzip ${unzip}/bin/unzip - - substituteInPlace src/python/cli/src/mesos/cli.py \ - --subst-var-by mesos-resolve $out/bin/mesos-resolve - - substituteInPlace src/python/native_common/ext_modules.py.in \ - --replace "-lprotobuf" \ - "${pythonProtobuf.protobuf}/lib/libprotobuf.a" - - substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \ - --subst-var-by cp ${coreutils}/bin/cp \ - --subst-var-by which ${which}/bin/which - - substituteInPlace src/slave/containerizer/mesos/isolators/posix/disk.cpp \ - --subst-var-by du ${coreutils}/bin/du - - substituteInPlace src/slave/containerizer/mesos/provisioner/backends/copy.cpp \ - --subst-var-by cp ${coreutils}/bin/cp \ - --subst-var-by rm ${coreutils}/bin/rm - - substituteInPlace src/uri/fetchers/copy.cpp \ - --subst-var-by cp ${coreutils}/bin/cp - - substituteInPlace src/uri/fetchers/curl.cpp \ - --subst-var-by curl ${curl}/bin/curl - - substituteInPlace src/uri/fetchers/docker.cpp \ - --subst-var-by curl ${curl}/bin/curl - - substituteInPlace src/Makefile.am \ - --subst-var-by mavenRepo ${mavenRepo} \ - --replace "-lprotobuf" \ - "${pythonProtobuf.protobuf}/lib/libprotobuf.a" - - '' + lib.optionalString stdenv.isLinux '' - - substituteInPlace src/linux/perf.cpp \ - --subst-var-by perf ${perf}/bin/perf - - substituteInPlace src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp \ - --subst-var-by mount ${utillinux}/bin/mount - - substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/linux.cpp \ - --subst-var-by mount ${utillinux}/bin/mount - - substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \ - --subst-var-by mount ${utillinux}/bin/mount - - substituteInPlace src/slave/containerizer/mesos/isolators/gpu/isolator.cpp \ - --subst-var-by mount ${utillinux}/bin/mount - - substituteInPlace src/slave/containerizer/mesos/isolators/namespaces/pid.cpp \ - --subst-var-by mount ${utillinux}/bin/mount - - substituteInPlace src/slave/containerizer/mesos/isolators/network/cni/cni.cpp \ - --subst-var-by mount ${utillinux}/bin/mount - - substituteInPlace src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp \ - --subst-var-by iptables ${iptables}/bin/iptables - - substituteInPlace src/slave/containerizer/mesos/isolators/network/port_mapping.cpp \ - --subst-var-by ethtool ${ethtool}/sbin/ethtool \ - --subst-var-by ip ${iproute}/bin/ip \ - --subst-var-by mount ${utillinux}/bin/mount \ - --subst-var-by tc ${iproute}/bin/tc - - substituteInPlace src/slave/containerizer/mesos/isolators/volume/image.cpp \ - --subst-var-by mount ${utillinux}/bin/mount - - substituteInPlace src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp \ - --subst-var-by mount ${utillinux}/bin/mount - ''; - - configureFlags = [ - "--sbindir=\${out}/bin" - "--with-apr=${apr.dev}" - "--with-svn=${subversion.dev}" - "--with-leveldb=${leveldb}" - "--with-glog=${glog}" - "--enable-optimize" - "--disable-python-dependency-install" - "--enable-ssl" - "--with-ssl=${openssl.dev}" - "--enable-libevent" - "--with-libevent=${libevent.dev}" - "--with-protobuf=${pythonProtobuf.protobuf}" - "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar" - (if withJava then "--enable-java" else "--disable-java") - ] ++ lib.optionals stdenv.isLinux [ - "--with-network-isolator" - "--with-nl=${libnl.dev}" - ]; - - postInstall = '' - rm -rf $out/var - rm $out/bin/*.sh - - # Inspired by: pkgs/development/python-modules/generic/default.nix - pushd src/python - mkdir -p $out/lib/${python.libPrefix}/site-packages - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ - --old-and-unmanageable \ - --prefix="$out" - rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* - popd - - # optional python dependency for mesos cli - pushd src/python/cli - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ - --old-and-unmanageable \ - --prefix="$out" - popd - '' + stdenv.lib.optionalString withJava '' - mkdir -p $out/share/java - cp src/java/target/mesos-*.jar $out/share/java - - MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} - - mkdir -p $out/nix-support - touch $out/nix-support/setup-hook - echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - ''; - - postFixup = '' - if test -e $out/nix-support/propagated-build-inputs; then - ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages - fi - - for inputsfile in propagated-build-inputs propagated-native-build-inputs; do - if test -e $out/nix-support/$inputsfile; then - createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" - fi - done - - for f in $out/libexec/mesos/python/mesos/*.py; do - ${python}/bin/${python.executable} -c "import py_compile; py_compile.compile('$f')" - done - - # wrap the python programs - for prog in mesos-cat mesos-ps mesos-scp mesos-tail; do - wrapProgram "$out/bin/$prog" \ - --prefix PYTHONPATH ":" "$out/lib/${python.libPrefix}/site-packages" - true - done - ''; - - meta = with lib; { - homepage = "http://mesos.apache.org"; - license = licenses.asl20; - description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; - maintainers = with maintainers; [ cstrahan offline ]; - platforms = platforms.unix; - broken = true; # Broken since 2019-10-22 (https://hydra.nixos.org/build/115475123) - }; -} diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh deleted file mode 100644 index 1e2840017b3..00000000000 --- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh +++ /dev/null @@ -1,1359 +0,0 @@ -source $stdenv/setup -header "fetching Apache Mesos maven repo" - -function fetchArtifact { - repoPath="$1" - echo "Fetching $repoPath" - url="https://repo.maven.apache.org/maven2/$repoPath" - mkdir -p $(dirname $out/$repoPath) - curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath" -} - -fetchArtifact org/apache/apache/11/apache-11.pom -fetchArtifact org/apache/apache/11/apache-11.pom.sha1 -fetchArtifact org/apache/apache/10/apache-10.pom -fetchArtifact org/apache/apache/10/apache-10.pom.sha1 -fetchArtifact org/apache/apache/7/apache-7.pom -fetchArtifact org/apache/apache/7/apache-7.pom.sha1 -fetchArtifact org/apache/apache/9/apache-9.pom -fetchArtifact org/apache/apache/9/apache-9.pom.sha1 -fetchArtifact org/apache/apache/13/apache-13.pom -fetchArtifact org/apache/apache/13/apache-13.pom.sha1 -fetchArtifact org/apache/apache/3/apache-3.pom -fetchArtifact org/apache/apache/3/apache-3.pom.sha1 -fetchArtifact org/apache/apache/6/apache-6.pom -fetchArtifact org/apache/apache/6/apache-6.pom.sha1 -fetchArtifact org/apache/apache/4/apache-4.pom -fetchArtifact org/apache/apache/4/apache-4.pom.sha1 -fetchArtifact org/apache/apache/2/apache-2.pom -fetchArtifact org/apache/apache/2/apache-2.pom.sha1 -fetchArtifact org/apache/apache/5/apache-5.pom -fetchArtifact org/apache/apache/5/apache-5.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1 -fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom -fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom -fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom -fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom -fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom -fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom -fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom -fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom -fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom -fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom -fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom -fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom -fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom -fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom -fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1 -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1 -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom -fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom -fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom -fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom -fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom -fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom -fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom -fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom -fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom -fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom -fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom -fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar.sha1 -fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom -fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom -fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom -fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom -fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom -fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom -fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom -fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom -fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom -fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom -fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom -fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom -fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom -fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom -fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom -fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom -fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1 -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1 -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1 -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1 -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar.sha1 -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1 -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1 -fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar -fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar.sha1 -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar.sha1 -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar.sha1 -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar.sha1 -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar.sha1 -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1 -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1 -fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom -fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1 -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1 -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1 -fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom -fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom -fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom -fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom -fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom -fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom -fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1 -fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar -fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1 -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1 -fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom -fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1 -fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom -fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1 -fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom -fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1 -fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom -fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1 -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1 -fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom -fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom -fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1 -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1 -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1 -fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom -fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1 -fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom -fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1 -fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom -fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom.sha1 -fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar -fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1 -fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom -fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom.sha1 -fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom -fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom -fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom -fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom -fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom -fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom -fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom -fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom -fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom -fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom -fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom -fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom -fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1 -fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom -fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1 -fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom -fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar.sha1 -fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom -fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom -fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1 -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1 -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar.sha1 -fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom -fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1 -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar.sha1 -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar.sha1 -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1 -fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom -fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1 -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1 -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1 -fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom -fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1 -fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom -fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom -fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom -fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1 -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1 -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1 -fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom -fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1 -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1 -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1 -fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom -fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1 -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1 -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1 -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1 -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1 -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1 -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1 -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1 -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1 -fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom -fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom.sha1 -fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar -fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar.sha1 -fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom -fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom.sha1 -fetchArtifact com/google/google/1/google-1.pom -fetchArtifact com/google/google/1/google-1.pom.sha1 -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1 -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1 -fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom -fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1 -fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom -fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1 -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1 -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1 -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1 -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1 -fetchArtifact junit/junit/4.10/junit-4.10.pom -fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1 -fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom -fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1 -fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar -fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1 -fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom -fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1 -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1 -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar.sha1 -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1 -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 -fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom -fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1 -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1 -fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom -fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1 -fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom -fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1 -fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom -fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1 -fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar -fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1 -fetchArtifact velocity/velocity/1.5/velocity-1.5.pom -fetchArtifact velocity/velocity/1.5/velocity-1.5.pom.sha1 -fetchArtifact velocity/velocity/1.5/velocity-1.5.jar -fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1 -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1 -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1 -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1 -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1 -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1 -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1 -fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom -fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1 -fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom -fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom -fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom -fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 -fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom -fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1 -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1 -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1 -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1 -fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom -fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom -fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1 -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1 -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1 -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1 -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1 -fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom -fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1 -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1 -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1 -fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom -fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1 -fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom -fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1 -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1 -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1 -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1 -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1 -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1 -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1 -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1 -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1 -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1 -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1 -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1 -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1 -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1 -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1 -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1 -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1 -fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom -fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1 -fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar -fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1 -fetchArtifact asm/asm/3.2/asm-3.2.pom -fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1 -fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom -fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1 -fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom -fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1 -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1 -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1 -fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom -fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1 -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1 -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1 -fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom -fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1 -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1 -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1 -fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom -fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1 -fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar -fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1 -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1 -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1 - -stopNest diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix deleted file mode 100644 index 1cf819870f4..00000000000 --- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, curl}: - -stdenv.mkDerivation { - name = "mesos-maven-deps"; - builder = ./fetch-mesos-deps.sh; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly"; - - nativeBuildInputs = [ curl ]; - - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; -} diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/pkgs/applications/networking/cluster/mesos/nixos.patch deleted file mode 100644 index a6fea024b08..00000000000 --- a/pkgs/applications/networking/cluster/mesos/nixos.patch +++ /dev/null @@ -1,731 +0,0 @@ -diff --git i/3rdparty/stout/include/stout/os/posix/fork.hpp w/3rdparty/stout/include/stout/os/posix/fork.hpp -index a29967d..290b98b 100644 ---- i/3rdparty/stout/include/stout/os/posix/fork.hpp -+++ w/3rdparty/stout/include/stout/os/posix/fork.hpp -@@ -369,7 +369,7 @@ private: - if (exec.isSome()) { - // Execute the command (via '/bin/sh -c command'). - const char* command = exec.get().command.c_str(); -- execlp("sh", "sh", "-c", command, (char*) nullptr); -+ execlp("@sh@", "sh", "-c", command, (char*) nullptr); - EXIT(EXIT_FAILURE) - << "Failed to execute '" << command << "': " << os::strerror(errno); - } else if (wait.isSome()) { -diff --git i/3rdparty/stout/include/stout/posix/os.hpp w/3rdparty/stout/include/stout/posix/os.hpp -index 8511dfd..1e7be01 100644 ---- i/3rdparty/stout/include/stout/posix/os.hpp -+++ w/3rdparty/stout/include/stout/posix/os.hpp -@@ -366,7 +366,7 @@ inline Try<std::set<pid_t>> pids(Option<pid_t> group, Option<pid_t> session) - inline Try<Nothing> tar(const std::string& path, const std::string& archive) - { - Try<std::string> tarOut = -- os::shell("tar %s %s %s", "-czf", archive.c_str(), path.c_str()); -+ os::shell("@tar@ %s %s %s", "-czf", archive.c_str(), path.c_str()); - - if (tarOut.isError()) { - return Error("Failed to archive " + path + ": " + tarOut.error()); -diff --git i/src/Makefile.am w/src/Makefile.am -index 68fff14..c572f92 100644 ---- i/src/Makefile.am -+++ w/src/Makefile.am -@@ -1775,7 +1775,7 @@ if HAS_JAVA - - $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom - @echo "Building mesos-$(PACKAGE_VERSION).jar ..." -- @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom clean package -+ @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package - - # Convenience library for JNI bindings. - # TODO(Charles Reiss): We really should be building the Java library -diff --git i/src/cli/mesos-scp w/src/cli/mesos-scp -index a71ab07..1043d1b 100755 ---- i/src/cli/mesos-scp -+++ w/src/cli/mesos-scp -@@ -19,7 +19,8 @@ if sys.version_info < (2,6,0): - - - def scp(host, src, dst): -- cmd = 'scp -pr %s %s' % (src, host + ':' + dst) -+ cmd = '@scp@ -pr %s %s' % (src, host + ':' + dst) -+ - try: - process = subprocess.Popen( - cmd, -diff --git i/src/common/command_utils.cpp w/src/common/command_utils.cpp -index c50be76..388cc53 100644 ---- i/src/common/command_utils.cpp -+++ w/src/common/command_utils.cpp -@@ -142,7 +142,7 @@ Future<Nothing> tar( - - argv.emplace_back(input); - -- return launch("tar", argv) -+ return launch("@tar@", argv) - .then([]() { return Nothing(); }); - } - -@@ -164,7 +164,7 @@ Future<Nothing> untar( - argv.emplace_back(directory.get()); - } - -- return launch("tar", argv) -+ return launch("@tar@", argv) - .then([]() { return Nothing(); }); - } - -@@ -172,7 +172,7 @@ Future<Nothing> untar( - Future<string> sha512(const Path& input) - { - #ifdef __linux__ -- const string cmd = "sha512sum"; -+ const string cmd = "@sha512sum@"; - vector<string> argv = { - cmd, - input // Input file to compute shasum. -@@ -208,7 +208,7 @@ Future<Nothing> gzip(const Path& input) - input - }; - -- return launch("gzip", argv) -+ return launch("@gzip@", argv) - .then([]() { return Nothing(); }); - } - -@@ -221,7 +221,7 @@ Future<Nothing> decompress(const Path& input) - input - }; - -- return launch("gzip", argv) -+ return launch("@gzip@", argv) - .then([]() { return Nothing(); }); - } - -diff --git i/src/launcher/fetcher.cpp w/src/launcher/fetcher.cpp -index 42980f5..3aebeed 100644 ---- i/src/launcher/fetcher.cpp -+++ w/src/launcher/fetcher.cpp -@@ -80,17 +80,17 @@ static Try<bool> extract( - strings::endsWith(sourcePath, ".tar.bz2") || - strings::endsWith(sourcePath, ".txz") || - strings::endsWith(sourcePath, ".tar.xz")) { -- command = {"tar", "-C", destinationDirectory, "-xf", sourcePath}; -+ command = {"@tar@", "-C", destinationDirectory, "-xf", sourcePath}; - } else if (strings::endsWith(sourcePath, ".gz")) { - string pathWithoutExtension = sourcePath.substr(0, sourcePath.length() - 3); - string filename = Path(pathWithoutExtension).basename(); - string destinationPath = path::join(destinationDirectory, filename); - -- command = {"gunzip", "-d", "-c"}; -+ command = {"@gunzip@", "-d", "-c"}; - in = Subprocess::PATH(sourcePath); - out = Subprocess::PATH(destinationPath); - } else if (strings::endsWith(sourcePath, ".zip")) { -- command = {"unzip", "-o", "-d", destinationDirectory, sourcePath}; -+ command = {"@unzip@", "-o", "-d", destinationDirectory, sourcePath}; - } else { - return false; - } -@@ -193,7 +193,7 @@ static Try<string> copyFile( - const string& sourcePath, - const string& destinationPath) - { -- int status = os::spawn("cp", {"cp", sourcePath, destinationPath}); -+ int status = os::spawn("cp", {"@cp@", sourcePath, destinationPath}); - - if (status == -1) { - return ErrnoError("Failed to copy '" + sourcePath + "'"); -diff --git i/src/linux/perf.cpp w/src/linux/perf.cpp -index b301e25..356a2cf 100644 ---- i/src/linux/perf.cpp -+++ w/src/linux/perf.cpp -@@ -128,7 +128,7 @@ private: - // NOTE: The supervisor childhook places perf in its own process group - // and will kill the perf process when the parent dies. - Try<Subprocess> _perf = subprocess( -- "perf", -+ "@perf@", - argv, - Subprocess::PIPE(), - Subprocess::PIPE(), -diff --git i/src/linux/systemd.cpp w/src/linux/systemd.cpp -index 6318f48..394d88d 100644 ---- i/src/linux/systemd.cpp -+++ w/src/linux/systemd.cpp -@@ -196,13 +196,21 @@ bool exists() - // This is static as the init system should not change while we are running. - static const bool exists = []() -> bool { - // (1) Test whether `/sbin/init` links to systemd. -- const Result<string> realpath = os::realpath("/sbin/init"); -- if (realpath.isError() || realpath.isNone()) { -- LOG(WARNING) << "Failed to test /sbin/init for systemd environment: " -- << (realpath.isError() ? realpath.error() -- : "does not exist"); -- -- return false; -+ // cstrahan(nixos): first assume we're on NixOS, then try non-NixOS -+ Result<string> realpath = os::realpath("/run/current-system/systemd/lib/systemd/systemd"); -+ Result<string> realpathNixOS = realpath; -+ if (realpathNixOS.isError() || realpathNixOS.isNone()) { -+ Result<string> realpathNonNixOS = realpath = os::realpath("/sbin/init"); -+ if (realpathNonNixOS.isError() || realpathNonNixOS.isNone()) { -+ LOG(WARNING) << "Failed to test /run/current-system/systemd/lib/systemd/systemd for systemd environment: " -+ << (realpathNixOS.isError() ? realpathNixOS.error() -+ : "does not exist"); -+ LOG(WARNING) << "Failed to test /sbin/init for systemd environment: " -+ << (realpathNonNixOS.isError() ? realpathNonNixOS.error() -+ : "does not exist"); -+ -+ return false; -+ } - } - - CHECK_SOME(realpath); -@@ -278,6 +286,10 @@ Path hierarchy() - - Try<Nothing> daemonReload() - { -+ // cstrahan(nixos): should we patch these `systemctl`s? -+ // probably don't want to hard-code a particular systemd store path here, -+ // but if we use /run/current-system/sw/bin/systemctl, -+ // we won't be able to support non-NixOS distros. - Try<string> daemonReload = os::shell("systemctl daemon-reload"); - if (daemonReload.isError()) { - return Error("Failed to reload systemd daemon: " + daemonReload.error()); -diff --git i/src/python/cli/src/mesos/cli.py w/src/python/cli/src/mesos/cli.py -index 4a9b558..c08a8b9 100644 ---- i/src/python/cli/src/mesos/cli.py -+++ w/src/python/cli/src/mesos/cli.py -@@ -40,7 +40,7 @@ def resolve(master): - import subprocess - - process = subprocess.Popen( -- ['mesos-resolve', master], -+ ['@mesos-resolve@', master], - stdin=None, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, -diff --git i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp -index 5b630c1..d63ad69 100644 ---- i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp -+++ w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp -@@ -499,7 +499,7 @@ Future<Option<ContainerLaunchInfo>> DockerVolumeIsolatorProcess::_prepare( - // unsafe arbitrary commands). - CommandInfo* command = launchInfo.add_pre_exec_commands(); - command->set_shell(false); -- command->set_value("mount"); -+ command->set_value("@mount@"); - command->add_arguments("mount"); - command->add_arguments("-n"); - command->add_arguments("--rbind"); -diff --git i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp -index d7fe9a8..1361a4e 100644 ---- i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp -+++ w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp -@@ -154,9 +154,9 @@ Try<Isolator*> LinuxFilesystemIsolatorProcess::create(const Flags& flags) - // here because 'create' will only be invoked during - // initialization. - Try<string> mount = os::shell( -- "mount --bind %s %s && " -- "mount --make-private %s && " -- "mount --make-shared %s", -+ "@mount@ --bind %s %s && " -+ "@mount@ --make-private %s && " -+ "@mount@ --make-shared %s", - workDir->c_str(), - workDir->c_str(), - workDir->c_str(), -@@ -175,8 +175,8 @@ Try<Isolator*> LinuxFilesystemIsolatorProcess::create(const Flags& flags) - LOG(INFO) << "Making '" << workDir.get() << "' a shared mount"; - - Try<string> mount = os::shell( -- "mount --make-private %s && " -- "mount --make-shared %s", -+ "@mount@ --make-private %s && " -+ "@mount@ --make-shared %s", - workDir->c_str(), - workDir->c_str()); - -@@ -422,7 +422,7 @@ Try<vector<CommandInfo>> LinuxFilesystemIsolatorProcess::getPreExecCommands( - - CommandInfo command; - command.set_shell(false); -- command.set_value("mount"); -+ command.set_value("@mount@"); - command.add_arguments("mount"); - command.add_arguments("-n"); - command.add_arguments("--rbind"); -@@ -610,7 +610,7 @@ Try<vector<CommandInfo>> LinuxFilesystemIsolatorProcess::getPreExecCommands( - // TODO(jieyu): Consider the mode in the volume. - CommandInfo command; - command.set_shell(false); -- command.set_value("mount"); -+ command.set_value("@mount@"); - command.add_arguments("mount"); - command.add_arguments("-n"); - command.add_arguments("--rbind"); -diff --git i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp -index 927d95b..576dc63 100644 ---- i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp -+++ w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp -@@ -208,7 +208,7 @@ Future<Option<ContainerLaunchInfo>> SharedFilesystemIsolatorProcess::prepare( - } - - launchInfo.add_pre_exec_commands()->set_value( -- "mount -n --bind " + hostPath + " " + volume.container_path()); -+ "@mount@ -n --bind " + hostPath + " " + volume.container_path()); - } - - return launchInfo; -diff --git i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp -index 25636b5..33ec315 100644 ---- i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp -+++ w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp -@@ -401,7 +401,7 @@ Future<Option<ContainerLaunchInfo>> NvidiaGpuIsolatorProcess::_prepare( - } - - launchInfo.add_pre_exec_commands()->set_value( -- "mount --no-mtab --rbind --read-only " + -+ "@mount@ --no-mtab --rbind --read-only " + - volume.HOST_PATH() + " " + target); - } - -diff --git i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp -index 536a3c7..e2819dd 100644 ---- i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp -+++ w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp -@@ -274,7 +274,7 @@ Try<NvidiaVolume> NvidiaVolume::create() - string path = path::join(hostPath, "bin", binary); - - if (!os::exists(path)) { -- string command = "which " + binary; -+ string command = "@which@ " + binary; - Try<string> which = os::shell(command); - - if (which.isSome()) { -@@ -288,7 +288,7 @@ Try<NvidiaVolume> NvidiaVolume::create() - : "No such file or directory")); - } - -- command = "cp " + realpath.get() + " " + path; -+ command = "@cp@ " + realpath.get() + " " + path; - Try<string> cp = os::shell(command); - if (cp.isError()) { - return Error("Failed to os::shell '" + command + "': " + cp.error()); -@@ -360,7 +360,7 @@ Try<NvidiaVolume> NvidiaVolume::create() - Path(realpath.get()).basename()); - - if (!os::exists(libraryPath)) { -- string command = "cp " + realpath.get() + " " + libraryPath; -+ string command = "@cp@ " + realpath.get() + " " + libraryPath; - Try<string> cp = os::shell(command); - if (cp.isError()) { - return Error("Failed to os::shell '" + command + "':" -diff --git i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp -index 42bc2e1..2f9066e 100644 ---- i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp -+++ w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp -@@ -131,7 +131,7 @@ Future<Option<ContainerLaunchInfo>> NamespacesPidIsolatorProcess::prepare( - // - // TOOD(jieyu): Consider unmount the existing /proc. - launchInfo.add_pre_exec_commands()->set_value( -- "mount -n -t proc proc /proc -o nosuid,noexec,nodev"); -+ "@mount@ -n -t proc proc /proc -o nosuid,noexec,nodev"); - - return launchInfo; - } -diff --git i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp -index fc68f04..267b040 100644 ---- i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp -+++ w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp -@@ -205,9 +205,9 @@ Try<Isolator*> NetworkCniIsolatorProcess::create(const Flags& flags) - // here because 'create' will only be invoked during - // initialization. - Try<string> mount = os::shell( -- "mount --bind %s %s && " -- "mount --make-private %s && " -- "mount --make-shared %s", -+ "@mount@ --bind %s %s && " -+ "@mount@ --make-private %s && " -+ "@mount@ --make-shared %s", - rootDir->c_str(), - rootDir->c_str(), - rootDir->c_str(), -@@ -227,8 +227,8 @@ Try<Isolator*> NetworkCniIsolatorProcess::create(const Flags& flags) - LOG(INFO) << "Making '" << rootDir.get() << "' a shared mount"; - - Try<string> mount = os::shell( -- "mount --make-private %s && " -- "mount --make-shared %s", -+ "@mount@ --make-private %s && " -+ "@mount@ --make-shared %s", - rootDir->c_str(), - rootDir->c_str()); - -diff --git i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp -index 43cf3e4..94bad8b 100644 ---- i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp -+++ w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp -@@ -301,7 +301,7 @@ Try<Nothing> PortMapper::addPortMapping( - # Check if the `chain` exists in the iptable. If it does not - # exist go ahead and install the chain in the iptables NAT - # table. -- iptables -w -t nat --list %s -+ @iptables@ -w -t nat --list %s - if [ $? -ne 0 ]; then - # NOTE: When we create the chain, there is a possibility of a - # race due to which a container launch can fail. This can -@@ -315,25 +315,25 @@ Try<Nothing> PortMapper::addPortMapping( - # since it can happen only when the chain is created the first - # time and two commands for creation of the chain are executed - # simultaneously. -- (iptables -w -t nat -N %s || exit 1) -+ (@iptables@ -w -t nat -N %s || exit 1) - - # Once the chain has been installed add a rule in the PREROUTING - # chain to jump to this chain for any packets that are - # destined to a local address. -- (iptables -w -t nat -A PREROUTING \ -+ (@iptables@ -w -t nat -A PREROUTING \ - -m addrtype --dst-type LOCAL -j %s || exit 1) - - # For locally generated packets we need a rule in the OUTPUT - # chain as well, since locally generated packets directly hit - # the output CHAIN, bypassing PREROUTING. -- (iptables -w -t nat -A OUTPUT \ -+ (@iptables@ -w -t nat -A OUTPUT \ - ! -d 127.0.0.0/8 -m addrtype \ - --dst-type LOCAL -j %s || exit 1) - fi - - # Within the `chain` go ahead and install the DNAT rule, if it - # does not exist. -- (iptables -w -t nat -C %s || iptables -t nat -A %s))~", -+ (@iptables@ -w -t nat -C %s || @iptables@ -t nat -A %s))~", - chain, - chain, - chain, -@@ -360,7 +360,7 @@ Try<Nothing> PortMapper::delPortMapping() - # The iptables command searches for the DNAT rules with tag - # "container_id: <CNI_CONTAINERID>", and if it exists goes ahead - # and deletes it. -- iptables -w -t nat -S %s | sed "/%s/ s/-A/iptables -w -t nat -D/e")~", -+ @iptables@ -w -t nat -S %s | sed "/%s/ s/-A/@iptables@ -w -t nat -D/e")~", - chain, - getIptablesRuleTag()).get(); - -diff --git i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp -index 57d4ccd..68c9577 100644 ---- i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp -+++ w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp -@@ -1394,19 +1394,19 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) - // Check the availability of a few Linux commands that we will use. - // We use the blocking os::shell here because 'create' will only be - // invoked during initialization. -- Try<string> checkCommandTc = os::shell("tc filter show"); -+ Try<string> checkCommandTc = os::shell("@tc@ filter show"); - if (checkCommandTc.isError()) { - return Error("Check command 'tc' failed: " + checkCommandTc.error()); - } - - // NOTE: loopback device always exists. -- Try<string> checkCommandEthtool = os::shell("ethtool -k lo"); -+ Try<string> checkCommandEthtool = os::shell("@ethtool@ -k lo"); - if (checkCommandEthtool.isError()) { - return Error("Check command 'ethtool' failed: " - + checkCommandEthtool.error()); - } - -- Try<string> checkCommandIp = os::shell("ip link show"); -+ Try<string> checkCommandIp = os::shell("@ip@ link show"); - if (checkCommandIp.isError()) { - return Error("Check command 'ip' failed: " + checkCommandIp.error()); - } -@@ -1940,9 +1940,9 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) - // visible. It's OK to use the blocking os::shell here because - // 'create' will only be invoked during initialization. - Try<string> mount = os::shell( -- "mount --bind %s %s && " -- "mount --make-slave %s && " -- "mount --make-shared %s", -+ "@mount@ --bind %s %s && " -+ "@mount@ --make-slave %s && " -+ "@mount@ --make-shared %s", - bindMountRoot->c_str(), - bindMountRoot->c_str(), - bindMountRoot->c_str(), -@@ -1959,8 +1959,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) - // shared mount yet (possibly due to slave crash while preparing - // the work directory mount). It's safe to re-do the following. - Try<string> mount = os::shell( -- "mount --make-slave %s && " -- "mount --make-shared %s", -+ "@mount@ --make-slave %s && " -+ "@mount@ --make-shared %s", - bindMountRoot->c_str(), - bindMountRoot->c_str()); - -@@ -1979,8 +1979,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) - // so that they are in different peer groups. - if (entry.shared() == bindMountEntry->shared()) { - Try<string> mount = os::shell( -- "mount --make-slave %s && " -- "mount --make-shared %s", -+ "@mount@ --make-slave %s && " -+ "@mount@ --make-shared %s", - bindMountRoot->c_str(), - bindMountRoot->c_str()); - -@@ -3927,6 +3927,8 @@ Try<Nothing> PortMappingIsolatorProcess::removeHostIPFilters( - // TODO(jieyu): Use the Subcommand abstraction to remove most of the - // logic here. Completely remove this function once we can assume a - // newer kernel where 'setns' works for mount namespaces. -+// cstrahan(nixos): this is executed in the container, -+// so we don't want to substitute paths here. - string PortMappingIsolatorProcess::scripts(Info* info) - { - ostringstream script; -@@ -3937,7 +3939,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) - // Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave - // mount so that changes in the container will not be propagated to - // the host. -- script << "mount --make-rslave " << bindMountRoot << "\n"; -+ script << "@mount@ --make-rslave " << bindMountRoot << "\n"; - - // Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be - // forwarded anyway. -@@ -3945,7 +3947,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) - << " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n"; - - // Configure lo and eth0. -- script << "ip link set " << lo << " address " << hostMAC -+ script << "@ip@ link set " << lo << " address " << hostMAC - << " mtu " << hostEth0MTU << " up\n"; - - // NOTE: This is mostly a kernel issue: in veth_xmit() the kernel -@@ -3954,12 +3956,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) - // when we receive a packet with a bad checksum. Disabling rx - // checksum offloading ensures the TCP layer will checksum and drop - // it. -- script << "ethtool -K " << eth0 << " rx off\n"; -- script << "ip link set " << eth0 << " address " << hostMAC << " up\n"; -- script << "ip addr add " << hostIPNetwork << " dev " << eth0 << "\n"; -+ script << "@ethtool@ -K " << eth0 << " rx off\n"; -+ script << "@ip@ link set " << eth0 << " address " << hostMAC << " up\n"; -+ script << "@ip@ addr add " << hostIPNetwork << " dev " << eth0 << "\n"; - - // Set up the default gateway to match that of eth0. -- script << "ip route add default via " << hostDefaultGateway << "\n"; -+ script << "@ip@ route add default via " << hostDefaultGateway << "\n"; - - // Restrict the ephemeral ports that can be used by the container. - script << "echo " << info->ephemeralPorts.lower() << " " -@@ -3988,19 +3990,19 @@ string PortMappingIsolatorProcess::scripts(Info* info) - } - - // Set up filters on lo and eth0. -- script << "tc qdisc add dev " << lo << " ingress\n"; -- script << "tc qdisc add dev " << eth0 << " ingress\n"; -+ script << "@tc@ qdisc add dev " << lo << " ingress\n"; -+ script << "@tc@ qdisc add dev " << eth0 << " ingress\n"; - - // Allow talking between containers and from container to host. - // TODO(chzhcn): Consider merging the following two filters. -- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE -+ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE - << " protocol ip" - << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" - << " flowid ffff:0" - << " match ip dst " << hostIPNetwork.address() - << " action mirred egress redirect dev " << eth0 << "\n"; - -- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE -+ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE - << " protocol ip" - << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" - << " flowid ffff:0" -@@ -4011,7 +4013,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) - foreach (const PortRange& range, - getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) { - // Local traffic inside a container will not be redirected to eth0. -- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE -+ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE - << " protocol ip" - << " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32" - << " flowid ffff:0" -@@ -4020,7 +4022,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) - - // Traffic going to host loopback IP and ports assigned to this - // container will be redirected to lo. -- script << "tc filter add dev " << eth0 << " parent " << ingress::HANDLE -+ script << "@tc@ filter add dev " << eth0 << " parent " << ingress::HANDLE - << " protocol ip" - << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" - << " flowid ffff:0" -@@ -4032,14 +4034,14 @@ string PortMappingIsolatorProcess::scripts(Info* info) - } - - // Do not forward the ICMP packet if the destination IP is self. -- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE -+ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE - << " protocol ip" - << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32" - << " flowid ffff:0" - << " match ip protocol 1 0xff" - << " match ip dst " << hostIPNetwork.address() << "\n"; - -- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE -+ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE - << " protocol ip" - << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32" - << " flowid ffff:0" -@@ -4048,9 +4050,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) - << net::IP::Network::LOOPBACK_V4().address() << "\n"; - - // Display the filters created on eth0 and lo. -- script << "tc filter show dev " << eth0 -+ script << "@tc@ filter show dev " << eth0 - << " parent " << ingress::HANDLE << "\n"; -- script << "tc filter show dev " << lo -+ script << "@tc@ filter show dev " << lo - << " parent " << ingress::HANDLE << "\n"; - - // If throughput limit for container egress traffic exists, use HTB -@@ -4062,9 +4064,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) - // throughput. TBF requires other parameters such as 'burst' that - // HTB already has default values for. - if (egressRateLimitPerContainer.isSome()) { -- script << "tc qdisc add dev " << eth0 << " root handle " -+ script << "@tc@ qdisc add dev " << eth0 << " root handle " - << CONTAINER_TX_HTB_HANDLE << " htb default 1\n"; -- script << "tc class add dev " << eth0 << " parent " -+ script << "@tc@ class add dev " << eth0 << " parent " - << CONTAINER_TX_HTB_HANDLE << " classid " - << CONTAINER_TX_HTB_CLASS_ID << " htb rate " - << egressRateLimitPerContainer.get().bytes() * 8 << "bit\n"; -@@ -4075,12 +4077,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) - // fq_codel, which has a larger buffer and better control on - // buffer bloat. - // TODO(cwang): Verity that fq_codel qdisc is available. -- script << "tc qdisc add dev " << eth0 -+ script << "@tc@ qdisc add dev " << eth0 - << " parent " << CONTAINER_TX_HTB_CLASS_ID << " fq_codel\n"; - - // Display the htb qdisc and class created on eth0. -- script << "tc qdisc show dev " << eth0 << "\n"; -- script << "tc class show dev " << eth0 << "\n"; -+ script << "@tc@ qdisc show dev " << eth0 << "\n"; -+ script << "@tc@ class show dev " << eth0 << "\n"; - } - - return script.str(); -diff --git i/src/slave/containerizer/mesos/isolators/posix/disk.cpp w/src/slave/containerizer/mesos/isolators/posix/disk.cpp -index eb23025..db268ea 100644 ---- i/src/slave/containerizer/mesos/isolators/posix/disk.cpp -+++ w/src/slave/containerizer/mesos/isolators/posix/disk.cpp -@@ -572,7 +572,7 @@ private: - // NOTE: The supervisor childhook will watch the parent process and kill - // the 'du' process in case that the parent die. - Try<Subprocess> s = subprocess( -- "du", -+ "@du@", - command, - Subprocess::PATH(os::DEV_NULL), - Subprocess::PIPE(), -diff --git i/src/slave/containerizer/mesos/isolators/volume/image.cpp w/src/slave/containerizer/mesos/isolators/volume/image.cpp -index 35966aa..b62fc86 100644 ---- i/src/slave/containerizer/mesos/isolators/volume/image.cpp -+++ w/src/slave/containerizer/mesos/isolators/volume/image.cpp -@@ -231,7 +231,7 @@ Future<Option<ContainerLaunchInfo>> VolumeImageIsolatorProcess::_prepare( - - CommandInfo* command = launchInfo.add_pre_exec_commands(); - command->set_shell(false); -- command->set_value("mount"); -+ command->set_value("@mount@"); - command->add_arguments("mount"); - command->add_arguments("-n"); - command->add_arguments("--rbind"); -diff --git i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp -index b321b86..8ed3e78 100644 ---- i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp -+++ w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp -@@ -265,7 +265,7 @@ Future<Option<ContainerLaunchInfo>> VolumeSandboxPathIsolatorProcess::prepare( - - CommandInfo* command = launchInfo.add_pre_exec_commands(); - command->set_shell(false); -- command->set_value("mount"); -+ command->set_value("@mount@"); - command->add_arguments("mount"); - command->add_arguments("-n"); - command->add_arguments("--rbind"); -diff --git i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp -index 69faa03..01a3ed6 100644 ---- i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp -+++ w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp -@@ -266,7 +266,7 @@ Future<Nothing> CopyBackendProcess::_provision( - #endif // __APPLE__ || __FreeBSD__ - - Try<Subprocess> s = subprocess( -- "cp", -+ "@cp@", - args, - Subprocess::PATH(os::DEV_NULL), - Subprocess::PATH(os::DEV_NULL), -@@ -313,7 +313,7 @@ Future<bool> CopyBackendProcess::destroy(const string& rootfs) - vector<string> argv{"rm", "-rf", rootfs}; - - Try<Subprocess> s = subprocess( -- "rm", -+ "@rm@", - argv, - Subprocess::PATH(os::DEV_NULL), - Subprocess::FD(STDOUT_FILENO), -diff --git i/src/uri/fetchers/copy.cpp w/src/uri/fetchers/copy.cpp -index 17f69be..831b08a 100644 ---- i/src/uri/fetchers/copy.cpp -+++ w/src/uri/fetchers/copy.cpp -@@ -97,8 +97,8 @@ Future<Nothing> CopyFetcherPlugin::fetch( - VLOG(1) << "Copying '" << uri.path() << "' to '" << directory << "'"; - - #ifndef __WINDOWS__ -- const char* copyCommand = "cp"; -- const vector<string> argv = {"cp", "-a", uri.path(), directory}; -+ const char* copyCommand = "@cp@"; -+ const vector<string> argv = {"@cp@", "-a", uri.path(), directory}; - #else // __WINDOWS__ - const char* copyCommand = os::Shell::name; - const vector<string> argv = -diff --git i/src/uri/fetchers/curl.cpp w/src/uri/fetchers/curl.cpp -index f34daf2..6a50341 100644 ---- i/src/uri/fetchers/curl.cpp -+++ w/src/uri/fetchers/curl.cpp -@@ -109,7 +109,7 @@ Future<Nothing> CurlFetcherPlugin::fetch( - }; - - Try<Subprocess> s = subprocess( -- "curl", -+ "@curl@", - argv, - Subprocess::PATH(os::DEV_NULL), - Subprocess::PIPE(), -diff --git i/src/uri/fetchers/docker.cpp w/src/uri/fetchers/docker.cpp -index 91db13b..82a7fc4 100644 ---- i/src/uri/fetchers/docker.cpp -+++ w/src/uri/fetchers/docker.cpp -@@ -114,7 +114,7 @@ static Future<http::Response> curl( - - // TODO(jieyu): Kill the process if discard is called. - Try<Subprocess> s = subprocess( -- "curl", -+ "@curl@", - argv, - Subprocess::PATH(os::DEV_NULL), - Subprocess::PIPE(), -@@ -229,7 +229,7 @@ static Future<int> download( - - // TODO(jieyu): Kill the process if discard is called. - Try<Subprocess> s = subprocess( -- "curl", -+ "@curl@", - argv, - Subprocess::PATH(os::DEV_NULL), - Subprocess::PIPE(), diff --git a/pkgs/applications/networking/cluster/mesos/rb36610.patch b/pkgs/applications/networking/cluster/mesos/rb36610.patch deleted file mode 100644 index bee578cc3e9..00000000000 --- a/pkgs/applications/networking/cluster/mesos/rb36610.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/linux/fs.cpp b/src/linux/fs.cpp -index 913e233..c2917a6 100644 ---- a/src/linux/fs.cpp -+++ b/src/linux/fs.cpp -@@ -17,6 +17,7 @@ - #include <errno.h> - #include <stdio.h> - #include <string.h> -+#include <syscall.h> - - #include <linux/limits.h> - #include <linux/unistd.h> diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 162585851d0..53856ce9e2f 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop , RSupport? true, R -, mesosSupport ? true, mesos }: with stdenv.lib; @@ -12,12 +11,11 @@ stdenv.mkDerivation rec { src = fetchzip { url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; - sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g"; + sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g"; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] - ++ optional RSupport R - ++ optional mesosSupport mesos; + ++ optional RSupport R; untarDir = "${pname}-${version}-bin-without-hadoop"; installPhase = '' @@ -37,8 +35,6 @@ stdenv.mkDerivation rec { ${optionalString RSupport ''export SPARKR_R_SHELL="${R}/bin/R" export PATH=$PATH:"${R}/bin/R"''} - ${optionalString mesosSupport - ''export MESOS_NATIVE_LIBRARY="$MESOS_NATIVE_LIBRARY"''} EOF for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix index 38fbd1b4286..72e717d9166 100644 --- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -21,7 +21,6 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/adammck/terraform-inventory"; description = "Terraform state to ansible inventory adapter"; - platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ htr ]; }; diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index bb32505188b..896904b0cac 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -84,6 +84,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.com/news-flash/news_flash_gtk"; license = licenses.gpl3Plus; maintainers = with maintainers; [ metadark ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index c6e8ab5c887..16b2b7454bf 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://firehol.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix index e47afba0294..75b4d5b40a6 100644 --- a/pkgs/applications/networking/firehol/iprange.nix +++ b/pkgs/applications/networking/firehol/iprange.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "manage IP ranges"; homepage = "https://github.com/firehol/iprange"; license = licenses.gpl2; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index b10e2ed1a1d..eadf90a0bae 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.106"; + version = "0.0.111"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1bqlf7iixdy6c7lhbva4lizvhd6w0xqn69izxcy26wk35xcqgfh8"; + sha256 = "0ngmb40pwfwydvxyfby89yp17lsvmv642jci9b12cyc3hlkf85n4"; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index cae84c054e8..7bb2517a188 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pidgin-skypeweb"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "EionRobb"; repo = "skype4pidgin"; rev = version; - sha256 = "1bd9gd36yhrbrww0dvai9rnzxxj1c9sb4003c72wg27w12y47xfv"; + sha256 = "1q3m8hyr77mxm4y0zify2xhjp9d8y4pgwvqyfly4zcpmyd2argi1"; }; setSourceRoot = '' diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index ba10ab16267..430a7cc4ca7 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "psi-plus"; - version = "1.4.1407"; + version = "1.4.1473"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "0gp5rk7km2fzw109wil6s9x49x5q1qbw9mnkjs58dpzvxn74ylhw"; + sha256 = "03f28zwbjn6fnsm0fqg8lmc11rpfdfvzjf7k7xydc3lzy8pxbds5"; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix index fda83066a84..5806a269104 100644 --- a/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix +++ b/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix @@ -20,6 +20,5 @@ buildGoPackage rec { homepage = "https://github.com/shazow/ssh-chat"; license = licenses.mit; maintainers = with maintainers; [ luc65r ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 1f81af69804..014e22bc512 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.2.0"; + version = "2.3.0"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1chikb02df4qqnickcmx96lcx481b14kmksjsp7h94g0d223ypq0"; + sha256 = "0yga4p36jrc5m3d8q2y2g0505c2v540w5hgcscapl4xj9hyb21dw"; }; postPatch = '' @@ -52,14 +52,15 @@ mkDerivation rec { cmakeFlags = [ "-Ddisable_autoupdate=ON" - # TODO: Officiall API credentials for Nixpkgs - # (see: https://github.com/NixOS/nixpkgs/issues/55271): - "-DTDESKTOP_API_TEST=ON" + # We're allowed to used the API ID of the Snap package: + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" "-DDESKTOP_APP_USE_PACKAGED_GSL=OFF" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" + "-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=ON" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default ] ++ optionals stdenv.isLinux [ # TODO: Remove workaround once #94905 is resolved: diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix index dc4e7f245e7..c7f2958cf55 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/mmb/weechat-otr"; license = licenses.gpl3; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; description = "WeeChat script for Off-the-Record messaging"; }; } diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index 3bc4ad84f99..a097fd0dd8a 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -38,6 +38,5 @@ buildGoModule rec { homepage = "https://github.com/jonhoo/hasmail"; license = licenses.unlicense; maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 5747da36b34..6d315049d24 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,8 +1,10 @@ -{ stdenv +{ lib +, callPackage , fetchFromGitHub , gettext +, xorg # for lndir , gtk3 -, pythonPackages +, python3Packages , gdk-pixbuf , libnotify , gst_all_1 @@ -11,9 +13,16 @@ , gsettings-desktop-schemas , glib , gobject-introspection +# Available plugins (can be overriden) +, availablePlugins +# Used in the withPlugins interface at passthru, can be overrided directly, or +# prefarably via e.g: `mailnag.withPlugins(["goa"])` +, mailnag +, userPlugins ? [ ] +, pluginsDeps ? [ ] }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mailnag"; version = "2.0.0"; @@ -23,14 +32,6 @@ pythonPackages.buildPythonApplication rec { rev = "v${version}"; sha256 = "0q97v9i96br22z3h6r2mz79i68ib8m8x42yxky78szfrf8j60i30"; }; - preFixup = '' - substituteInPlace $out/${pythonPackages.python.sitePackages}/Mailnag/common/dist_cfg.py \ - --replace "/usr/" $out/ - for desktop_file in $out/share/applications/*.desktop; do - substituteInPlace "$desktop_file" \ - --replace "/usr/bin" $out/bin - done - ''; buildInputs = [ gtk3 @@ -43,21 +44,58 @@ pythonPackages.buildPythonApplication rec { gst_all_1.gst-plugins-bad gobject-introspection libsecret - ]; + ] ++ pluginsDeps; nativeBuildInputs = [ gettext wrapGAppsHook + # To later add plugins to + xorg.lndir ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ gsettings-desktop-schemas pygobject3 dbus-python pyxdg ]; - meta = with stdenv.lib; { + passthru = { + inherit availablePlugins; + withPlugins = + plugs: + let + # goa plugin requires gio's gnome-online-accounts which requires making sure + # mailnag runs with GI_TYPELIB_PATH containing the path to Goa-1.0.typelib. + # This is handled best by adding the plugins' deps to buildInputs and let + # wrapGAppsHook handle that. + pluginsDeps = lib.flatten (lib.catAttrs "buildInputs" plugs); + self = mailnag; + in + self.override { userPlugins = plugs; }; + }; + + # See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped + dontWrapGApps = true; + + preFixup = '' + substituteInPlace $out/${python3Packages.python.sitePackages}/Mailnag/common/dist_cfg.py \ + --replace "/usr/" $out/ + for desktop_file in $out/share/applications/*.desktop; do + substituteInPlace "$desktop_file" \ + --replace "/usr/bin" $out/bin + done + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + # Actually install plugins + postInstall = '' + for plug in ${builtins.toString userPlugins}; do + lndir $plug/${python3Packages.python.sitePackages} $out/${python3Packages.python.sitePackages} + done + ''; + + meta = with lib; { description = "An extensible mail notification daemon"; homepage = "https://github.com/pulb/mailnag"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix new file mode 100644 index 00000000000..b2eccdc134b --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix @@ -0,0 +1,31 @@ +{ stdenv +, fetchFromGitHub +, python3Packages +, gobject-introspection +, gnome-online-accounts +}: + +python3Packages.buildPythonPackage rec { + pname = "mailnag-goa-plugin"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "pulb"; + repo = "mailnag-goa-plugin"; + rev = "v${version}"; + sha256 = "0bij6cy96nhq7xzslx0fnhmiac629h0x4wgy67k4i4npwqw10680"; + }; + + buildInputs = [ + gobject-introspection + gnome-online-accounts + ]; + + meta = with stdenv.lib; { + description = "Mailnag GNOME Online Accounts plugin."; + homepage = "https://github.com/pulb/mailnag-goa-plugin"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 5a567863ab5..f15e4b5fbbf 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200626"; + version = "20200814"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0r16fy02z61dbjdxc28yzj5i4f6r7aakh453gaqc8ilm1nsxhmnp"; + sha256 = "00i2xbadw7rq2b30yjla54m0df4jbh22g6phby41albw2wc2hn72"; }; buildInputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # allow neomutt to map attachments to their proper mime.types if specified wrongly # and use a far more comprehensive list than the one shipped with neomutt - substituteInPlace sendlib.c \ + substituteInPlace send/sendlib.c \ --replace /etc/mime.types ${mailcap}/etc/mime.types ''; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 39ab0ee0efa..d38e9dc7336 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.8.4"; + version = "6.8.5"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "1qs0r5621ihb9sj4sqpmxj9smwf8a8k3n1qx2i0sz65qhjfc90zz"; + sha256 = "1zdas93w1yqg9yx8wlk7pxpdmwvg4ykg54ai7iyq9ir1zha8fyif"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 23a0c76026c..618ca074912 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3"; + sha256 = "0b4a6bxwhpmj274d281vhny7i5rwydrdmab76xk6ji8vf0p705dn"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index d7c15889fec..4090814b3da 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "gnunet-gtk"; - inherit (gnunet) version; + version = "0.13.1"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 80d90789440..e2847d88f8a 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://synapse-bt.org/"; license = licenses.isc; maintainers = with maintainers; [ dywedir ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index ee9ea667927..feb70741246 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.4"; + version = "1.4.7"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "0kc0akr5xvbq2bx3wsgf0hd8x5hjgshwrrzhwixp0584ydax89gv"; + sha256 = "0h09f2amj7ab78fzil2w7cr22d21ad5mp1r2fa70w26g7ra3jzk9"; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index dbb9d465cc7..a857abcfed1 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.2.2756"; + version = "15.5.6"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "1g6a7yadvc6gc660m62yibj2hrj7bwy26z5ww0gk6rwqlz048i97"; + sha256 = "12dzrg9qf5gj9srv482n3jsjar8jhs3s5kkp6v5pvfp8kbmwcbib"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 1715a7616bf..db05056e7e1 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -39,6 +39,5 @@ buildGoPackage rec { homepage = "https://rclone.org"; license = licenses.mit; maintainers = with maintainers; [ danielfullmer marsam ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/wg-bond/default.nix b/pkgs/applications/networking/wg-bond/default.nix index 67a05a8972f..32ffbde400b 100644 --- a/pkgs/applications/networking/wg-bond/default.nix +++ b/pkgs/applications/networking/wg-bond/default.nix @@ -25,6 +25,5 @@ rustPlatform.buildRustPackage rec { changelog = "https://gitlab.com/cab404/wg-bond/-/releases#v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ cab404 ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 8fb9b3c7878..04a40875f79 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -47,7 +47,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://espanso.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kimat ]; - platforms = platforms.all; longDescription = '' Espanso detects when you type a keyword and replaces it while you're typing. diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 60d352b7c94..3d577a8852e 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,27 +19,27 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.43.2"; + version = "0.43.3"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0q04brfiwllyxh99k8rhx6q3kysj9vl67dj2yvl5bkm8lf5x2l2g"; + sha256 = "1k9vcs7pwa89bzivqp0gfs45jzqw216fpypg3ja4n2dzn4qkv2as"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1993765gi8c890vf5ljrvfhc1bqmsdy58ksblzz08dwdj44frry5"; + sha256 = "1n3v7wdav6mvgcy72mmfhncsa74i0ax1ij5rjczgfjjyiyc5y0rk"; }; in { - + trilium-desktop = stdenv.mkDerivation rec { pname = "trilium-desktop"; inherit version; inherit meta; src = fetchurl desktopSource; - + # Fetch from source repo, no longer included in release. # (they did special-case icon.png but we want the scalable svg) # Use the version here to ensure we get any changes. @@ -47,33 +47,33 @@ in { url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/trilium.svg"; sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; }; - - + + nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook ]; - + buildInputs = atomEnv.packages ++ [ gtk3 ]; - + installPhase = '' mkdir -p $out/bin mkdir -p $out/share/trilium mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} - + cp -r ./* $out/share/trilium ln -s $out/share/trilium/trilium $out/bin/trilium - + ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg cp ${desktopItem}/share/applications/* $out/share/applications ''; - + # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) preFixup = '' gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) ''; - + dontStrip = true; }; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index dc185a791ea..00fa9416e17 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -30,6 +30,6 @@ buildPythonApplication rec { homepage = "https://tailordev.github.io/Watson/"; description = "A wonderful CLI to track your time!"; license = licenses.mit; - maintainers = with maintainers; [ mguentner nathyong geistesk ]; + maintainers = with maintainers; [ mguentner nathyong oxzi ]; }; } diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 8e135dee568..b11b6b474c6 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "wsjtx"; - version = "2.1.2"; + version = "2.2.2"; # This is a "superbuild" tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; - sha256 = "0aj3wg5xjjqwjvw6lra171ag5wq86w0hf1ra4k8mnaf0mc1qgbyl"; + sha256 = "17agyrhclqyahgdwba8vi9sl7vq03sm00jlyrmjgv34a4czidg0w"; }; # Hamlib builds with autotools, wsjtx builds with cmake @@ -23,9 +23,6 @@ stdenv.mkDerivation rec { # Remove Git dependency from superbuild since sources are included patches = [ ./super.patch ]; - # Superbuild has its own patch step after it extracts the inner archives - postPatch = "cp ${./wsjtx.patch} wsjtx.patch"; - meta = with stdenv.lib; { description = "Weak-signal digital communication modes for amateur radio"; longDescription = '' diff --git a/pkgs/applications/radio/wsjtx/super.patch b/pkgs/applications/radio/wsjtx/super.patch index d903171ffc5..2d72fcddf0d 100644 --- a/pkgs/applications/radio/wsjtx/super.patch +++ b/pkgs/applications/radio/wsjtx/super.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3bf97a4..2c9dce5 100644 +index 84fa38a..87e31bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -23,7 +23,6 @@ source tarball." ) +@@ -24,7 +24,6 @@ source tarball." ) # # Find_library (USB_LIBRARY NAMES libusb.a usb) Find_program (PATCH_EXECUTABLE patch REQUIRED) diff --git a/pkgs/applications/radio/wsjtx/wsjtx.patch b/pkgs/applications/radio/wsjtx/wsjtx.patch deleted file mode 100644 index fd7c40fdc13..00000000000 --- a/pkgs/applications/radio/wsjtx/wsjtx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3e7e816b..e7dbb14a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -885,6 +885,6 @@ - # - - # Widgets finds its own dependencies. --find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools REQUIRED) -+find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools SerialPort REQUIRED) - - if (WIN32) - add_definitions (-DQT_NEEDS_QTMAIN) diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix index fb7f2cba3de..e641489b86c 100644 --- a/pkgs/applications/science/biology/hisat2/default.nix +++ b/pkgs/applications/science/biology/hisat2/default.nix @@ -1,16 +1,18 @@ -{stdenv, fetchurl, unzip, which, python, perl}: +{stdenv, fetchFromGitHub, unzip, which, python3, perl}: stdenv.mkDerivation rec { pname = "hisat2"; - version = "2.1.0"; + version = "2.2.1"; - src = fetchurl { - url = "ftp://ftp.ccb.jhu.edu/pub/infphilo/hisat2/downloads/hisat2-${version}-source.zip"; - sha256 = "10g73sdf6vqqfhhd92hliw7bbpkb8v4pp5012r5l21zws7p7d8l9"; + src = fetchFromGitHub { + owner = "DaehwanKimLab"; + repo = "hisat2"; + rev = "v${version}"; + sha256 = "0lmzdhzjkvxw7n5w40pbv5fgzd4cz0f9pxczswn3d4cr0k10k754"; }; nativeBuildInputs = [ unzip which ]; - buildInputs = [ python perl ]; + buildInputs = [ python3 perl ]; installPhase = '' mkdir -p $out/bin @@ -30,12 +32,6 @@ stdenv.mkDerivation rec { hisat2_extract_snps_haplotypes_VCF.py \ hisat2_extract_splice_sites.py \ hisat2_simulate_reads.py \ - hisatgenotype_build_genome.py \ - hisatgenotype_extract_reads.py \ - hisatgenotype_extract_vars.py \ - hisatgenotype_hla_cyp.py \ - hisatgenotype_locus.py \ - hisatgenotype.py \ $out/bin ''; diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix new file mode 100644 index 00000000000..1c639563757 --- /dev/null +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -0,0 +1,34 @@ +{ clangStdenv, stdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake +, eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }: + +clangStdenv.mkDerivation rec { + version = "v1.0.1"; + pname = "d-SEAMS"; + + src = fetchFromGitHub { + owner = "d-SEAMS"; + repo = "seams-core"; + rev = "v1.0.1"; + sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ cmake lua luaPackages.luafilesystem ]; + buildInputs = [ fmt rang libyamlcpp eigen catch2 boost gsl liblapack blas ]; + + meta = with stdenv.lib; { + description = + "d-SEAMS: Deferred Structural Elucidation Analysis for Molecular Simulations"; + longDescription = '' + d-SEAMS, is a free and open-source postprocessing engine for the analysis + of molecular dynamics trajectories, which is specifically able to + qualitatively classify ice structures in both strong-confinement and bulk + systems. The engine is in C++, with extensions via the Lua scripting + interface. + ''; + homepage = "https://dseams.info"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.HaoZeke ]; + }; +} diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 448d6d0535a..36cc19142d1 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.105"; + version = "3.3.106"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "1vifgyhwqhpipnzmsivncawqjqihcm5kyg3yyygmd0lmgljy9rs4"; + sha256 = "0ma53s27735x16dq5qi91kvlypkiwkxh2jhw0gziyccnk1mkdsji"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index ed757e444b7..a4654209537 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -1,12 +1,13 @@ { stdenv, lib, fetchhg, cmake, which, python3, osi, cplex }: stdenv.mkDerivation { - name = "fast-downward-2019-05-13"; + version = "19.12"; + pname = "fast-downward"; src = fetchhg { url = "http://hg.fast-downward.org/"; - rev = "090f5df5d84a"; - sha256 = "14pcjz0jfzx5269axg66iq8js7lm2w3cnqrrhhwmz833prjp945g"; + rev = "41688a4f16b3"; + sha256 = "08m4k1mkx4sz7c2ab7xh7ip6b67zxv7kl68xrvwa83xw1yigqkna"; }; nativeBuildInputs = [ cmake which ]; @@ -17,19 +18,22 @@ stdenv.mkDerivation { enableParallelBuilding = true; + configurePhase = '' + python build.py release + ''; + postPatch = '' - cd src # Needed because the package tries to be too smart. export CC="$(which $CC)" export CXX="$(which $CXX)" ''; installPhase = '' - install -Dm755 bin/downward $out/libexec/fast-downward/downward - cp -r ../translate $out/libexec/fast-downward/ - install -Dm755 ../../fast-downward.py $out/bin/fast-downward + install -Dm755 builds/release/bin/downward $out/libexec/fast-downward/downward + cp -r builds/release/bin/translate $out/libexec/fast-downward/ + install -Dm755 fast-downward.py $out/bin/fast-downward mkdir -p $out/${python3.sitePackages} - cp -r ../../driver $out/${python3.sitePackages} + cp -r driver $out/${python3.sitePackages} wrapPythonProgramsIn $out/bin "$out $pythonPath" wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out $pythonPath" @@ -43,13 +47,16 @@ stdenv.mkDerivation { echo "Moving $i to $dest" mv "$i" "$dest" done + + substituteInPlace $out/${python3.sitePackages}/driver/arguments.py \ + --replace 'args.build = "release"' "args.build = \"$out/libexec/fast-downward\"" ''; meta = with stdenv.lib; { description = "A domain-independent planning system"; homepage = "http://www.fast-downward.org/"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = with platforms; (linux ++ darwin); maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 8a4d5acede0..f1a2dbaa54f 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -47,6 +47,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/finalfusion/finalfrontier/"; license = licenses.asl20; maintainers = with maintainers; [ danieldk ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index 80fc8127cd2..e3db0054647 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -51,6 +51,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/finalfusion/finalfusion-utils/"; license = licenses.asl20; maintainers = with maintainers; [ danieldk ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix new file mode 100644 index 00000000000..c068225bb6b --- /dev/null +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -0,0 +1,46 @@ +{ stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: +stdenv.mkDerivation rec{ + + name = "geogebra-${version}"; + version = "6-0-598-0"; + + src = fetchurl { + urls = [ + "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20200815132422/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + ]; + sha256 = "1klazsgrpmfd6vjzpdcfl5x8qhhbh6vx2g6id4vg16ac4sjdrb0c"; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ + unzip + makeWrapper + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/libexec/geogebra/ $out/bin + cp -r GeoGebra-linux-x64/{resources,locales} "$out/" + makeWrapper ${stdenv.lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" + install -Dm644 "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + + install -Dm644 "${srcIcon}" \ + "$out/share/icons/hicolor/scalable/apps/geogebra.svg" + ''; + + srcIcon = geogebra.srcIcon; + + desktopItem = geogebra.desktopItem; + meta = with stdenv.lib; geogebra.meta // { + license = licenses.geogebra; + maintainers = with maintainers; [ voidless ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index aea376301ab..5db6092fa36 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, cmake +{ stdenv, fetchFromGitHub, pkgconfig, cmake , libjpeg ? null , zlib ? null , libpng ? null @@ -8,15 +8,14 @@ , enableDocs ? false }: stdenv.mkDerivation rec { - version = "1.3"; + version = "1.6"; pname = "openmvg"; - src = fetchgit { - url = "https://www.github.com/openmvg/openmvg.git"; - - # Tag v1.1 - rev = "refs/tags/v${version}"; - sha256 = "1cf1gbcl8zvxp4rr6f6vaxwcg0yzc4xban2b5p9zy1m4k1f81zyb"; + src = fetchFromGitHub { + owner = "openmvg"; + repo = "openmvg"; + rev = "v${version}"; + sha256 = "0mrsi0dzgi7cjzn13r9xv7rnc8c9a4h8ip78xy88m9xsyr21wd1h"; fetchSubmodules = true; }; @@ -46,6 +45,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ mdaiter ]; - broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index ff299cbb0bf..8710b88ced3 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.0.9"; + version = "4.0.10"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -62,7 +62,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "0fwibgb9wmxk2zili5vsibi2q6pk1gna21870y5abx4scbvhgq68"; + sha256 = "1jmhhd2nwxq3m9rzzmrjls8f6hhj52ia71b1sv4vvcjh802cha8g"; fetchSubmodules = true; }; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b2511a7f2b3..41ef3cce465 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -63,6 +63,8 @@ let git-annex-utils = callPackage ./git-annex-utils { }; + git-brunch = pkgs.haskellPackages.git-brunch; + git-appraise = callPackage ./git-appraise {}; git-bug = callPackage ./git-bug { }; @@ -235,6 +237,7 @@ let # aliases darcsToGit = darcs-to-git; gitAnnex = git-annex; + gitBrunch = git-brunch; gitFastExport = git-fast-export; gitRemoteGcrypt = git-remote-gcrypt; svn_all_fast_export = svn-all-fast-export; diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index 7796f08c8a4..4895a2e399b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix @@ -18,7 +18,6 @@ buildGoPackage rec { description = "Distributed code review system for Git repos"; homepage = "https://github.com/google/git-appraise"; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.vdemeester ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 74acf0139d5..44eba8c4b39 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -33,7 +33,6 @@ buildGoModule rec { description = "Distributed bug tracker embedded in Git"; homepage = "https://github.com/MichaelMure/git-bug"; license = licenses.gpl3; - platforms = platforms.all; maintainers = with maintainers; [ royneary ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 93d152baa00..a2f319d82b0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -30,7 +30,6 @@ buildRustPackage rec { description = "Quickly and easily fetch .gitignore templates from gitignore.io"; homepage = "https://github.com/sondr3/git-ignore"; license = licenses.gpl3Plus; - platforms = platforms.all; maintainers = [ maintainers.sondr3 ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 5de7fddbc0c..674bdd14247 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec { description = "Sync personal and work git repositories from multiple providers"; homepage = "https://github.com/orf/git-workspace"; license = with licenses; [ mit ]; - platforms = platforms.all; maintainers = with maintainers; [ misuzu ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index e370fcd5b42..b0042b2ee9e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -6,6 +6,7 @@ , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? true +, nlsSupport ? true , guiSupport , withManual ? true , pythonSupport ? true @@ -98,6 +99,7 @@ stdenv.mkDerivation { ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1" + ++ stdenv.lib.optional (!nlsSupport) "NO_GETTEXT=1" # git-gui refuses to start with the version of tk distributed with # macOS Catalina. We can prevent git from building the .app bundle # by specifying an invalid tk framework. The postInstall step will diff --git a/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/pkgs/applications/version-management/git-and-tools/gitin/default.nix index 5964af6c0f0..af9aef6d39c 100644 --- a/pkgs/applications/version-management/git-and-tools/gitin/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -26,7 +26,6 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/isacikgoz/gitin"; description = "Text-based user interface for git"; - platforms = platforms.all; license = licenses.bsd3; maintainers = with maintainers; [ kimat ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index be0a48d03bf..2413019ebc7 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -31,6 +31,5 @@ buildGoModule rec { homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; maintainers = with maintainers; [ marsam dtzWill ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix index 6d41098ee1a..049a2aa2c1d 100644 --- a/pkgs/applications/version-management/git-sizer/default.nix +++ b/pkgs/applications/version-management/git-sizer/default.nix @@ -17,6 +17,5 @@ buildGoPackage rec { description = "Compute various size metrics for a Git repository"; license = licenses.mit; maintainers = with maintainers; [ matthewbauer ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix new file mode 100644 index 00000000000..0e9b3dbedb2 --- /dev/null +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "gitoxide"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "Byron"; + repo = "gitoxide"; + rev = "v${version}"; + sha256 = "0xpic9jx7nrxi5d8lqch2vxpvipx994d717c4n0kgr3ipyij1347"; + }; + + cargoSha256 = "104lyfni75h1i30s2jlzf66sp1czfd9ywqz78kj4i7lfdf6fc4x9"; + + meta = with lib; { + description = + "A command-line application for interacting with git repositories"; + homepage = "https://github.com/Byron/gitoxide"; + # NOTE: the master branch is dual-licensed with APACHE but v0.3.0 is only MIT + license = licenses.mit; + maintainers = [ maintainers.syberant ]; + }; +} diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 74b793f0e77..b17e759c657 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -60,6 +60,5 @@ in rustPlatform.buildRustPackage rec { homepage = "https://pijul.org"; license = with licenses; [ gpl2Plus ]; maintainers = [ maintainers.gal_bolle ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 67bda7a4fdd..d19f9862fca 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://sit.fyi/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir yrashk ]; - platforms = platforms.all; # Upstream has not had a release in several years, and dependencies no # longer compile with the latest Rust compiler. broken = true; diff --git a/pkgs/applications/video/molotov/default.nix b/pkgs/applications/video/molotov/default.nix new file mode 100644 index 00000000000..c4ee96cc246 --- /dev/null +++ b/pkgs/applications/video/molotov/default.nix @@ -0,0 +1,31 @@ +{ appimageTools, lib, fetchurl }: + +let + pname = "molotov"; + version = "4.2.2"; + name = "${pname}-${version}"; + src = fetchurl { + url = "http://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage"; + sha256 = "00p8srf4yswbihlsi3s7kfkav02h902yvrq99wys11is63n01x8z"; + }; + appimageContents = appimageTools.extractType2 { inherit name src; }; +in +appimageTools.wrapType2 { + inherit name src; + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D \ + ${appimageContents}/${pname}.desktop \ + $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + meta = with lib; { + description = "French TV service"; + homepage = "https://www.molotov.tv/"; + license = with licenses; [ unfree ]; + maintainers = with maintainers; [ apeyroux freezeboy ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ada0d969109..7cbc3e4c619 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -35,7 +35,7 @@ let in stdenv.mkDerivation rec { - version = "5.0.0"; + version = "5.1.0"; pname = "qemu" + stdenv.lib.optionalString xenSupport "-xen" + stdenv.lib.optionalString hostCpuOnly "-host-cpu-only" @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { src = fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "1dlcwyshdp94fwd30pddxf9bn2q8dfw5jsvry2gvdj551wmaj4rg"; + sha256 = "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9"; }; nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ] diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index fda95b41ab5..1a238bb475d 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/oracle/railcar"; license = with licenses; [ asl20 /* or */ upl ]; maintainers = [ maintainers.spacekookie ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index b38cb990617..c3ab5589486 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "spectrwm"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "conformal"; repo = "spectrwm"; - rev = "SPECTRWM_3_3_0"; - sha256 = "139mswlr0z5dbp5migm98qqg84syq0py1qladp3226xy6q3bnn08"; + rev = "SPECTRWM_3_4_1"; + sha256 = "0bf0d25yr0craksamczn2mdy6cjp27l88smihlw9bw4p6a2qhi41"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 3c81a4ece65..eab5366e183 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -240,6 +240,8 @@ rec { * This creates a single derivation that replicates the directory structure * of all the input paths. * + * BEWARE: it may not "work right" when the passed paths contain symlinks to directories. + * * Examples: * # adds symlinks of hello to current build. * symlinkJoin { name = "myhello"; paths = [ pkgs.hello ]; } diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index 974034be358..0c2cd1609f6 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -2,7 +2,7 @@ let pname = "agave"; - version = "16"; + version = "22"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; @@ -13,7 +13,7 @@ in fetchurl { install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf ''; - sha256 = "108jvcijnx06v1jzhnb28ql9nvmwqd83309834wcd4aii6bgf9ka"; + sha256 = "1jb8f0xcv5z0l5nyx733b6zclswi82vrh2nwyyhbqzgqrl4y1h6s"; meta = with lib; { description = "truetype monospaced typeface designed for X environments"; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index bfc47b70075..726f60938bb 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,7 +2,7 @@ let pname = "spleen"; - version = "1.8.1"; + version = "1.8.2"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -19,7 +19,7 @@ in fetchurl { # create fonts.dir so NixOS xorg module adds to fp ${mkfontscale}/bin/mkfontdir "$d" ''; - sha256 = "0m70gz1ywrhw8xfff9bgx1wv52z9fibdsmjcwhjhpd826zbz05w8"; + sha256 = "0195d8ssmd8hc0q941z6zwnccffxajv4vylypsndxf28f3ikawby"; meta = with lib; { description = "Monospaced bitmap fonts"; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 3a82c313296..52f9c8c821f 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; - version = "0.15"; + version = "0.15.1"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; rev = "v${version}"; - sha256 = "1f6qvpzxz759znishmr4b22n540y18glv41wmy91r78sa4g6x4sh"; + sha256 = "1rl15kh9c7qxw4pvwmw44fb4v3vwh6zin4wpx55bnvm5j76y6p3f"; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix new file mode 100644 index 00000000000..3125df5fe1c --- /dev/null +++ b/pkgs/data/icons/luna-icons/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, fetchFromGitHub +, gtk3 +, breeze-icons +, hicolor-icon-theme +, pantheon +}: + +stdenv.mkDerivation rec { + pname = "luna-icons"; + version = "2020-08-09"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = "d32aacabcc018212c460833327e1b54a716a5a23"; + sha256 = "1f1ypxcvmd97afn7612i8gxmbrj80vx45vqrrh3n0p65jw5lg7zc"; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + hicolor-icon-theme + pantheon.elementary-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -a Luna* $out/share/icons + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Icon pack based on marwaita and papirus icons"; + homepage = "https://github.com/darkomarko42/Luna-Icons"; + license = [ licenses.gpl3Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 885423d9a25..f43ca473f0d 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "20.06.07"; + version = "20.07.11"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "1j1i5w3pfw61axcqh8jdkcv20fkmwq0mslfhq725sp3jwv9wyqy2"; + sha256 = "0vj3d3wb12ksnkm99s32k7nrf9m5j83zzvkd0rwk8l0b30df975j"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 53c8e539989..51a2100d3aa 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "20.06.07"; + version = "20.07.11"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0irib8qywc32cqxchb4z20p0vnyvlgxk8z4vqa5lzx7cd4xmflm1"; + sha256 = "07jy8l2r6grn7pabn3dnkc8j7xdykl7k57br30c6v61ss8paf2rw"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 87425defb87..d12eec8d8e3 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: +{ stdenv, fetchurl, osinfo-db-tools, gettext, libxml2 }: stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20200529"; + version = "20200804"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "0mbrf9j5wmjhc6jixvhp4jqyxixh1717lqrmzmipdg99xnzba81n"; + sha256 = "1gx8yky41kz2f03r7gvxgq8naysnrf8apsss61xqaxmmyd080z0v"; }; - nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; + nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; phases = [ "installPhase" ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 08dbb2ea5d9..45675b791cd 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , meson , ninja , pkgconfig @@ -27,6 +28,14 @@ stdenv.mkDerivation rec { sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4"; }; + patches = [ + # https://gitlab.gnome.org/GNOME/gnome-logs/-/issues/52 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/b42defceefc775220b525f665a3b662ab9593b81.patch"; + sha256 = "1s0zscmhwy7r0xff17wh8ik8x9xw1vrkipw5vl5i770bxnljps8n"; + }) + ]; + nativeBuildInputs = [ python3 meson diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix index 1a615b8f66a..cb6f90e5b96 100644 --- a/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/pkgs/desktops/xfce/core/tumbler/default.nix @@ -14,9 +14,9 @@ mkXfceDerivation { category = "xfce"; pname = "tumbler"; - version = "0.2.8"; + version = "0.2.9"; - sha256 = "1y9sphaz3izal96v53lps692xxzp5pad1d09kxsmmpm7pic4n1r2"; + sha256 = "0b3mli40msv35qn67c1m9rn5bigj6ls10l08qk7fa3fwvzl49hmw"; buildInputs = [ ffmpegthumbnailer diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index 43d729b9e09..7ab12461046 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.4"; + version = "4.14.5"; - sha256 = "0nk3qw1accvxrzy00qs06nnlpxjv6p1srkvjn2ad4xrw9ix9ywkb"; + sha256 = "0xxprhs8g00ysrl25y6z9agih6wb7n29v5f5m2icaz7yjvj1k9iv"; nativeBuildInputs = [ exo librsvg ]; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 573d36cd3f6..8f292e358ae 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: +{ stdenv, fetchurl, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: let options = rec { /* TODO: there are also FreeBSD and Windows versions */ x86_64-linux = { arch = "linuxx86"; - sha256 = "0hs1f3z7crgzvinpj990kv9gvbsipxvcvwbmk54n51nasvc5025q"; + sha256 = "0d5bsizgpw9hv0jfsf4bp5sf6kxh8f9hgzz9hsjzpfhs3npmmac4"; runtime = "lx86cl64"; kernel = "linuxx8664"; }; @@ -17,26 +17,44 @@ let }; armv7l-linux = { arch = "linuxarm"; - sha256 = "0p0l1dzsygb6i1xxgbipjpxkn46xhq3jm41a34ga1qqp4x8lkr62"; + sha256 = throw "ccl all-in-one linuxarm archive missing upstream"; runtime = "armcl"; kernel = "linuxarm"; }; x86_64-darwin = { arch = "darwinx86"; - sha256 = "5adbea3d8b4a2e29af30d141f781c6613844f468c0ccfa11bae908c3e9641939"; + sha256 = "1l060719k8mjd70lfdnr0hkybk7v88zxvfrsp7ww50q808cjffqk"; runtime = "dx86cl64"; kernel = "darwinx8664"; }; armv6l-linux = armv7l-linux; }; cfg = options.${stdenv.hostPlatform.system} or (throw "missing source url for platform ${stdenv.hostPlatform.system}"); + + # The 1.12 github release of CCL seems to be missing the usual + # ccl-1.12-linuxarm.tar.gz tarball, so we build it ourselves here + linuxarm-src = runCommand "ccl-1.12-linuxarm.tar.gz" { + outer = fetchurl { + url = "https://github.com/Clozure/ccl/archive/v1.12.tar.gz"; + sha256 = "0lmxhll6zgni0l41h4kcf3khbih9r0f8xni6zcfvbi3dzfs0cjkp"; + }; + inner = fetchurl { + url = "https://github.com/Clozure/ccl/releases/download/v1.12/linuxarm.tar.gz"; + sha256 = "0x4bjx6cxsjvxyagijhlvmc7jkyxifdvz5q5zvz37028va65243c"; + }; + } '' + tar xf $outer + tar xf $inner -C ccl + tar czf $out ccl + ''; + in stdenv.mkDerivation rec { pname = "ccl"; - version = "1.11.5"; + version = "1.12"; - src = fetchurl { + src = if cfg.arch == "linuxarm" then linuxarm-src else fetchurl { url = "https://github.com/Clozure/ccl/releases/download/v${version}/ccl-${version}-${cfg.arch}.tar.gz"; sha256 = cfg.sha256; }; @@ -88,6 +106,6 @@ stdenv.mkDerivation rec { homepage = "https://ccl.clozure.com/"; maintainers = with maintainers; [ raskin muflax tohl ]; platforms = attrNames options; - license = licenses.lgpl21; + license = licenses.asl20; }; } diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 133235e5d40..6c534bb8362 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, pkgs , haskell, nodejs -, fetchurl, fetchpatch, makeWrapper, writeScriptBin }: +, fetchurl, fetchpatch, makeWrapper, writeScriptBin + # Rust dependecies +, rustPlatform, openssl, pkg-config }: let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; @@ -126,5 +128,8 @@ let }; in hsPkgs.elmPkgs // elmNodePackages // { + elm-json = import ./packages/elm-json.nix { + inherit rustPlatform fetchurl openssl stdenv pkg-config; + }; lib = elmLib; } diff --git a/pkgs/development/compilers/elm/packages/elm-json.nix b/pkgs/development/compilers/elm/packages/elm-json.nix new file mode 100644 index 00000000000..299e887ecff --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-json.nix @@ -0,0 +1,30 @@ +{ rustPlatform, fetchurl, openssl, stdenv, pkg-config }: +rustPlatform.buildRustPackage rec { + pname = "elm-json"; + version = "0.2.7"; + + src = fetchurl { + url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz"; + sha256 = "sha256:1b9bhl7rb01ylqjbfd1ccm26lhk4hzwd383rbg89aj2jwjv0w4hs"; + }; + + cargoPatches = [ ./elm-json.patch ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7"; + verifyCargoDeps = true; + + # Tests perform networking and therefore can't work in sandbox + doCheck = false; + + meta = with stdenv.lib; { + description = "Install, upgrade and uninstall Elm dependencies"; + homepage = "https://github.com/zwilias/elm-json"; + license = licenses.mit; + maintainers = [ maintainers.turbomack ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/elm/packages/elm-json.patch b/pkgs/development/compilers/elm/packages/elm-json.patch new file mode 100644 index 00000000000..70064d0a424 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-json.patch @@ -0,0 +1,48 @@ +diff --git a/Cargo.lock b/Cargo.lock +index f4d95f5..6830b3d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -625,14 +625,6 @@ name = "openssl-probe" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + +-[[package]] +-name = "openssl-src" +-version = "111.9.0+1.1.1g" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- + [[package]] + name = "openssl-sys" + version = "0.9.56" +@@ -641,7 +633,6 @@ dependencies = [ + "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-src 111.9.0+1.1.1g (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] +@@ -1162,7 +1153,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum object 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" + "checksum once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" + "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +-"checksum openssl-src 111.9.0+1.1.1g (registry+https://github.com/rust-lang/crates.io-index)" = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" + "checksum openssl-sys 0.9.56 (registry+https://github.com/rust-lang/crates.io-index)" = "f02309a7f127000ed50594f0b50ecc69e7c654e16d41b4e8156d1b3df8e0b52e" + "checksum petgraph 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29c127eea4a29ec6c85d153c59dc1213f33ec74cead30fe4730aecc88cc1fd92" + "checksum pin-project 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)" = "edc93aeee735e60ecb40cf740eb319ff23eab1c5748abfdb5c180e4ce49f7791" +diff --git a/Cargo.toml b/Cargo.toml +index adfab25..37ae0c2 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -21,7 +21,7 @@ colored = "1.9" + dialoguer = "0.6" + dirs = "2.0" + fs2 = "0.4" +-isahc = { version = "0.9", features = ["static-ssl"] } ++isahc = "0.9" + + [dev-dependencies] + assert_cmd = "0.11" diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index b603675a6f1..06b1b9b1e64 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -49,6 +49,5 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/rust-lang/rls/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ symphorien ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index eb8560ada84..6215c936c6d 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -26,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-lang-nursery/rustfmt"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ globin basvandijk ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index b6ac9a57920..060b95cf877 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -30,7 +30,6 @@ buildGoModule rec { doCheck = false; - enableParallelBuilding = true; subPackages = [ "." ]; buildInputs = [ llvm clang-unwrapped makeWrapper ]; propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ]; @@ -47,6 +46,5 @@ buildGoModule rec { description = "Go compiler for small places"; license = licenses.bsd3; maintainers = with maintainers; [ chiiruno ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index d5cfb5a217f..e72fe7845c8 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -2,23 +2,41 @@ , bignums ? null }: let params = - if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { - version = "3.4.2"; - uid = "38288"; - sha256 = "00bgzbji0gkazwxhs4q8gz4ccqsa1y1r0m0ravr18ps2h8a8qva5"; - } else { + let + v3_3 = { version = "3.3.0"; uid = "37077"; sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; - } -; in + }; + v3_4 = { + version = "3.4.2"; + uid = "38288"; + sha256 = "00bgzbji0gkazwxhs4q8gz4ccqsa1y1r0m0ravr18ps2h8a8qva5"; + }; + v4_0 = { + version = "4.0.0"; + uid = "38339"; + sha256 = "19sbrv7jnzyxji7irfslhr9ralc0q3gx20nymig5vqbn3vssmgpz"; + }; + in { + "8.5" = v3_3; + "8.6" = v3_3; + "8.7" = v3_4; + "8.8" = v4_0; + "8.9" = v4_0; + "8.10" = v4_0; + "8.11" = v4_0; + "8.12" = v4_0; + }; + param = params."${coq.coq-version}"; +in stdenv.mkDerivation { - name = "coq${coq.coq-version}-interval-${params.version}"; + name = "coq${coq.coq-version}-interval-${param.version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/${params.uid}/interval-${params.version}.tar.gz"; - inherit (params) sha256; + url = "https://gforge.inria.fr/frs/download.php/file/${param.uid}/interval-${param.version}.tar.gz"; + inherit (param) sha256; }; nativeBuildInputs = [ which ]; @@ -38,8 +56,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; }; - } diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index 0718e518b35..6826e07d613 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, coq, stdpp }: stdenv.mkDerivation rec { - version = "3.2.0"; + version = "3.3.0"; name = "coq${coq.coq-version}-iris-${version}"; src = fetchFromGitLab { domain = "gitlab.mpi-sws.org"; owner = "iris"; repo = "iris"; rev = "iris-${version}"; - sha256 = "10dfi7qx6j5w6kbmbrf05xh18jwxr9iz5g7y0f6157msgvl081xs"; + sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp"; }; buildInputs = [ coq ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 3ba99e87ffb..28917e73f29 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "coq${coq.coq-version}-stdpp-${version}"; - version = "1.2.1"; + version = "1.4.0"; src = fetchFromGitLab { domain = "gitlab.mpi-sws.org"; owner = "iris"; repo = "stdpp"; rev = "coq-stdpp-${version}"; - sha256 = "1lczybg1jq9drbi8nzrlb0k199x4n07aawjwfzrl3qqc0w8kmvdz"; + sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r"; }; buildInputs = [ coq ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 8eae3421562..11b9cd1ba50 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -26,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/google/evcxr"; license = licenses.asl20; maintainers = with maintainers; [ protoben ma27 ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 2bf64be17ea..7f773882d8f 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -25,7 +25,6 @@ buildGoModule rec { homepage = "https://github.com/candid82/joker"; description = "A small Clojure interpreter and linter written in Go"; license = licenses.epl10; - platforms = platforms.all; maintainers = with maintainers; [ andrestylianos ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 0d6121c4e11..b25d613eb7f 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -9,6 +9,7 @@ , readline , sqlite , tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false +, bluez ? null, bluezSupport ? false , zlib , self , configd @@ -45,6 +46,9 @@ assert x11Support -> tcl != null && tk != null && xorgproto != null && libX11 != null; + +assert bluezSupport -> bluez != null; + with stdenv.lib; let @@ -73,6 +77,7 @@ let buildInputs = filter (p: p != null) ([ zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] ++ optionals x11Support [ tcl tk libX11 xorgproto ] + ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] ++ optionals stdenv.isDarwin [ configd ]); hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 404c0731c34..c620b1686ea 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -35,6 +35,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://wasmer.io/"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 62f11a7a725..97ddab1a32e 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "0w97knzw85mljrmns8fxjqinx0fqwls9g91mk434ryf6ciy6yign"; + sha256 = "1p22dwrzzvbmrfjr6m3dac55nq8pp0b9afp3vz6239yp3gf2fcws"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index bffd281d0de..21bbf8c1bc7 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { can be consumed by other software. ''; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 1d7b7a6f98b..fac55b60651 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -274,10 +274,10 @@ in rec { de = buildOfficialDict { language = "de"; - version = "20030222-1"; + version = "20161207-7-0"; fullName = "German"; filename = "aspell6"; - sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; + sha256 = "0wamclvp66xfmv5wff96v6gdlnfv4y8lx3f8wvxyzm5imwgms4n2"; }; de-alt = buildOfficialDict { diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 628046a5741..a414191ac0d 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -4,13 +4,13 @@ , gobjectSupport ? true, glib , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux) +, glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) , libGL ? null # libGLU libGL is no longer a big dependency , pdfSupport ? true , darwin }: -assert glSupport -> libGL != null; +assert glSupport -> x11Support && libGL != null; let version = "1.16.0"; diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index 8d8b41e0609..e1cb8d2d9e2 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -1,12 +1,40 @@ -{stdenv, fetchurl}: +{ stdenv +, fetchurl +, qt5 +}: stdenv.mkDerivation rec { - version = "3.12.2"; + version = "3.17.0"; pname = "dxflib"; src = fetchurl { - url = "http://www.qcad.org/archives/dxflib/${pname}-${version}.src.tar.gz"; - sha256 = "20ad9991eec6b0f7a3cc7c500c044481a32110cdc01b65efa7b20d5ff9caefa9"; + url = "http://www.qcad.org/archives/dxflib/${pname}-${version}-src.tar.gz"; + sha256 = "09yjgzh8677pzkkr7a59pql5d11451c22pxksk2my30mapxsri96"; }; + nativeBuildInputs = [ + qt5.qmake + ]; + preConfigure = '' + sed -i 's/CONFIG += staticlib/CONFIG += shared/' dxflib.pro + ''; + installPhase = '' + install -d -m 0755 $out/lib + cp -pr *.so* $out/lib + install -d -m 0755 $out/include/dxflib + cp -pr src/*.h $out/include/dxflib + # Generate pkgconfig file + install -d -m 0755 $out/lib/pkgconfig + cat << 'EOF' > $out/lib/pkgconfig/dxflib.pc + prefix=${placeholder "out"} + libdir=${placeholder "out"}/lib + includedir=${placeholder "out"}/include + Name: dxflib + Description: A C++ library for reading and writing DXF files + Version: %{version} + Libs: -L${placeholder "out"}/lib -ldxflib + Cflags: -I${placeholder "out"}/include/dxflib + EOF + ''; + doCheck = true; meta = { maintainers = with stdenv.lib.maintainers; [raskin]; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 0f3cb9b27b9..c8ec81f79e5 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { meta = { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; - homepage = "https://www.audiocoding.com/faac.html"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 7040ad0f451..6842f191abe 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; - homepage = "https://www.audiocoding.com/faad2.html"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 15f2f42af38..2cb056437cb 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -1,16 +1,17 @@ -{ stdenv, lib, fetchgit, pkg-config, meson, ninja, freetype, fontconfig, pixman, tllist }: +{ stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc +,freetype, fontconfig, pixman, tllist }: stdenv.mkDerivation rec { pname = "fcft"; - version = "0.4.3"; + version = "2.2.6"; src = fetchgit { url = "https://codeberg.org/dnkl/fcft.git"; rev = "${version}"; - sha256 = "1r2k5726k6ps8ml2s1vqmpiggqxzq9pbzs7m0dsxk29mh8vg0psj"; + sha256 = "06zywvvgrch9k4d07bir2sxddwsli2gzpvlvjfcwbrj3bw5x6j1b"; }; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ freetype fontconfig pixman tllist ]; meta = with lib; { diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix index cd8e70a9976..112b77650d2 100644 --- a/pkgs/development/libraries/itk/4.x.nix +++ b/pkgs/development/libraries/itk/4.x.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk_7 }: +{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }: stdenv.mkDerivation rec { - name = "itk-4.13.2"; + pname = "itk"; + version = "4.13.3"; - src = fetchurl { - url = "mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz"; - sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"; + src = fetchFromGitHub { + owner = "InsightSoftwareConsortium"; + repo = "ITK"; + rev = "v${version}"; + sha256 = "067vkh39jxcvyvn69qjh4vi3wa7vdvm9m6qsg3jmnmm7gzw0kjlm"; }; cmakeFlags = [ @@ -22,11 +25,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk_7 ]; + buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; meta = { description = "Insight Segmentation and Registration Toolkit"; - homepage = "http://www.itk.org/"; + homepage = "https://www.itk.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4296e56c743..328c85830fb 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -17,15 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpthreadstubs libpciaccess ] ++ lib.optional withValgrind valgrind-light; - patches = [ ./cross-build-nm-path.patch ] ++ - lib.optionals stdenv.hostPlatform.isMusl [ - # Fix tests not building on musl because they use the glibc-specific - # (non-POSIX) `ioctl()` type signature. See #66441. - (fetchpatch { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/30a2af80f5f8c8ddf0f619e4f50451b02baa22dd/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch"; - sha256 = "0rdmh4k5kb80hhk1sdhlil30yf0s8d8w0fnq0hzyvw3ir1mki3by"; - }) - ]; + patches = [ ./cross-build-nm-path.patch ]; postPatch = '' for a in */*-symbol-check ; do diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index 1b528b98e85..c0aa67238bf 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, gettext , gtk2, libcanberra, libnotify, pcre, sqlite, xorg +, harfbuzz }: stdenv.mkDerivation rec { @@ -27,6 +28,9 @@ stdenv.mkDerivation rec { "-DINSTALL_LIBDIR=lib" ]; + # https://sourceforge.net/p/libgaminggear/discussion/general/thread/b43a776b3a/ + NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ]; + postFixup = '' moveToOutput bin "$bin" ''; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index 3f5ba26d5a4..e1b9e4f0bdc 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING maintainers = with maintainers; [ bgamari ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 0709f3867e4..5dc4deb30be 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -10,18 +10,19 @@ stdenv.mkDerivation rec { }; buildPhase = '' - make - make lib + make + make lib ''; installPhase = let libSuff = stdenv.hostPlatform.extensions.sharedLibrary; in '' - mkdir -p $out/lib $out/bin $out/include; - cp libsvm.so.2 $out/lib/libsvm.2${libSuff}; - ln -s $out/lib/libsvm.2${libSuff} $out/lib/libsvm${libSuff}; - cp svm-scale svm-train svm-predict $out/bin; - cp svm.h $out/include; + install -D libsvm.so.2 $out/lib/libsvm.2${libSuff} + ln -s $out/lib/libsvm.2${libSuff} $out/lib/libsvm${libSuff} + install -Dt $out/bin/ svm-scale svm-train svm-predict + install -Dm644 -t $out/include svm.h + mkdir $out/include/libsvm + ln -s $out/include/svm.h $out/include/libsvm/svm.h ''; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 2e16f58d9fb..fecc4100f5e 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -3,6 +3,7 @@ , hdf5 , m4 , curl # for DAP +, removeReferencesTo }: let @@ -26,7 +27,7 @@ in stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ m4 ]; + nativeBuildInputs = [ m4 removeReferencesTo ]; buildInputs = [ hdf5 curl mpi ]; passthru = { @@ -42,6 +43,12 @@ in stdenv.mkDerivation rec { ] ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); + disallowedReferences = [ stdenv.cc ]; + + postFixup = '' + remove-references-to -t ${stdenv.cc} "$(readlink -f $out/lib/libnetcdf.settings)" + ''; + doCheck = !mpiSupport; meta = { diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/development/libraries/rang/default.nix new file mode 100644 index 00000000000..b3d300baca2 --- /dev/null +++ b/pkgs/development/libraries/rang/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + pname = "rang"; + version = "v3.1.0"; + src = fetchFromGitHub { + "owner" = "agauniyal"; + repo = "rang"; + "rev" = "cabe04d6d6b05356fa8f9741704924788f0dd762"; + "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; + }; + nativeBuildInputs = [ cmake ]; + meta = with stdenv.lib; { + description = + "A Minimal, Header only Modern c++ library for terminal goodies"; + homepage = "https://agauniyal.github.io/rang/"; + license = licenses.unlicense; + maintainers = [ maintainers.HaoZeke ]; + }; +} diff --git a/pkgs/development/libraries/tinycbor/default.nix b/pkgs/development/libraries/tinycbor/default.nix new file mode 100644 index 00000000000..62f2a807185 --- /dev/null +++ b/pkgs/development/libraries/tinycbor/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "tinycbor"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "tinycbor"; + rev = "v${version}"; + sha256 = "11y6liyd3fvc28d3dinii16sxgwgg2p29p41snc4h82dvvx5bb2b"; + }; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "Concise Binary Object Representation (CBOR) Library"; + homepage = "https://github.com/intel/tinycbor"; + license = licenses.mit; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix new file mode 100644 index 00000000000..455431ec341 --- /dev/null +++ b/pkgs/development/libraries/vtk/9.x.nix @@ -0,0 +1,95 @@ +{ stdenv, mkDerivation, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff +, fetchpatch +, enableQt ? false, qtbase, qtx11extras, qttools +, enablePython ? false, python ? null +# Darwin support +, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL +, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "9.0"; + minorVersion = "1"; + version = "${majorVersion}.${minorVersion}"; +in + +mkDerivation rec { + name = "vtk-${os enableQt "qvtk-"}${version}"; + src = fetchurl { + url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; + sha256 = "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libtiff ] + ++ optionals enableQt [ qtbase qtx11extras qttools ] + ++ optionals stdenv.isLinux [ + libGLU + libGL + libX11 + xorgproto + libXt + ] ++ optionals stdenv.isDarwin [ + xpc + Cocoa + CoreServices + DiskArbitration + IOKit + CFNetwork + Security + ApplicationServices + CoreText + IOSurface + ImageIO + OpenGL + GLUT + ] + ++ optional enablePython [ + python + ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ]; + + preBuild = '' + export LD_LIBRARY_PATH="$(pwd)/lib"; + ''; + + # Shared libraries don't work, because of rpath troubles with the current + # nixpkgs cmake approach. It wants to call a binary at build time, just + # built and requiring one of the shared objects. + # At least, we use -fPIC for other packages to be able to use this in shared + # objects. + cmakeFlags = [ + "-DCMAKE_C_FLAGS=-fPIC" + "-DCMAKE_CXX_FLAGS=-fPIC" + "-DVTK_USE_SYSTEM_TIFF=1" + "-DOPENGL_INCLUDE_DIR=${libGL}/include" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_BINDIR=bin" + ] + ++ optionals enableQt [ "-DVTK_Group_Qt:BOOL=ON" ] + ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] + ++ optionals enablePython [ + "-DVTK_WRAP_PYTHON:BOOL=ON" + "-DVTK_PYTHON_VERSION:STRING=3" + ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Open source libraries for 3D computer graphics, image processing and visualization"; + homepage = "https://www.vtk.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ tfmoraes ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 14882bc2243..0228cd83924 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -15,7 +15,7 @@ rec { }; emulateApp = import ./emulate-app.nix { - inherit (pkgs) stdenv lib; + inherit (pkgs) stdenv lib runtimeShell; inherit composeAndroidPackages; }; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 6273d75cc38..83be06a3141 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,4 +1,4 @@ -{ composeAndroidPackages, stdenv, lib }: +{ composeAndroidPackages, stdenv, lib, runtimeShell }: { name, app ? null , platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default" , enableGPU ? false, extraAVDFiles ? [] @@ -25,7 +25,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/run-test-emulator << "EOF" - #! ${stdenv.shell} -e + #!${runtimeShell} -e # We need a TMPDIR if [ "$TMPDIR" = "" ] diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index 3ae9b44eba9..0e2bdf7311c 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildDunePackage , fetchFromGitHub , cmdliner @@ -15,7 +16,7 @@ buildDunePackage rec { pname = "torch"; - version = "0.9b"; + version = "0.10"; minimumOCamlVersion = "4.07"; @@ -23,7 +24,7 @@ buildDunePackage rec { owner = "LaurentMazare"; repo = "ocaml-${pname}"; rev = version; - sha256 = "1xn8zfs3viz80agckcpl9a4vjbq6j5g280i95jyy5s0zbcnajpnm"; + sha256 = "1rqrv6hbical8chk0bl2nf60q6m4b5d1gab9fc5q03vkz2987f9b"; }; propagatedBuildInputs = [ @@ -42,7 +43,7 @@ buildDunePackage rec { preBuild = ''export LIBTORCH=${pytorch.dev}/''; - doCheck = true; + doCheck = !stdenv.isAarch64; checkPhase = "dune runtest"; meta = with lib; { diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index dfac6281396..fcbeb1f1f4d 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.19.2"; + version = "3.20.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0qkfa7506cadvd9ps3radyhhanjs16jlhwhcixsz142d34ynli49"; + sha256 = "72c81f21b6adb907595fce8d883c0231301cbd8e9f6e5ce8e98bab927054daca"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 439702e8027..794e0fa5242 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.20.1"; + version = "0.21.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1c4mcjrdbvvq5crrfc3b9m221qb6pxp55yynijihgfnvvndz2jrr"; + sha256 = "0gw665737pr9b0lmmxlnwgmw1sbwv00xp8jdxws1xxi6nc72mjsk"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index aaa8afabd60..35640989b2f 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.8.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0p6pzpgfxr0c95gqr8ryq779an13x84vlm3zhvwlgx47l90a4vd6"; + sha256 = "c89bbdcdc13ad45fe57d775ed87b15baf6d0b039a1ecd0a1bc91d2f713cb1f08"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix index 5c45b843c76..e5a38cdaa44 100644 --- a/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "azure-datalake-store"; - version = "0.0.48"; + version = "0.0.49"; src = fetchPypi { inherit pname version; - sha256 = "d27c335783d4add00b3a5f709341e4a8009857440209e15a739a9a96b52386f7"; + sha256 = "3fcede6255cc9cd083d498c3a399b422f35f804c561bb369a7150ff1f2f07da9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index e3a79e7ae05..f607ab7a094 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.3.1"; + version = "1.4.0"; disabled = isPy38; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5a59c36b4b05bdaec455c390feda71b6495fc828246593404351b9a41c2e877a"; + sha256 = "820e1f3e21f90d36063239c6cb7ca9a6bb644cb120a6b1ead3081cafdf6ceaf8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 1e4b8f09c55..06752a4f8fc 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -3,6 +3,7 @@ , fetchPypi , python , isPy3k +, azure-common , azure-core , msrest , msrestazure @@ -10,15 +11,16 @@ buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.1.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "069l6m80rq4smyqbrmjb2w18wxxg49xi2yrf1wsxpq8r0r45cksl"; + sha256 = "5e33881f3a9b3080c815fe6a7200c0c8670ec506eff45955432ddb84f3076902"; }; propagatedBuildInputs = [ + azure-common azure-core msrest msrestazure diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 7e03e7faa8e..25ce0fd67db 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.1.0"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f9967b4deb48e619f6c40558f69e48978779cc09c8a7fad33d536cfc41cd68f9"; + sha256 = "e47b76ca5d99b12436c64ce4431271cd6744fba017f282991b84ce303e0b9eaa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index 25d58513d31..704d2951cc9 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.1.0"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4f3bfac60e025e01dd1c1998b73649d45d706975356c0cf147174cf5a6ddf8be"; + sha256 = "1083ab900da5ec63c518ffef49d9fdca02c81ddffdf80c52c03cd9da479e021f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index 994886afc70..3a9d2e5de2e 100644 --- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-authorization"; - version = "0.60.0"; + version = "0.61.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "19yn2ar2y8j4idzf8mxrxplxnawbk83sid3pzvzddif29aipbs1i"; + sha256 = "f5cceea3add04e9445ea88492f15eecf6c126f0406d967c95f6e48b79be8db75"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index da6d1639a13..d6aa79c6915 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "4.0.0"; + version = "5.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a53e9e09e2711ce9109329538fe9a8a1a5d0809efb231d7df481e55d09c4f02a"; + sha256 = "5af79f80e6c5f4766bcb5b8c62273445fb2beaeae85c5b9d2ab9aa369d60ede3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index a89a28bb264..5d80bace33f 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "12.1.0"; + version = "13.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "54416e6fa4584bb986e8985f510486a36b4fdf47af012a4982a0960c7b11e89c"; + sha256 = "7f331bafcbedf25d65aa42038f7553747dab18d7f10a5af3297192d31c45339e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index b2737826ae3..17e7796b98e 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.1.0"; + version = "1.2.0"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "049dfb0bcc7961d0d988fee493d1ec4f4480e109e4661e360bad054cc297d43c"; + sha256 = "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 8578800e56e..ecffc5b2a21 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.15.0"; + version = "0.16.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "03ysr8kx0gavjrxsi9wqrgxpg3g17nvii7z68qfm0k2mv6ryj3z7"; + sha256 = "308aeabdff61bf35ceb7a3d6dd19f1ab69a041bd92c85ee24d98a624968697f3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 8dd91f84552..9e6fb57ba26 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "35d7c737054a7e6fc7c88d8c437fc012904c4568809487cac443eb3b13e6655b"; + sha256 = "cee5168c8b89cbc673744323cf98f7f22d710914c79d103f84f8f24b780e8214"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 6713f24ca5c..ded4531b48a 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.5.1"; + version = "1.6.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "76b94f3e43fdc6698023d79be731937dc645dc3178dc134854768528ecc0aea3"; + sha256 = "b1d06279307c41da5e0a5c9722aa6b36ce3b2c212534a54767210639451b9800"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index edcfde1d1ab..0cb180064ee 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.8.0"; + version = "0.9.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b12388df60982265c9f18e7382c5cc0e389c071227865cadc626b9ff9c6e3871"; + sha256 = "9210db89fa18ee8ed53339cd63bbe6fe1d9624cd793b54b7451ddbda8ae92ef3"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 42ebac80e67..03388c42767 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.10.0"; + version = "0.12.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "380b2153c52a861ae9069fcd601cbaeb9a6f91c49cba823443a9b5fe461c3998"; + sha256 = "7d773119bc02e3d6f9d7cffb7effc17e85676d5c5b1f656d05abc4489e472c76"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index ee1149f6ef2..07427ff1ff1 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "10.1.0"; + version = "10.2.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9be7fcdf586f24acb799a799cf5e9363e9323ca0ce54cca63ab505f69fa0fddd"; + sha256 = "ddfe4c0c55f0e3fd1f66dd82c1d4a3d872ce124639b9a77fcd172daf464438a5"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index 47df7f05ceb..60ffeae2b51 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-servicefabric"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; + sha256 = "5771f24516c8d4a27f5569f23f3a606f6f106e4ad502eec7f38aedfcd3eadc74"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index f481d939705..16b37320ff5 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.19.0"; + version = "0.20.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "694649d4c9c5f89e543f23ec10e450b6382b2f1bc5843ef266cfc302276038c6"; + sha256 = "29dde5bb3234be6e4b2bc93ad1d37dc94b3d0536bbb21759e9b24250d2dfdab2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index fb4a94952d6..b8a642f665c 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.1.2"; + version = "12.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "74422d241454d66fdc3184dbe52334997ebe4f9f9a0d88ec1a2ba6c602f8a332"; + sha256 = "b649ed8afd67c10c9833f349a7c579d771a6425ad6b88027130a6b8cfa433ffb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index c178550eb04..ff4fae389cd 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , ecdsa , pysha3 }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "bip_utils"; version = "1.0.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 0b57a8a737c..c6a82d8ec42 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "e1823b33d2caa7fc54ab5507eff316e74abfdc30434db8f3be908ab52a330021"; + sha256 = "45bba08bc142781ec7e18a847735219390808f9b6279c356252edddaee1f5fcd"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index b7ebca9eb03..63f1319f567 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/hbldh/bleak"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/development/python-modules/cbor/default.nix b/pkgs/development/python-modules/cbor/default.nix index c6df7358ad7..3ebf5f26b82 100644 --- a/pkgs/development/python-modules/cbor/default.nix +++ b/pkgs/development/python-modules/cbor/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = "https://bitbucket.org/bodhisnarkva/cbor"; description = "Concise Binary Object Representation (CBOR) library"; license = licenses.asl20; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix index 9e6ff1f3d83..9981b56f2c0 100644 --- a/pkgs/development/python-modules/crashtest/default.nix +++ b/pkgs/development/python-modules/crashtest/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "crashtest"; - version = "0.3.0"; + version = "0.3.1"; disabled = !(pythonAtLeast "3.6"); src = fetchPypi { inherit pname version; - sha256 = "056zzbznl3xfnbblfci8lvcam3h7k7va68vi6asrm4q0ck4nrh79"; + sha256 = "42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd"; }; # has tests, but only on GitHub, however the pyproject build fails for me diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index e0224c744ab..8d2b6398c4b 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.3"; + version = "1.1.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6ce061bd431b05b8c47faa5044cdd5ad5654da4a4bd5c4360bd3c786ee4c64eb"; + sha256 = "1f37da2f891508ebc2bbb2b75c46a2076be39a60a45c8a88261e000e8aabeef2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index ee67db3eab0..5a2d155644a 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, django, isPy27 }: buildPythonPackage rec { - version = "3.11.0"; + version = "3.11.1"; pname = "djangorestframework"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e782087823c47a26826ee5b6fa0c542968219263fb3976ec3c31edab23a4001f"; + sha256 = "6dd02d5a4bd2516fb93f80360673bf540c3b6641fec8766b1da2870a5aa00b32"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 5d045e5108a..9147435076d 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "14idcs0wiyc0iyi5bz3xqimxf3x6dizcjfn92s2ka5zxp95xdyvd"; + hash = "sha256:088iz5cqjqh4c7141d94pvn13bh25aizqlrifwv6fs5g16zj094s"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index fd4b99fd5f4..5a3a9b0110d 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "1.4.6"; + version = "2.0.0"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "0prrqyiw9s9wf91s4f0vhqb9babs43aq24naa66qlirskdm87pav"; + sha256 = "16kfbiy87qjl07y3iin8jdjhz8j28wlwnkwxq9a0752ipjjg869p"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix index 47305d89540..ee81ead97c3 100644 --- a/pkgs/development/python-modules/etesync/default.nix +++ b/pkgs/development/python-modules/etesync/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "etesync"; - version = "0.11.1"; + version = "0.12.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0yads0s84z41hf003qk5i8222fi7096whzwfp48kf369gchp39kc"; + sha256 = "f20f7e9922ee789c4b71379676ebfe656b675913fe524f2ee722e1b9ef4e5197"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix index 61593b625f7..f6265505584 100644 --- a/pkgs/development/python-modules/exifread/default.nix +++ b/pkgs/development/python-modules/exifread/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ExifRead"; - version = "2.1.2"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1b90jf6m9vxh9nanhpyvqdq7hmfx5iggw1l8kq10jrs6xgr49qkr"; + sha256 = "269ff3a8eab8e082734a076182cce6fb126116619c0b7c2009bea34502cca213"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix index 7981428c42a..ad3e42876d0 100644 --- a/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/pkgs/development/python-modules/flask-httpauth/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { description = "Extension that provides HTTP authentication for Flask routes"; homepage = "https://github.com/miguelgrinberg/Flask-HTTPAuth"; license = licenses.mit; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix index e8e34f89c43..ca05660feb3 100644 --- a/pkgs/development/python-modules/fpdf/default.nix +++ b/pkgs/development/python-modules/fpdf/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { homepage = "https://github.com/reingart/pyfpdf"; description = "Simple PDF generation for Python"; license = lib.licenses.lgpl3; - maintainers = with lib.maintainers; [ geistesk ]; + maintainers = with lib.maintainers; [ oxzi ]; }; } diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index 5d0fa902416..b762434fb65 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { homepage = "https://github.com/frewsxcv/python-geojson"; description = "Python bindings and utilities for GeoJSON"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ geistesk ]; + maintainers = with lib.maintainers; [ oxzi ]; }; } diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 4cb2d1f9b67..5c9c644abd3 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , requests +, google_auth }: buildPythonPackage rec { @@ -19,6 +20,8 @@ buildPythonPackage rec { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; license = licenses.mit; + # missing multiple google libraries + broken = true; # 2020-08-15 }; # No tests included diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index b6fe06610b3..d19d05276e2 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -1,43 +1,60 @@ -{ stdenv -, buildPythonPackage -, pkgs -, python -, pygobject3 +{ stdenv, fetchFromGitHub, makeWrapper +, glibcLocales, gobject-introspection, gtk3, libsoup, libsecret +, buildPythonPackage, python +, pygobject3, freezegun, mock }: buildPythonPackage rec { pname = "gtimelog"; - version = "0.9.1"; + version = "unstable-2020-05-16"; - src = pkgs.fetchurl { - url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz"; - sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "80682ddbf9e0d68b8c67257289784f3b49b543d8"; + sha256 = "0qv2kv7vc3qqlzxsisgg31cmrkkqgnmxspbj10c5fhdmwzzwi0i9"; }; - buildInputs = [ pkgs.glibcLocales ]; + buildInputs = [ + makeWrapper + glibcLocales gobject-introspection gtk3 libsoup libsecret + ]; - LC_ALL="en_US.UTF-8"; - - # TODO: AppIndicator - propagatedBuildInputs = [ pkgs.gobject-introspection pygobject3 pkgs.makeWrapper pkgs.gtk3 ]; + propagatedBuildInputs = [ + pygobject3 freezegun mock + ]; checkPhase = '' - substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}" + substituteInPlace runtests --replace "/usr/bin/env python3" "${python.interpreter}" ./runtests ''; + pythonImportsCheck = [ "gtimelog" ]; + preFixup = '' - wrapProgram $out/bin/gtimelog \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3.out}/lib" \ + wrapProgram $out/bin/gtimelog \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH ":" "${gtk3.out}/lib" \ ''; meta = with stdenv.lib; { - description = "A small GTK app for keeping track of your time. It's main goal is to be as unintrusive as possible"; - homepage = "https://mg.pov.lt/gtimelog/"; + description = "A time tracking app"; + longDescription = '' + GTimeLog is a small time tracking application for GNOME. + It's main goal is to be as unintrusive as possible. + + To run gtimelog successfully on a system that does not have full GNOME 3 + installed, the following NixOS options should be set: + - programs.dconf.enable = true; + - services.gnome3.gnome-keyring.enable = true; + + In addition, the following packages should be added to the environment: + - gnome3.adwaita-icon-theme + - gnome3.dconf + ''; + homepage = "https://gtimelog.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ocharles oxzi ]; platforms = platforms.unix; }; - } diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 9185c294006..c101ae8e2e1 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "1.1.5"; + version = "1.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3398e401b95da868bc96bdaa44fa61252bf3e68fc9dd1645bd93293cce095f6c"; + sha256 = "132xby7531rbrjg9bqvsx86birr1blynjxy8gi5kcnb6x7fxjcal"; }; checkInputs = [ requests pytest ]; diff --git a/pkgs/development/python-modules/mathics/default.nix b/pkgs/development/python-modules/mathics/default.nix deleted file mode 100644 index 0bd81f00848..00000000000 --- a/pkgs/development/python-modules/mathics/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, django -, python -, cython -, sympy -, ply -, mpmath -, dateutil -, colorama -, six -, pexpect -}: - -if (stdenv.lib.versionOlder django.version "1.8") || - (stdenv.lib.versionAtLeast django.version "1.9") - then throw "mathics only supports django-1.8.x" - else buildPythonPackage rec { - pname = "mathics"; - version = "0.9"; - - src = fetchFromGitHub { - owner = "mathics"; - repo = "Mathics"; - rev = "v${version}"; - sha256 = "0xzz7j8xskj5y6as178mjmm0i2xbhd4q4mwmdnvghpd2aqq3qx1c"; - }; - - buildInputs = [ pexpect ]; - - prePatch = '' - substituteInPlace setup.py --replace "sympy==0.7.6" "sympy" - ''; - - postFixup = '' - wrapPythonProgramsIn $out/bin $out - patchPythonScript $out/${python.sitePackages}/mathics/manage.py - ''; - - propagatedBuildInputs = [ cython sympy django ply mpmath dateutil colorama six ]; - - meta = with stdenv.lib; { - description = "A general-purpose computer algebra system"; - homepage = "http://www.mathics.org"; - license = licenses.gpl3; - maintainers = [ maintainers.benley ]; - }; - -} diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 4687b97284f..4d65d7fce43 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -66,5 +66,7 @@ buildPythonPackage rec { description = "Open source platform for the machine learning lifecycle"; license = licenses.asl20; maintainers = with maintainers; [ tbenst ]; + # missing prometheus-flask-exporter, not packaged in nixpkgs + broken = true; # 2020-08-15 }; } diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index b3e1f9e6011..70b982ef4b8 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, pythonOlder , python , subunit , testrepository @@ -14,6 +15,7 @@ buildPythonPackage rec { pname = "mox3"; version = "1.1.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix new file mode 100644 index 00000000000..c2f484cb3a9 --- /dev/null +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -0,0 +1,49 @@ +{ blinker, buildPythonPackage, fetchFromGitHub, lib, isPy27, six, mock, pytest +, webtest, pytestcov, pytest-django, pytest-pythonpath, flake8, sqlalchemy +, flask_sqlalchemy, peewee }: + +buildPythonPackage rec { + pname = "nplusone"; + version = "1.0.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "jmcarp"; + repo = "nplusone"; + rev = "v${version}"; + sha256 = "0qdwpvvg7dzmksz3vqkvb27n52lq5sa8i06m7idnj5xk2dgjkdxg"; + }; + + # The tests assume the source code is in an nplusone/ directory. When using + # the Nix sandbox, it will be in a source/ directory instead, making the + # tests fail. + prePatch = '' + substituteInPlace tests/conftest.py \ + --replace nplusone/tests/conftest source/tests/conftest + ''; + + checkPhase = '' + pytest tests/ + ''; + + propagatedBuildInputs = [ six blinker ]; + checkInputs = [ + mock + pytest + webtest + pytestcov + pytest-django + pytest-pythonpath + flake8 + sqlalchemy + flask_sqlalchemy + peewee + ]; + + meta = with lib; { + description = "Detecting the n+1 queries problem in Python"; + homepage = "https://github.com/jmcarp/nplusone"; + maintainers = with maintainers; [ cript0nauta ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index cba755020de..718dc48d005 100644 --- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -10,11 +10,11 @@ with lib; buildPythonPackage rec { pname = "openwrt-luci-rpc"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "144bw7w1xvpdkad5phflpkl15ih5pvi19799wmvfv8mj1dn1yjhp"; + sha256 = "c8c27c98c0a1deac2d32d417c4ca536b08be2655a9a6de8a7897e8bc6431858c"; }; postPatch = '' diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 16997d66781..88189493a62 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -30,7 +30,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "osqp" ]; checkInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; # don't run checks twice - disabledTests = [ "mkl_" ]; + disabledTests = [ + "mkl_" + "update_matrices_tests" # broken w/ scipy >= 1.5.0. Remove next release. See https://github.com/oxfordcontrol/osqp-python/issues/44 + ]; meta = with lib; { description = "The Operator Splitting QP Solver"; diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index 969c80f1fe1..b309fb287d8 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -5,6 +5,7 @@ , pytest , pytest-pylint , nbconvert +, joblib , jupyter_client , numpy , scipy @@ -33,6 +34,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + joblib numpy scipy pandas diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 496dc2d2aaa..47fd2b33458 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, appdirs, docopt, jedi -, pygments, isPy3k }: +{ stdenv, lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi +, pygments, importlib-metadata, isPy3k }: buildPythonPackage rec { pname = "ptpython"; @@ -11,7 +11,8 @@ buildPythonPackage rec { sha256 = "9ac4e4047ca3a03133702a353a93cf56ca1ec1162bc7ecaff087a91c03e3827b"; }; - propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ]; + propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # no tests to run doCheck = false; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index e308ecca676..f9d97c21105 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, numpy, pandas, pytz, six -, pytest, mock, pytest-mock, requests }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six +, pytestCheckHook, flaky, mock, pytest-mock, requests }: buildPythonPackage rec { pname = "pvlib"; @@ -13,17 +13,37 @@ buildPythonPackage rec { sha256 = "40708492ed0a41e900d36933b9b9ab7b575c72ebf3eee81293c626e301aa7ea1"; }; - checkInputs = [ pytest mock pytest-mock ]; + patches = [ + # enable later pandas versions, remove next bump + (fetchpatch { + url = "https://github.com/pvlib/pvlib-python/commit/010a2adc9e9ef6fe9f2aea4c02d7e6ede9f96a53.patch"; + sha256 = "0jibn4khixz6hv6racmp86m5mcms0ysz1y5bgpplw1kcvf8sn04x"; + excludes = [ + "pvlib/tests/test_inverter.py" + "docs/sphinx/source/whatsnew/v0.8.0.rst" + "ci/requirements-py35-min.yml" + ]; + }) + ]; + + checkInputs = [ pytestCheckHook flaky mock pytest-mock ]; propagatedBuildInputs = [ numpy pandas pytz six requests ]; # Skip a few tests that try to access some URLs - checkPhase = '' - runHook preCheck - pushd pvlib/tests - pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata and not test_get_psm3 and not test_pvgis" - popd - runHook postCheck - ''; + pytestFlagsArray = [ "pvlib/tests" ]; + disabledTests = [ + "read_srml_dt_index" + "read_srml_month_from_solardata" + "get_psm3" + "pvgis" + "read_surfrad_network" + "remote" + # small rounding errors, E.g <1e-10^5 + "calcparams_pvsyst" + "martin_ruiz_diffuse" + "hsu" + "backtrack" + ]; meta = with stdenv.lib; { homepage = "https://pvlib-python.readthedocs.io"; diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix index 2b00dd7951d..8c909b868b3 100644 --- a/pkgs/development/python-modules/pymystem3/default.nix +++ b/pkgs/development/python-modules/pymystem3/default.nix @@ -1,6 +1,7 @@ { lib , fetchPypi , buildPythonPackage +, isPy3k , requests , flake8 , mock @@ -19,6 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; checkInputs = [ flake8 mock pytest ]; + doCheck = isPy3k; # fails on linting postPatch = '' sed -i 's#^_mystem_info = .*#_mystem_info = ["${mystem}/bin", "${mystem}/bin/mystem"]#' pymystem3/constants.py diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index 71d874740c5..de208c7a9db 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { homepage = "https://github.com/Knio/pynmea2"; description = "Python library for the NMEA 0183 protcol"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ geistesk ]; + maintainers = with lib.maintainers; [ oxzi ]; }; } diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix index 06a669e3f4f..08c90d82898 100644 --- a/pkgs/development/python-modules/pypcap/default.nix +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://github.com/pynetwork/pypcap"; description = "Simplified object-oriented Python wrapper for libpcap"; license = licenses.bsd3; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/development/python-modules/pytest-pythonpath/default.nix b/pkgs/development/python-modules/pytest-pythonpath/default.nix new file mode 100644 index 00000000000..4194b7bd0e9 --- /dev/null +++ b/pkgs/development/python-modules/pytest-pythonpath/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage, fetchPypi, lib, pytest }: + +buildPythonPackage rec { + pname = "pytest-pythonpath"; + version = "0.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qhxh0z2b3p52v3i0za9mrmjnb1nlvvyi2g23rf88b3xrrm59z33"; + }; + + propagatedBuildInputs = [ pytest ]; + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = + "Pytest plugin for adding to the PYTHONPATH from command line or configs"; + homepage = "https://github.com/bigsassy/pytest-pythonpath"; + maintainers = with maintainers; [ cript0nauta ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 0748da14d93..ec78329ff8d 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -15,5 +15,6 @@ buildPythonPackage rec { license = licenses.asl20; homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; description = "pytest plugin to generate random data inspired by QuickCheck"; + broken = true; # missing pytest-codestyle }; } diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 3b649bea57d..9d9add16782 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , coverage , pytest }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "pytest-testmon"; version = "1.0.2"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index 12a327be2a6..d67ec59f3ac 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "python-igraph"; version = "0.8.2"; + disabled = !isPy3k; # fails to build nativeBuildInputs = [ pkgconfig ]; buildInputs = [ igraph ]; diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix index 9b1e3a10692..aa6eecfdeb5 100644 --- a/pkgs/development/python-modules/pytmx/default.nix +++ b/pkgs/development/python-modules/pytmx/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { homepage = "https://github.com/bitcraft/PyTMX"; description = "Python library to read Tiled Map Editor's TMX maps"; license = licenses.lgpl3; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index 0b0bad801e1..8317c5ea018 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , requests , lxml , pandas @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "pytrends"; version = "4.7.3"; + disabled = isPy27; # python2 pandas is too old src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 4a11abfcaa4..11fe52d553a 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , setuptools_scm , six , pytest @@ -9,6 +10,7 @@ buildPythonPackage rec { version = "0.2.3"; pname = "pyvcd"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index f1239b75d48..64de384dcb1 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, six }: buildPythonPackage rec { @@ -12,7 +13,10 @@ buildPythonPackage rec { sha256 = "945b5efdc10f468fc056bd53a4e4224ec4c2fe1a7e83ae47443bbb6e7c7a1f7d"; }; + propagatedBuildInputs = [ six ]; + doCheck = false; + pythonImportsCheck = [ "rethinkdb" ]; meta = with stdenv.lib; { description = "Python driver library for the RethinkDB database server"; diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index c59fac9c48c..23d8444c506 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchPypi, buildPythonPackage, click, redis }: +{ stdenv, fetchPypi, buildPythonPackage, isPy27, click, redis }: buildPythonPackage rec { pname = "rq"; version = "1.4.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index 6aaabaf19d9..f62af59c4ed 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -1,12 +1,14 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , setuptools_scm }: buildPythonPackage rec { pname = "sorl-thumbnail"; version = "12.6.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index f90ed55ee34..95aa0c5fdeb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,11 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 }: buildPythonPackage rec { pname = "sphinxcontrib-applehelp"; version = "1.0.2"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 859181d675f..8eec8ab3267 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,11 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 }: buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; version = "1.0.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index 6c860cafa59..9b1d93287b0 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -1,11 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 }: buildPythonPackage rec { pname = "sphinxcontrib-jsmath"; version = "1.0.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 60b8a06510f..f8e826adf1f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,11 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 }: buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; version = "1.0.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 5a5c0e3df6f..05f2749c49d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,11 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 }: buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; version = "1.1.4"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 7517be4dd54..51edec4dc89 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, pbr, setuptools, six }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pbr, setuptools, six }: buildPythonPackage rec { pname = "stevedore"; version = "2.0.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 0bdb109ce90..88feccc86c0 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "streamz"; - version = "0.5.4"; + version = "0.5.5"; src = fetchPypi { inherit pname version; - sha256 = "1vzmwnj12ij0cqhggys2dqv3b0v935yfzhcjwl5jw206vlla22bw"; + sha256 = "0r83z3233pfwjw31bkmdldjqlx533f27iimayadfgcn5jr3xwykq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index 2e4b416f047..e2d8e12fd45 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -1,17 +1,19 @@ { buildPythonPackage , lib , fetchPypi +, isPy27 , ruamel_yaml , python-dateutil }: buildPythonPackage rec { - version = "1.0.6"; + version = "1.1.0"; pname = "strictyaml"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "dd687a32577e0b832619ce0552eac86d6afad5fa7b61ab041bb765881c6a1f36"; + sha256 = "1jj20fwcpvqzp7rnzk3mc3xm94wz3gy3zi3787nj7c3syzadn1vb"; }; propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; @@ -19,6 +21,7 @@ buildPythonPackage rec { # Library tested with external tool # https://hitchdev.com/approach/contributing-to-hitch-libraries/ doCheck = false; + pythonImportsCheck = [ "strictyaml" ]; meta = with lib; { description = "Strict, typed YAML parser"; diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix new file mode 100644 index 00000000000..c986b9108b0 --- /dev/null +++ b/pkgs/development/python-modules/svglib/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, cssselect2 +, lxml +, pillow +, pytest +, reportlab +, tinycss2 +}: + +buildPythonPackage rec { + pname = "svglib"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b17d4a6352f6c25ca3718d2b66a2f1ecfcdf558b1f6646c37f5c191b655979f1"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ + cssselect2 + lxml + pillow + reportlab + tinycss2 + ]; + + checkInputs = [ + pytest + ]; + + # Ignore tests that require network access (TestWikipediaFlags and TestW3CSVG), and tests that + # require files missing in the 1.0.0 PyPI release (TestOtherFiles). + checkPhase = '' + py.test svglib tests -k 'not TestWikipediaFlags and not TestW3CSVG and not TestOtherFiles' + ''; + + meta = with lib; { + homepage = "https://github.com/deeplook/svglib"; + description = "A pure-Python library for reading and converting SVG"; + license = licenses.lgpl3; + maintainers = with maintainers; [ trepetti ]; + }; +} diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index e7cbb7848f4..86d1cdc8873 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tblib"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "229bee3754cb5d98b4837dd5c4405e80cfab57cb9f93220410ad367f8b352344"; + sha256 = "0b48bx1h720rmmd9nmw50y5cq9vhdppnl0bn9yfl2yza0rrxg6q5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix index 29db9a702b0..dc525901775 100644 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tvnamer"; - version = "2.5.1"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "ba181a947dcfe20c860825b3580d2a6f1a896cf9b5fef093b8c3f00640581a1f"; + sha256 = "0szg3k9zcnba7a8fw1fz3hr72lwlysfbm7hkabkaik69vra77bh0"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix index 8ef694d34ff..636e19b39ba 100644 --- a/pkgs/development/python-modules/txdbus/default.nix +++ b/pkgs/development/python-modules/txdbus/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = "https://github.com/cocagne/txdbus"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 424f4d08fe0..b06f41ce5a3 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -6,6 +6,7 @@ , libuv , psutil , isPy27 +, pythonAtLeast , CoreServices , ApplicationServices # Check Inputs @@ -44,14 +45,11 @@ buildPythonPackage rec { "--tb=native" # ignore code linting tests "--ignore=tests/test_sourcecode.py" - # Fails on Python 3.8 - # https://salsa.debian.org/python-team/modules/uvloop/-/commit/302a7e8f5a2869e13d0550cd37e7a8f480e79869 - "--ignore=tests/test_tcp.py" ]; disabledTests = [ "test_sock_cancel_add_reader_race" # asyncio version of test is supposed to be skipped but skip doesn't happen. uvloop version runs fine - ]; + ] ++ lib.optionals (pythonAtLeast "3.8") [ "test_write_to_closed_transport" ]; # https://github.com/MagicStack/uvloop/issues/355 # force using installed/compiled uvloop vs source by moving tests to temp dir preCheck = '' diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 8817b057cc9..06f0d55acf0 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , pytest , pytestcov }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "venusian"; version = "3.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/pkgs/development/python-modules/wsproto/0.14.nix index 79a66d2e4b1..a8488d8c4ab 100644 --- a/pkgs/development/python-modules/wsproto/0.14.nix +++ b/pkgs/development/python-modules/wsproto/0.14.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wsproto"; - version = "0.15.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "614798c30e5dc2b3f65acc03d2d50842b97621487350ce79a80a711229edfa9d"; + sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; }; propagatedBuildInputs = [ h11 enum34 ]; diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 72b524d999e..ac2a323aed5 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.2.2"; + version = "1.2.3"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "04rlcm5777cv7aw9mf0z1xrj8cn2rljfzs9i2za6sdk6h1ngpj3q"; + sha256 = "1lasi84d5v66xpd40fbj3lqwc5hfh3izxrr2wbfdbj4a3m996zc9"; }; propagatedBuildInputs = [ elementpath ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "elementpath~=1.4.0" "elementpath~=1.4" + --replace "elementpath~=2.0.0" "elementpath~=2.0" ''; # Ignore broken fixtures, and tests for files which don't exist. diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 5bb1abd98ce..e0be34a2d31 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, isPy27, nose }: buildPythonPackage rec { pname = "yappi"; version = "1.2.5"; + disabled = isPy27; # invalid syntax src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index e2c174783d4..cbc736e1a26 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -45,6 +45,5 @@ rustPlatform.buildRustPackage rec { ''; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ leenaars ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix index dad1e2f6574..e63f9a18a63 100644 --- a/pkgs/development/tools/async/default.nix +++ b/pkgs/development/tools/async/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ctbur/async"; license = licenses.gpl3Plus; maintainers = with maintainers; [ minijackson ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 3f43cad17c4..49f8435b377 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, coreutils, makeWrapper }: -let version = "1.9.6"; in +let version = "1.9.15"; in stdenv.mkDerivation { pname = "ant"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4"; + sha256 = "0yfx5qsvrg12lar4908ndbnlpppy7g7qk8ay41y4sz9g873v07mr"; }; contrib = fetchurl { diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index f06467867ce..b0411090fbe 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, coreutils, makeWrapper }: -let version = "1.10.2"; in +let version = "1.10.8"; in stdenv.mkDerivation { pname = "ant"; @@ -10,12 +10,12 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "0662qammjvibh9kgkxzadkayfn2r7iwnagbwaw28crqqclrb2rp1"; + sha256 = "0zh94csb2hl6ir2ccn18ps506mjgh3mffnrb8wpsmp1x5fcykha5"; }; contrib = fetchurl { url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2"; - sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1"; + sha256 = "1l8say86bz9gxp4yy777z7nm4j6m905pg342li1aphc14p5grvwn"; }; installPhase = diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 83182983455..dd9bc4016f5 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -24,6 +24,5 @@ buildGoPackage rec { homepage = "https://github.com/bazelbuild/buildtools"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog uri-canva marsam ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 1d5ef75fb22..73e9bc7b560 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,15 +51,15 @@ rec { }; }; - gradle_latest = gradle_6_5; + gradle_latest = gradle_6_6; - gradle_6_5 = gradleGen rec { - name = "gradle-6.5.1"; - nativeVersion = "0.22-milestone-3"; + gradle_6_6 = gradleGen rec { + name = "gradle-6.6"; + nativeVersion = "0.22-milestone-4"; src = fetchurl { url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh"; + sha256 = "09a0fnz6fn8yaxm3q3iwyjm3nnaz7k8i1xlpc7sm414py043by76"; }; }; diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index 733daf0d72d..6c9d8bfc838 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -27,6 +27,5 @@ buildGoModule rec { homepage = "https://magefile.org/"; license = licenses.asl20; maintainers = with maintainers; [ swdunlop ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index 08b248dd0f6..feaa3c312f4 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -32,6 +32,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ferrous-systems/flamegraph"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ killercup ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index 4e6f8fbc71a..3008c15d848 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -23,6 +23,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/koute/cargo-web"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kevincox ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index c7a8483719f..564c5dcbcb5 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -39,6 +39,5 @@ buildRustPackage rec { homepage = "https://github.com/peterheesterman/chit"; license = licenses.mit; maintainers = [ maintainers.lilyball ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index b50e886167b..2f661dd44ae 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "0d6n51p4b8jwkfqympwxkqxssgy462m5pgv5qvm6jy5pm566qa08"; + sha256 = "0v9cya3x0v1fqpqswayskmm0xzbvfn4hbhz2k6b3j6fzcq2dnzj3"; }; - vendorSha256 = "150fj2c9qll39wiqk41w0qms0sdqiacb2z015j38kg60r8f6i4lm"; + vendorSha256 = "1nxl00f8dbdiykwa54qm9r0cv16zcab880ay8mlmxba7srysvb1y"; doCheck = false; @@ -25,6 +25,5 @@ buildGoModule rec { inherit (src.meta) homepage; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix index 2dcc68a09f2..a1549de1843 100644 --- a/pkgs/development/tools/corgi/default.nix +++ b/pkgs/development/tools/corgi/default.nix @@ -23,7 +23,6 @@ buildGoPackage rec { ''; homepage = "https://github.com/DrakeW/corgi"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ kalbasit ]; }; } diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix new file mode 100644 index 00000000000..ef61edcbb8d --- /dev/null +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule, fetchFromGitHub, stdenv }: + +let + pname = "dapr"; + version = "0.9.0"; + sha256 = "1vdbh5pg3j7kqqqhhf4d9xfzbpqmjc4x373sk43pb05prg4w71s7"; + vendorSha256 = "19qcpd5i60xmsr8m8mx16imm5falkqcgqpwpx3clfvqxjyflglpp"; +in buildGoModule { + inherit pname version vendorSha256; + + src = fetchFromGitHub { + inherit sha256; + + owner = "dapr"; + repo = "cli"; + rev = "v${version}"; + }; + + doCheck = false; + + postInstall = '' + mv $out/bin/cli $out/bin/dapr + ''; + + meta = with stdenv.lib; { + homepage = "https://dapr.io"; + description = "A CLI for managing Dapr, the distributed application runtime"; + license = licenses.mit; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index 8d7f3b213ca..8b7c54832e2 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -21,7 +21,6 @@ buildGoPackage rec { homepage = "https://github.com/golang/dep"; description = "Go dependency management tool"; license = licenses.bsd3; - platforms = platforms.all; maintainers = with maintainers; [ carlsverre rvolosatovs ]; }; } diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix index 1e48ecde763..cd2f401ed25 100644 --- a/pkgs/development/tools/devd/default.nix +++ b/pkgs/development/tools/devd/default.nix @@ -17,6 +17,5 @@ buildGoPackage rec { homepage = "https://github.com/cortesi/devd"; license = licenses.mit; maintainers = with maintainers; [ brianhicks ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 6eac1af512b..6a447dd57c9 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec { description = "Database tool for working with Rust projects that use Diesel"; homepage = "https://github.com/diesel-rs/diesel/tree/master/diesel_cli"; license = with licenses; [ mit asl20 ]; - platforms = platforms.all; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 2baec1ec16a..45795b67ea4 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -39,7 +39,6 @@ buildGoModule rec { description = "A command line tool for DigitalOcean services"; homepage = "https://github.com/digitalocean/doctl"; license = licenses.asl20; - platforms = platforms.all; maintainers = [ maintainers.siddharthist ]; }; } diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 3a33925a86f..5ab74a4b95f 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -18,6 +18,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/zimbatm/mdsh"; license = with licenses; [ mit ]; maintainers = with maintainers; [ zimbatm ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 4f3d89c0788..f7bd4d2037d 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -13,13 +13,10 @@ buildGoPackage { sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk"; }; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/mailru/easyjson"; description = "Fast JSON serializer for golang"; license = licenses.mit; maintainers = with maintainers; [ chiiruno ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index be38e1fdf44..78db979299c 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.5.3"; + version = "6.5.4"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1gxa9gg7di79kl6aayryhrkm3nzn3sc7hg2x1ldy1q72x6wz41sc"; + sha256 = "1ga4qhydswalz02hz32p764zipn1lw63nhqlwqq96vjj9cwj1wii"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix index 284579fd362..2217ea591ff 100644 --- a/pkgs/development/tools/gdm/default.nix +++ b/pkgs/development/tools/gdm/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { description = "Minimalist dependency manager for Go written in Go."; homepage = "https://github.com/sparrc/gdm"; license = licenses.unlicense; - platforms = platforms.all; maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 49e1e6bbe8b..02a3c13afb3 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -18,6 +18,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/gtk-rs/gir/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ekleog ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 3138c4e2ce6..7c4213b4cc0 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -18,6 +18,5 @@ buildGoPackage rec { description = "Whole Program LLVM: wllvm ported to go"; license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix index ffdb2a092a0..30344a52e06 100644 --- a/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -16,7 +16,6 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Serve embedded files from jteeuwen/go-bindata"; license = licenses.bsd2; - platforms = platforms.all; maintainers = with maintainers; [ avnik ]; }; } diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 9db1501f940..9256fab43bf 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -20,6 +20,5 @@ buildGoPackage { description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; maintainers = with maintainers; [ cstrahan ]; license = licenses.cc0; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix index 3c6cf7e3d83..96ebce0eaca 100644 --- a/pkgs/development/tools/go-junit-report/default.nix +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -19,6 +19,5 @@ buildGoPackage rec { homepage = "https://${goPackagePath}"; maintainers = with maintainers; [ cryptix ]; license = licenses.mit; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 57eca473b60..c196f167ce0 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -29,7 +29,6 @@ buildGoModule rec { homepage = "https://taskfile.dev/"; description = "A task runner / simpler Make alternative written in Go"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ parasrah ]; }; } diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 603568236e6..32b6e8296a7 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -44,7 +44,6 @@ buildGoPackage rec { ''; homepage = "https://github.com/stamblerre/gocode"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ kalbasit rvolosatovs ]; }; } diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index b4e9a8d43cb..f38d06b34c6 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -39,7 +39,6 @@ buildGoPackage rec { ''; homepage = "https://github.com/mdempsky/gocode"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ kalbasit ]; }; } diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index b39ba83aab8..cddd16f945f 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.28.3"; + version = "1.30.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "0bjjdr8nxbn2h23x62sywbiv5y4rpk3xg7lk6lkbvmn7625brfvx"; + sha256 = "1a2dmjg7mlm908zlh5vibqv17dpn6hvdn8rx14pdm9kw1q51iish"; }; - vendorSha256 = "15wl6xblwyqs7pbbi2yy3y0ysj0k34qf05jfh69k9i9xf9k8hp6a"; + vendorSha256 = "0y18ws2lc9bynb8fi8q6kcc1ngvzyfxlmpqn7gc0hvj3ribdpwrd"; doCheck = false; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index da8d5fb286b..284bb32f89e 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -25,6 +25,5 @@ buildGoPackage rec { description = "Linter for Go source code"; license = licenses.bsd3; maintainers = with maintainers; [ jhillyerd ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 7c800df0a6b..34e7d338318 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -16,7 +16,6 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/mitchellh/gox"; description = "A dead simple, no frills Go cross compile tool"; - platforms = platforms.all; license = licenses.mpl20; }; } diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 52a407b3878..0044426b4d4 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -30,7 +30,6 @@ buildGoModule rec { description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; homepage = "https://github.com/hetznercloud/cli"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; }; } diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index e031159d37c..e6eef68ec6c 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/pkgs/development/tools/jid/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { description = "A command-line tool to incrementally drill down JSON"; homepage = "https://github.com/simeji/jid"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ stesie ]; }; } diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index ce621f147d1..ebf44d9d699 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -47,6 +47,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/casey/just"; license = licenses.cc0; maintainers = with maintainers; [ xrelkd ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index f91d95ce508..51369bc1f91 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -27,6 +27,5 @@ buildGoModule rec { homepage = "https://github.com/jlesquembre/kubeprompt"; license = licenses.epl20; maintainers = with maintainers; [ jlesquembre ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 94560ea0ca9..881516cf25e 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.8599"; + version = "0.1.9321"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1brv38mzc2i6mg4rk9ichjsv5w0gr6xrf6qmhnal12cll2krn9k3"; + sha256 = "0n0is4aradlx0jbzs819swidi2x1gnpca9f2b0lkxrxgqcm7viix"; }; - vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; + vendorSha256 = "1zd95n9k2fags0qh3wvjinxv1ahygr958mmiax2kz117yipaz4rb"; doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version} -X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev} -X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; preBuild = '' substituteInPlace data/data.go \ diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index b585d27b710..6cd439a898b 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nlewo/hydra-cli"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gilligan lewo ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 8185b14cd73..8b734bdd1c1 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -31,6 +31,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://texlab.netlify.com/"; license = licenses.mit; maintainers = with maintainers; [ doronbehar metadark ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index fe54aff87c5..baf14b933dc 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -28,6 +28,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/XAMPPRocky/tokei"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner lilyball ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix index 106f23ac3f1..a9172d79277 100644 --- a/pkgs/development/tools/modd/default.nix +++ b/pkgs/development/tools/modd/default.nix @@ -17,6 +17,5 @@ buildGoPackage rec { homepage = "https://github.com/cortesi/modd"; license = licenses.mit; maintainers = with maintainers; [ kierdavis ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 973f777d8cb..3c51779c566 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.35.1"; + version = "1.35.2"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0gx87qc9r3lhqn6q95y74z67sjcxnazkkdi9zswmaqyvjn8x7vf4"; + sha256 = "0k4crybddqpcg1vi1ax1s85w4hlknz6kaqn4cvv279dkm9aqxbp8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 44a3d145f06..c91727d6f11 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -23,6 +23,5 @@ buildGoPackage rec { homepage = "https://www.openpolicyagent.org"; license = licenses.asl20; maintainers = with maintainers; [ lewo ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix index a00d33e2a32..f7bcc8bf8f4 100644 --- a/pkgs/development/tools/packet-cli/default.nix +++ b/pkgs/development/tools/packet-cli/default.nix @@ -24,6 +24,5 @@ buildGoModule rec { homepage = "https://github.com/packethost/packet-cli"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index d016d21b738..f1627c7ed39 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -32,6 +32,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/eraserhd/parinfer-rust"; license = licenses.isc; maintainers = with maintainers; [ eraserhd ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index e77b338a20a..51af3acdacd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -90,7 +90,6 @@ in rustPlatform.buildRustPackage { * Robust enough to provide useful results even in the presence of syntax errors * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application ''; - platforms = lib.platforms.all; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Profpatsch ]; # Darwin needs some more work with default libraries diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index d9433f535da..8f75540f3a6 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -13,13 +13,10 @@ buildGoPackage { sha256 = "1pimf5bwivklsr438if6l8by34gr48a05gl6hq07cvc8z6wl01m2"; }; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/valyala/quicktemplate"; description = "Fast, powerful, yet easy to use template engine for Go"; license = licenses.mit; maintainers = with maintainers; [ chiiruno ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index edd24a8aaa2..68d3bfce06b 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -26,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dflemstr/rq"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ aristid filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 2ca4b8070aa..cc1bf1c7476 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; - version = "0.53.2"; + version = "0.54.1"; RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update @@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = pname; rev = "v${version}"; - sha256 = "01dkaa2akqrhpxxf0g2zyfdb3nx16y14qsg0a9d5n92c4yyvmwjg"; + sha256 = "116np72w6agsi94xa1bdn6h7sa9gd522h358zlixk9xrhrx7yfn3"; }; - cargoSha256 = "0pm9kh3qrcv5jsbrr476982lg1j31fbvxpzs4gphxl0mv1qmp4zm"; + cargoSha256 = "12a7bd2579jcnkss073v5w5w68fxwvhq6c6ndjy8vp78wg83qich"; libclang = llvmPackages.libclang.lib; #for substituteAll @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "C and C++ binding generator"; + description = "Automatically generates Rust FFI bindings to C (and some C++) libraries."; longDescription = '' Bindgen takes a c or c++ header file and turns them into rust ffi declarations. @@ -61,6 +61,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-lang/rust-bindgen"; license = with licenses; [ bsd3 ]; platforms = platforms.unix; - maintainers = [ maintainers.ralith ]; + maintainers = with maintainers; [ johntitor ralith ]; }; } diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index d8aca4045bf..76b49056a3f 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/gnzlbg/cargo-asm"; license = licenses.mit; maintainers = [ maintainers.danieldk ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index bd2d370d1c8..44ebcc63c87 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -1,5 +1,6 @@ { rustPlatform, stdenv, lib, fetchFromGitHub, fetchurl , pkg-config, openssl +, CoreFoundation, libiconv, Security }: rustPlatform.buildRustPackage rec { @@ -30,7 +31,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1gwyszpcmss2d0lm5hvf3b48jy7b0fm7xizhrl3wd6rzw7pg06zd"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; meta = with lib; { description = "A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries"; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 93121a11eea..c32a87e7839 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec { "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; homepage = "https://github.com/dtolnay/cargo-expand"; license = with licenses; [ mit asl20 ]; - platforms = platforms.all; maintainers = with maintainers; [ xrelkd ]; }; } diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix new file mode 100644 index 00000000000..06f99268d0b --- /dev/null +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkg-config, rustPlatform, Security, curl, openssl, libiconv }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-fund"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "acfoltzer"; + repo = pname; + rev = version; + sha256 = "1jim5bgq3fc33391qpa1q1csbzqf4hk1qyfzwxpcs5pb4ixb6vgk"; + }; + + cargoSha256 = "181gcmaw2w5a6ah8a2ahsnc1zkadpmx1azkwh2a6x8myhzw2dxsj"; + + # The tests need a GitHub API token. + doCheck = false; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + + meta = with stdenv.lib; { + description = "Discover funding links for your project's dependencies"; + homepage = "https://github.com/acfoltzer/cargo-fund"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ johntitor ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index ea51cef24bd..ecdd2409abd 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -18,6 +18,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-fuzz/cargo-fuzz"; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.ekleog ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 09956976fb6..d30c3ad6292 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -50,6 +50,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-secure-code/cargo-geiger"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ evanjs ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 360cb469e6c..5a262762027 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -29,6 +29,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ashleygwilliams/cargo-generate"; license = licenses.asl20; maintainers = [ maintainers.turbomack ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index 8626ae243b8..5a8c9150279 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec { description = "See what Rust is doing behind the curtains"; homepage = "https://github.com/mre/cargo-inspect"; license = with licenses; [ mit asl20 ]; - platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; }; } diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index bffa9186fd5..2e502251a6b 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -39,6 +39,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sagiegurari/cargo-make"; license = licenses.asl20; maintainers = with maintainers; [ xrelkd ma27 ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 96b4cd078bc..8df03a4bd15 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -26,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/google/cargo-raze"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 2dfbfeeb179..72883ab4508 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; homepage = "https://github.com/holmgr/cargo-sweep"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ xrelkd ]; }; } diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 97f49631cd0..40e172972b7 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -26,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/est31/cargo-udeps"; license = licenses.mit; maintainers = with maintainers; [ b4dm4n ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 91f25923609..8bd4bf6fff8 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec { description = "A Cargo subcommand for watching over Cargo project's source"; homepage = "https://github.com/passcod/cargo-watch"; license = licenses.cc0; - platforms = platforms.all; maintainers = with maintainers; [ xrelkd ivan ]; }; } diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 6af944e9c5d..912f5199b4c 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,22 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.29"; + version = "0.6.0"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "05wg1xx2mcwb9cplmrpg13jimddlzmv7hf5g3vjppjp8kz2gb7zj"; + sha256 = "0kmnwx2fg4nq009dzwk840z8n4rayvpk6hjpryczv56sjdcqm2zv"; }; - cargoSha256 = "1s2xsfld29shvjzyp16y263hnbqxrq8i2557y0g09xmfm5x0jhix"; + cargoSha256 = "0vnhaf7b2ai151wjadgj7pm5hdcj7rv1ckj5mjn74r3vvds2jdn7"; meta = with stdenv.lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; homepage = "https://github.com/rust-osdev/cargo-xbuild"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ xrelkd ]; - platforms = platforms.all; + maintainers = with maintainers; [ johntitor xrelkd ]; }; } diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 9eee570f67e..8ddbbcc8204 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -30,6 +30,5 @@ in rustPlatform.buildRustPackage rec { homepage = "https://github.com/PyO3/maturin"; license = licenses.mit; maintainers = [ maintainers.danieldk ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index da7fe98aafe..86f1989729e 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -45,6 +45,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/racer-rust/racer"; license = licenses.mit; maintainers = with maintainers; [ jagajaga ma27 ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index edcfe76c824..26e2a5ba50e 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -41,6 +41,5 @@ rustPlatform.buildRustPackage rec { description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; homepage = "https://github.com/jwilm/racerd"; license = licenses.asl20; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index d5ac9eaa5ee..7092f5291dd 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -50,6 +50,5 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/rust-analyzer/rust-analyzer"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ oxalica ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index bdd916ccdda..a51975b85ca 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -73,6 +73,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.rustup.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.mic92 ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 733504435ec..348fe6d9c71 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -23,6 +23,5 @@ buildRustPackage rec { description = "Generate Rust register maps (`struct`s) from SVD files"; homepage = "https://github.com/rust-embedded/svd2rust"; license = with licenses; [ mit asl20 ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index e26431b2687..8152dda2b50 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -13,13 +13,10 @@ buildGoPackage { sha256 = "15wwgrprfq36pa13b9anp7097q1fqcad28hirvivybmc011p0fri"; }; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/rakyll/statik"; description = "Embed files into a Go executable "; license = licenses.asl20; maintainers = with maintainers; [ chiiruno ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix index ac4502b05ab..c47955695f5 100644 --- a/pkgs/development/tools/swiftformat/default.nix +++ b/pkgs/development/tools/swiftformat/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "swiftformat"; - version = "0.44.2"; + version = "0.44.9"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; rev = "${version}"; - sha256 = "17g4w8kmkrhcp7lrfi525ck9jhcm96d0nn93yadacdjcdnchmih1"; + sha256 = "0zajvbaf3r02k53lv5zdxf13apc6chnjmj69zkyac48lpnpbcxq6"; }; preConfigure = "LD=$CC"; diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index dc859347899..3ee200a1a1f 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -19,6 +19,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/out-of-cheese-error/the-way"; license = with licenses; [ mit ]; maintainers = with maintainers; [ numkem ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix index 82dce7f81e7..5eb6dd09789 100644 --- a/pkgs/development/tools/tychus/default.nix +++ b/pkgs/development/tools/tychus/default.nix @@ -23,6 +23,5 @@ buildGoPackage rec { description = "Command line utility to live-reload your application."; homepage = "https://github.com/devlocker/tychus"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix index 8de898db828..7a257110327 100644 --- a/pkgs/development/tools/vend/default.nix +++ b/pkgs/development/tools/vend/default.nix @@ -23,6 +23,5 @@ buildGoModule { description = "A utility which vendors go code including c dependencies"; maintainers = with maintainers; [ c00w ]; license = licenses.mit; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 8bd8a55bce8..9b53c28c60e 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -16,7 +16,6 @@ buildGoPackage rec { description = "A command line tool for Vultr services, a provider for cloud virtual private servers"; homepage = "https://github.com/JamesClonk/vultr"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; }; } diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index e36e811ea56..93bda0b8180 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -38,6 +38,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rustwasm/wasm-pack"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.dhkl ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 6a6d6e39288..fd84afb1617 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -31,6 +31,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/cloudflare/wrangler"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index a2076668f60..94237abf89b 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -20,7 +20,6 @@ buildGoPackage rec { description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ]; - platforms = platforms.all; downloadPage = "https://github.com/sclevine/yj"; updateWalker = true; inherit version; diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index c15fad01599..cfca8a32f93 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/tools/yq/default.nix @@ -1,17 +1,38 @@ -{ lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }: +{ lib +, buildPythonApplication +, fetchPypi +, argcomplete +, pyyaml +, xmltodict +# Test inputs +, coverage +, flake8 +, jq +, pytest +, toml +}: buildPythonApplication rec { pname = "yq"; - version = "2.8.1"; + version = "2.10.1"; - propagatedBuildInputs = [ pyyaml xmltodict jq ]; + propagatedBuildInputs = [ pyyaml xmltodict jq argcomplete ]; - # ValueError: underlying buffer has been detached - doCheck = false; + doCheck = true; + + checkInputs = [ + pytest + coverage + flake8 + jq + toml + ]; + + checkPhase = "pytest ./test/test.py"; src = fetchPypi { inherit pname version; - sha256 = "042p3s011635rbjax9wvwjdrb1kyzw38a6qn59b0j0k7krz6rlr4"; + sha256 = "1h6nnkp53mm4spwy8nyxwvh9j6p4lxvf20j4bgjskhnhaw3jl9gn"; }; meta = with lib; { diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 2e5097f360d..7749249695d 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "0n64ph3piy7l3f3spcf2fnba8ivsbznjyw6piyv1zcxfjxb53wqg"; + sha256 = "163qvxggdv4mr1r1nab4s5n2b74bji0iil4r4nmp6n2ghssyf01h"; fetchSubmodules = true; }; - cargoSha256 = "10s4a20p1k2w2mdx63qbcb1lsqcrryp0vdc3zi6129pq1byybybc"; + cargoSha256 = "11i00a92i2d6y2vj04wa6qbpsd351qcdy6a9ansq6n3928m9f2pk"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix index 7f55232edb7..32f688895b8 100644 --- a/pkgs/development/web/shopify-themekit/default.nix +++ b/pkgs/development/web/shopify-themekit/default.nix @@ -20,6 +20,5 @@ buildGoPackage rec { homepage = "https://shopify.github.io/themekit/"; license = licenses.mit; maintainers = with maintainers; [ maintainers."1000101" ]; - platforms = platforms.all; }; } diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index b519e0c7e92..45133be461c 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, - SDL2, cmake, curl, fontconfig, freetype, icu, jansson, libiconv, libpng, - libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib +{ stdenv, fetchFromGitHub +, SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU +, libiconv, libpng, libpthreadstubs, libzip, openssl, pkgconfig, speexdsp, zlib }: let - version = "0.2.6"; + version = "0.3.0"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1vikbkg3wh5ngzdfilb6irbh6nqinf138qpdz8wz9izlvl8s36k4"; + sha256 = "0xs8pnn3lq30iy76pv42hywsrabapcrrkl597dhjafwh1xaxxj91"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.14"; - sha256 = "1bqbia5y73v4r0sv5cvi5729jh2ns7cxn557blh715yxswk91590"; + rev = "v1.0.16"; + sha256 = "1xz50ghiqj9rm0m6d65j09ich6dlhyj36zah6zvmmzr4kg6svnk5"; }; title-sequences-src = fetchFromGitHub { @@ -41,15 +41,16 @@ stdenv.mkDerivation { buildInputs = [ SDL2 curl + duktape fontconfig freetype icu jansson + libGLU libiconv libpng libpthreadstubs libzip - libGLU openssl speexdsp zlib @@ -57,7 +58,7 @@ stdenv.mkDerivation { postUnpack = '' cp -r ${objects-src} $sourceRoot/data/object - cp -r ${title-sequences-src} $sourceRoot/data/title + cp -r ${title-sequences-src} $sourceRoot/data/sequence ''; cmakeFlags = [ @@ -74,6 +75,6 @@ stdenv.mkDerivation { homepage = "https://openrct2.io/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/misc/cbeams/default.nix b/pkgs/misc/cbeams/default.nix index ec045ebf3ef..928b03df09f 100644 --- a/pkgs/misc/cbeams/default.nix +++ b/pkgs/misc/cbeams/default.nix @@ -16,6 +16,6 @@ buildPythonApplication rec { homepage = "https://github.com/tartley/cbeams"; description = "Command-line program to draw animated colored circles in the terminal"; license = licenses.bsd3; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index e742fde90ac..8671056d14e 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/misc/emulators/gxemul/default.nix @@ -2,26 +2,24 @@ stdenv.mkDerivation rec { pname = "gxemul"; - version = "0.6.0.1"; + version = "0.6.2"; src = fetchurl { - url = "http://gxemul.sourceforge.net/src/${pname}-${version}.tar.gz"; - sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407"; + url = "http://gavare.se/gxemul/src/gxemul-${version}.tar.gz"; + sha256 = "0iqmazfn7ss5n27m1a9n9nps3vzhag1phzb7qw0wgczycmwsq0x7"; }; configurePhase = "./configure"; installPhase = '' - mkdir -p $out/bin; - mkdir -p $out/share/${pname}-${version}; - cp gxemul $out/bin; - cp -r doc $out/share/${pname}-${version}; - cp -r demos $out/share/${pname}-${version}; - cp -r ./man $out/; + mkdir -p {$out/bin,$out/share/${pname}-${version}} + cp -r {doc,demos} $out/share/${pname}-${version} + cp gxemul $out/bin + cp -r ./man $out ''; - meta = { - license = stdenv.lib.licenses.bsd3; + meta = with stdenv.lib; { + homepage = "http://gavare.se/gxemul/"; description = "Gavare's experimental emulator"; longDescription = '' GXemul is a framework for full-system computer architecture @@ -32,6 +30,6 @@ stdenv.mkDerivation rec { and serial controllers. The emulation is working well enough to allow several unmodified "guest" operating systems to run. ''; - homepage = "http://gxemul.sourceforge.net/"; + license = licenses.bsd3; }; } diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index 17ef047ede7..2c63bf40d36 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; stdenv.mkDerivation { pname = "stabber-unstable"; - version = "2016-11-09"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "boothj5"; repo = "stabber"; - rev = "ed75087e4483233eb2cc5472dbd85ddfb7a1d4d4"; - sha256 = "1l6cibggi9rx6d26j1g92r1m8zm1g899f6z7n4pfqp84mrfqgz0p"; + rev = "3e5c2200715666aad403d0076e8ab584b329965e"; + sha256 = "0042nbgagl4gcxa5fj7bikjdi1gbk0jwyqnzc5lswpb0l5y0i1ql"; }; preAutoreconf = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Stubbed XMPP Server"; - homepage = "https://github.com/boothj5/stabber"; + homepage = "https://github.com/profanity-im/stabber"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ hschaeidt ]; diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index fe3a1e2a5d1..5c0fb954910 100755 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -21,6 +21,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lostutils/uq"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.all; }; } diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b96ef5e3d97..8e6fc7fc898 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -185,12 +185,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-07-25"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "2da6a641a8b30eba20ab6d1890a1b5c93c082cb2"; - sha256 = "1lxfxmga9mjq7vn63rm9hvyny0f137wk2kprshl93hdnvx8hjqmr"; + rev = "0e04854da7695854e7df7c3c771e72ac55a60040"; + sha256 = "1i6y0p7fcvzgxkm82xrypwh7xgp1ywyvqlpglf93bgq8ygsll0v9"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -269,12 +269,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-08-03"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "bc736aa8c7aa0cc8a66c1294695f73a3fd9d6931"; - sha256 = "0zb6f0xsrdxjg7fn3iz76gs5md0qnz359zq8l6zkgf3sqjy1gcag"; + rev = "9b2dcc18ba104820eac1701aaca44dcc24d90eb4"; + sha256 = "1vy0np1i8whyw9wfkcx564kvlxspwvrp4sznk6iixjln6ha7ngil"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -351,6 +351,18 @@ let meta.homepage = "https://github.com/bbchung/clighter8/"; }; + coc-clap = buildVimPluginFrom2Nix { + pname = "coc-clap"; + version = "2020-07-17"; + src = fetchFromGitHub { + owner = "vn-ki"; + repo = "coc-clap"; + rev = "09d9059c243a25c5859fd73fff6b664d8bf5eed0"; + sha256 = "057kad7nwc75c92d2al6q25gs7vrf0l14529iclrgd61vg369sva"; + }; + meta.homepage = "https://github.com/vn-ki/coc-clap/"; + }; + coc-css = buildVimPluginFrom2Nix { pname = "coc-css"; version = "2020-06-28"; @@ -399,14 +411,26 @@ let meta.homepage = "https://github.com/neoclide/coc-eslint/"; }; + coc-explorer = buildVimPluginFrom2Nix { + pname = "coc-explorer"; + version = "2020-08-12"; + src = fetchFromGitHub { + owner = "weirongxu"; + repo = "coc-explorer"; + rev = "b05b60c9e53a657f4a7c4dcf064032ce806cd0f4"; + sha256 = "10z3xrkkj0140a8cbix7yrky7nsczjcdflnl7a8b0ywwq16jd3hp"; + }; + meta.homepage = "https://github.com/weirongxu/coc-explorer/"; + }; + coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-08-13"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "0fd8cf49922019c1de111cf7ddffa02dba5d3d57"; - sha256 = "0d561wbvsqal5d29bmnifaslgbavyfxigpw5hqn16jb4s16jmp9n"; + rev = "294ee401d81656ff9e383e98b9d963a6c0edaf44"; + sha256 = "0s8fnzimk26rzrkky13si2iacw0nahyvcvicv3g8xc28sppddvd4"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -519,14 +543,26 @@ let meta.homepage = "https://github.com/neoclide/coc-lists/"; }; + coc-markdownlint = buildVimPluginFrom2Nix { + pname = "coc-markdownlint"; + version = "2020-08-02"; + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "coc-markdownlint"; + rev = "a1d6162a898b1538eb061675a63251cbd4eb8470"; + sha256 = "0gmci9x7kppv14lr8x8fnmkq1rp5lm8x66904fy419jipnl96g6g"; + }; + meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; + }; + coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-08-09"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "1a1c80d2464341e8981e695d8dcd97109182cbf4"; - sha256 = "1sgj7hnm484vgvz023qji4x7zippik6fpmgbjik94rb34r4g2lsa"; + rev = "b2d58e9e352afcc324bc23a0359fed390e069307"; + sha256 = "0hsqb71w9ypgd2w8zwv4vmjcjyxjpk4qb67k9cwfp589nrfkw6xb"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -605,12 +641,12 @@ let coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-08-12"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "a2c9ceadd9cc36456da381b1302b96cf6fdd9194"; - sha256 = "0c7h5s7xafvnikjhvhlknhvmm99c51p1mrvii633v1bwnmbnhk3y"; + rev = "60b75af3c86ce5c310cc39007cefcac6f36bc02a"; + sha256 = "1j4mmh45s5rchw3wf76gph4wm95kpzyql8i1dlqc7qndf06wwq37"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -735,6 +771,18 @@ let meta.homepage = "https://github.com/neoclide/coc-vetur/"; }; + coc-vimlsp = buildVimPluginFrom2Nix { + pname = "coc-vimlsp"; + version = "2020-08-01"; + src = fetchFromGitHub { + owner = "iamcco"; + repo = "coc-vimlsp"; + rev = "efb672fe82d8619d83d3978714393e13aee8e296"; + sha256 = "16whzvyzbx8zh7z33w7pir264dmbapkanb15mkazfhkh0wm3sfvf"; + }; + meta.homepage = "https://github.com/iamcco/coc-vimlsp/"; + }; + coc-vimtex = buildVimPluginFrom2Nix { pname = "coc-vimtex"; version = "2020-07-22"; @@ -1002,12 +1050,12 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2020-08-10"; + version = "2020-08-14"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "8ea1650726f96dd67b06dbdbd7ddf67076ef9ee6"; - sha256 = "19h0jj13a1fniy8545x447cabs9gxpirpv3kh0jl4j3hbv97wkdm"; + rev = "378bddc9f0e109607935ab9a4ac717df008deac7"; + sha256 = "0idaph0wdaf2rk9mh468zg8c4gf5hyvad5zqlpcd9q1f576ysswy"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -1038,12 +1086,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-08-09"; + version = "2020-08-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "175a57e9444bf2d24c2480e8ecba33bd70b5e522"; - sha256 = "1ics05jaa25n6ffdn19sj5r840fbjsxjhprnbhipgxz47iy9jias"; + rev = "c533595c435e776297e84ff739eb6bf84523cf22"; + sha256 = "1y6fwy6hrdpf3znkrcbfj1gk0agdcl80a6i2027qlsar1k7w2pyp"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1074,12 +1122,12 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-07-28"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "denite-git"; - rev = "70c0befcc3562240a681215acef580ab9b608537"; - sha256 = "15xvals2fvdc2yxw239ch5c69a811g957rlzgpzda22lvl3dbm28"; + rev = "6992366697e5509c405c0ae8386cca91a186fd0b"; + sha256 = "1iqlf7669qxf80g30j5zjyx6w7hjvmylnlwcmq3rdcsyk1b0iiwy"; }; meta.homepage = "https://github.com/neoclide/denite-git/"; }; @@ -2184,12 +2232,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-08-14"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "fca0bd2fe459863b81f393859729648cb8b24289"; - sha256 = "03ajyknf7c0k6miqi3l31nfjzdn8f2r1wm7z2h0qxlz644cmb7zh"; + rev = "c1883dbf23632e6c3ba0a26ba2bd8f92f5690fb3"; + sha256 = "0lkix2dbmmdp40qp5mlcmqscxs7sjg57mjjrvlsr9gg8r05dv6fq"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2676,12 +2724,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-08-09"; + version = "2020-08-14"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "6b5d70e5bf307bd84fec90ba77fa661036ff0361"; - sha256 = "1nm6wxqn6cbk1sv0l10zymfzdbq0lsw7avjjbgk7r13r2aq0w2z4"; + rev = "23000acd7f9744667abc840dd10dd07a16e18fc6"; + sha256 = "1sapl458rrswgyqlm2pg8wxjqplryn3qnb1qqsh727ihfq5vfqjr"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2820,12 +2868,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-08-13"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "1846d92ec62c5ac6403387b64a8ee3f97a59b765"; - sha256 = "17i0y9difiw9r1y6460yrd5cnxiv5lwy4njwrrd3nlxmncvi8c27"; + rev = "83210fa412b5b63a6e7717ae576536b7a10f6aef"; + sha256 = "14lkzdkkkzk8xp7ambzz688mh9cvibka82gqy063w75hrnz8y8yy"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3228,12 +3276,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-06-11"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "0d8ce07aaa3b95e61bf319b25bb3b1a4ecc780c2"; - sha256 = "0bwj60zvafv5z61yy66ab6ng1ilnj20k3xnxl6myzvfn70rsp5yd"; + rev = "f5eb7b04ee2746cbed4067e0cf9dd19185529a34"; + sha256 = "0549r64350cr17gg1lm1fwz0wb1w9jsbs8qi8ddcsgrk1bc3gqf5"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -3649,12 +3697,12 @@ let thumbnail-vim = buildVimPluginFrom2Nix { pname = "thumbnail-vim"; - version = "2020-05-07"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "itchyny"; repo = "thumbnail.vim"; - rev = "c238441923d4eefd0c1436686b35e8fa9e643a3e"; - sha256 = "101w0pvfcnms07w4l6yjhn4b4hb3rvwm827qb2z4rb14fydakias"; + rev = "161ff743cb031eff376780108b018735d92160b0"; + sha256 = "105a1a9kahfdicw1gkdhc88w41pyhmhv6yw2kh1flkaikzqlxbc8"; }; meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; @@ -4296,6 +4344,18 @@ let meta.homepage = "https://github.com/rhysd/vim-clang-format/"; }; + vim-clap = buildVimPluginFrom2Nix { + pname = "vim-clap"; + version = "2020-08-13"; + src = fetchFromGitHub { + owner = "liuchengxu"; + repo = "vim-clap"; + rev = "b51fdf94f4dec9c0e32b2a07ccd157aa3dfa6d57"; + sha256 = "0v4j192jixd8akiw4iclwkrjqix3ms5mb17gwhkcjksw4205r5zv"; + }; + meta.homepage = "https://github.com/liuchengxu/vim-clap/"; + }; + vim-clojure-highlight = buildVimPluginFrom2Nix { pname = "vim-clojure-highlight"; version = "2015-07-05"; @@ -4466,12 +4526,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2020-08-09"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "2c43d1a4259ae60637c261d0d3631e595fed68cd"; - sha256 = "05mrzs8gywqq1hppnv1r27xq553hgm98grzdk4916jqjf88138nv"; + rev = "d2ccb376ebfeeef842456a7883164ef2c0d1656c"; + sha256 = "0260h5yhghyaxsbmx3imnjq1rfz5f5w60ypzr4y8p5a0bh8kvwmq"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -4538,12 +4598,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-08-11"; + version = "2020-08-14"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "712d1ab813a0ba1e1a5eb0c05eec98cff8a206a2"; - sha256 = "1fffz9qd57157vr87qp5zmrzk4gcr3jb12lxi4ab06i46hzmj13b"; + rev = "308526367703698554d19f15f692ee3c45a598cb"; + sha256 = "0b6ng6qgwx4fb9fs7b7m5k3dj7ycq0zw5y0jaqqqn6asp8wmf51b"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -5306,12 +5366,12 @@ let vim-isort = buildVimPluginFrom2Nix { pname = "vim-isort"; - version = "2020-07-17"; + version = "2020-08-14"; src = fetchFromGitHub { owner = "fisadev"; repo = "vim-isort"; - rev = "9794a4af68eccac74c23d7bfa151785ff88496fc"; - sha256 = "172b1bpvn01nl67sh7v85mn7s21irzqjxxrcgkscpjifqaq8zvwi"; + rev = "94b1f1202899aa0b6e2cc20e6d1f133eafe24331"; + sha256 = "16r2nsdapf3r0zjqwwbl0k8g2p81h9zs14b91dhskyvs0hvf7cfy"; }; meta.homepage = "https://github.com/fisadev/vim-isort/"; }; @@ -5881,6 +5941,18 @@ let meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; + vim-osc52 = buildVimPluginFrom2Nix { + pname = "vim-osc52"; + version = "2017-06-23"; + src = fetchFromGitHub { + owner = "fcpg"; + repo = "vim-osc52"; + rev = "01a311169b2678d853c87b371201205daf8fdf1a"; + sha256 = "1nxla8r4036shbmyx6wpxy9ncy1s2c5ghi5n5ip22b01lcv6lnv5"; + }; + meta.homepage = "https://github.com/fcpg/vim-osc52/"; + }; + vim-over = buildVimPluginFrom2Nix { pname = "vim-over"; version = "2020-01-26"; @@ -6063,16 +6135,28 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-08-06"; + version = "2020-08-14"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "34e01b8b62701afbd6b4ab1ffb4057617f540dce"; - sha256 = "06l5xwvpp3d0ci7x739yk50h9q5a99p5jjw8gf6y4dhpw4gq4sql"; + rev = "a3bdbcdb3c60a9563fb90e02b28ae46cee5ef974"; + sha256 = "1h9993j9w8883hi4fllykim261srphlzv7lfww0bvr0whi77hv1r"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; + vim-poweryank = buildVimPluginFrom2Nix { + pname = "vim-poweryank"; + version = "2017-08-13"; + src = fetchFromGitHub { + owner = "haya14busa"; + repo = "vim-poweryank"; + rev = "48dff95dbd64423c96fdae5c18eaddb5b5fa3064"; + sha256 = "016w6nn2qhra9v55sn6g6qf1pj8f072f22r97nzxy4958k7f114a"; + }; + meta.homepage = "https://github.com/haya14busa/vim-poweryank/"; + }; + vim-prettyprint = buildVimPluginFrom2Nix { pname = "vim-prettyprint"; version = "2016-07-16"; @@ -6976,12 +7060,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-08-12"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "37a9a0070c23d058584760db21444807d9534be3"; - sha256 = "1a1zmsz2857xa8fcka3xn3sjq6n8vw059sx2arfizjik7qdbw0fz"; + rev = "038065ed8d1b43972f8993df41f07aa00848a47f"; + sha256 = "137pcqp96xgak9ghr5829dq39525n0x2p56lcbh2njf3crgvmnl0"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7000,12 +7084,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-08-14"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "bf83a42361ef47b3f727c86d6ef615af1a56de40"; - sha256 = "03wm0p4cvx9wpdp50i48gga5af4p5zma9a6ymqznn8r6aiq1iwp0"; + rev = "fa412d7ad3d98446bfd3c14cf2e279226161de9d"; + sha256 = "1kpi2ygj1b7n93md66awrg9jna9q4iqzgjm95695b6403ljkpvnv"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 7f1935f574a..db1fd71d2f4 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -2,6 +2,7 @@ , python, cmake, meson, vim, ruby , which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch , llvmPackages, rustPlatform +, pkgconfig, curl, openssl, libgit2, libiconv , xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses , ycmd, rake @@ -764,4 +765,30 @@ self: super: { ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null ''; }); + + vim-clap = super.vim-clap.overrideAttrs(old: { + preFixup = let + maple-bin = rustPlatform.buildRustPackage { + name = "maple"; + src = old.src; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + openssl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + CoreServices + curl + libgit2 + libiconv + ]; + + cargoSha256 = "0qqys51slz85rnx6knjyivnmyq4rj6rrnz7w72kqcl8da8zjbx7b"; + }; + in '' + ln -s ${maple-bin}/bin/maple $target/bin/maple + ''; + }); } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b8670221de3..dd6e020d76d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -100,9 +100,11 @@ enomsg/vim-haskellConcealPlus ensime/ensime-vim ervandew/supertab esneider/YUNOcommit.vim +fannheyward/coc-markdownlint fannheyward/coc-rust-analyzer farmergreg/vim-lastplace fatih/vim-go +fcpg/vim-osc52 FelikZ/ctrlp-py-matcher fenetikm/falcon fisadev/vim-isort @@ -138,6 +140,7 @@ haya14busa/incsearch-easymotion.vim haya14busa/incsearch.vim haya14busa/is.vim haya14busa/vim-asterisk +haya14busa/vim-poweryank heavenshell/vim-jsdoc hecal3/vim-leader-guide henrik/vim-indexed-search @@ -149,6 +152,7 @@ hrsh7th/vim-vsnip-integ hsanson/vim-android hsitz/VimOrganizer iamcco/coc-spell-checker +iamcco/coc-vimlsp ianks/vim-tsx idris-hackers/idris-vim ihsanturk/neuron.vim @@ -244,6 +248,7 @@ lervag/vimtex lfilho/cosco.vim lifepillar/vim-mucomplete lilydjwg/colorizer +liuchengxu/vim-clap liuchengxu/vim-which-key liuchengxu/vista.vim LnL7/vim-nix @@ -602,11 +607,13 @@ vimwiki/vimwiki vito-c/jq.vim vmchale/ats-vim vmchale/dhall-vim +vn-ki/coc-clap voldikss/vim-floaterm VundleVim/Vundle.vim w0ng/vim-hybrid wakatime/vim-wakatime wannesm/wmgraphviz.vim +weirongxu/coc-explorer wellle/targets.vim wellle/tmux-complete.vim will133/vim-dirdiff diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 430fe0852fb..04eabef9ec3 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -76,8 +76,8 @@ in mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "3.0.3"; - sha256 = "1sg4g8h1gww4y67zix5f33v2gf121k2fcm6l1m7lygpkn40a8dsj"; + version = "3.2.1"; + sha256 = "0lxp8xz17ciy93nj4lzxqvz71vw1zdyamrnh2n792yair8890rr6"; }; meta = { license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 7984c25bf3f..f94e6d72d59 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "035ydf7kp9yh5gpjnq4cgi76j582a0q6dxcbgkraxpkml0d8n2xd"; + sha256 = "0gm438sfh84bif5d40wvaqrfl4dh3fxjvnjk9ab33al8ws3afpsj"; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix new file mode 100644 index 00000000000..c7d14a45068 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildLinux, ... } @ args: + +let + version = "5.8.1"; +in + +buildLinux (args // { + modDirVersion = "${version}-zen1"; + inherit version; + + src = fetchFromGitHub { + owner = "zen-kernel"; + repo = "zen-kernel"; + rev = "v${version}-zen1"; + sha256 = "122q09d0sybi9lqlaxpq6ffc0ha9127bg3wzjync256lbj5394b7"; + }; + + extraMeta = { + branch = "5.8/master"; + maintainers = with stdenv.lib.maintainers; [ atemu ]; + }; + +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 422ad5c1cb5..67d08454a84 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation rec { pname = "musl"; - version = "1.1.24"; + version = "1.2.0"; src = fetchurl { url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; - sha256 = "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k"; + sha256 = "1s6lix02k1ijm4nmhzpmwzk5w6xfkhn70nvvk8zjs51r24cpppn6"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index 5c4848980a9..f8a1b836a6c 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, gettext , dbus, dbus-glib, libgaminggear, libgudev, lua +, harfbuzz }: stdenv.mkDerivation rec { @@ -32,6 +33,8 @@ stdenv.mkDerivation rec { "-DLIBDIR=lib" ]; + NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ]; + meta = { description = "Tools to configure ROCCAT devices"; homepage = "http://roccat.sourceforge.net/"; diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 7efc2e21313..6c17e0718bb 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,14 +1,14 @@ { stdenv, windows, fetchurl }: let - version = "5.0.4"; + version = "6.0.0"; in stdenv.mkDerivation { pname = "mingw-w64"; inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm"; + sha256 = "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0"; }; outputs = [ "out" "dev" ]; @@ -23,7 +23,6 @@ in stdenv.mkDerivation { buildInputs = [ windows.mingw_w64_headers ]; dontStrip = true; hardeningDisable = [ "stackprotector" "fortify" ]; - patches = [ ./osvi.patch ]; meta = { platforms = stdenv.lib.platforms.windows; diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix index 6a93cea6708..1fd27a8c457 100644 --- a/pkgs/os-specific/windows/mingw-w64/headers.nix +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -4,8 +4,6 @@ stdenvNoCC.mkDerivation { name = "${mingw_w64.name}-headers"; inherit (mingw_w64) src meta; - patches = [ ./osvi.patch ]; - preConfigure = '' cd mingw-w64-headers ''; diff --git a/pkgs/os-specific/windows/mingw-w64/osvi.patch b/pkgs/os-specific/windows/mingw-w64/osvi.patch deleted file mode 100644 index c51ff4bd5df..00000000000 --- a/pkgs/os-specific/windows/mingw-w64/osvi.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix `error: osvi undeclared (first use in this function)' issue. - -See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863064 ---- a/mingw-w64-headers/include/multimon.h -+++ b/mingw-w64-headers/include/multimon.h -@@ -127,7 +127,7 @@ - WINBOOL IsPlatformNT() { - OSVERSIONINFOA oi = { 0 }; - -- oi.dwOSVersionInfoSize = sizeof (osvi); -+ oi.dwOSVersionInfoSize = sizeof (oi); - GetVersionExA ((OSVERSIONINFOA *) &oi); - return (oi.dwPlatformId == VER_PLATFORM_WIN32_NT); - } \ No newline at end of file diff --git a/pkgs/servers/dns/ncdns/default.nix b/pkgs/servers/dns/ncdns/default.nix index de28c01474c..f1d124176bb 100644 --- a/pkgs/servers/dns/ncdns/default.nix +++ b/pkgs/servers/dns/ncdns/default.nix @@ -32,7 +32,6 @@ buildGoPackage rec { description = "Namecoin to DNS bridge daemon"; homepage = "https://github.com/namecoin/ncdns"; license = licenses.gpl3Plus; - platforms = platforms.all; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 02e86443e56..2af795b2ca9 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -19,6 +19,5 @@ buildGoModule rec { homepage = "https://github.com/cloudflare/gortr/"; license = licenses.gpl3; maintainers = with maintainers; [ petabyteboy ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index fa984aef376..88617d0cd8b 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -57,7 +57,6 @@ buildGoModule rec { homepage = "https://gotify.net"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 913ed201f48..2f73a5d9243 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -8,7 +8,7 @@ , withPerldevel ? false, perldevel , withRuby_2_5 ? false, ruby_2_5 , withRuby_2_6 ? true, ruby_2_6 -, withRuby_2_7 ? true, ruby_2_7 +, withRuby_2_7 ? false, ruby_2_7 , withSSL ? true, openssl ? null , withIPv6 ? true , withDebug ? false @@ -30,14 +30,14 @@ let php74-unit = php74.override phpConfig; in stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "0r2l3ra63qjjbpjzrmx75jp9fvz83yis4j3qxqdnmxm77psykwy8"; + sha256 = "0k3q42q198sb0w6hyyymw92dbhz67axn6w6vnzr0d883xw3sva7k"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 145d341bb51..28c92d073ff 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -14,8 +14,6 @@ buildGoPackage { sha256 = "1xxykjf5iyavm12gd6nx4j8x2mlzzn7x8vm0j5009lsir98qr5zn"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig go-bindata ]; buildInputs = [ ffmpeg-full graphicsmagick quicktemplate easyjson ]; @@ -25,6 +23,5 @@ buildGoPackage { description = "High performance media tagger and organizer"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ chiiruno ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 38eb336ba21..156c0f108ae 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -20,8 +20,6 @@ buildGoPackage rec { buildInputs = [ ffmpeg_3 ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Official Go implementation of the Livepeer protocol"; homepage = "https://livepeer.org"; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 6bdbe38ff3d..b864c4d830b 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "matterbridge"; - version = "1.17.5"; + version = "1.18.0"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; - sha256 = "1p89ik5zr1qq1abd9k1xfa4j62b11zdnl2gm52y0s5yx8slap4w0"; + sha256 = "0ax2lis37ppxah4k9aqw1aj6pl5yz6npfriaw70g4952abvbkivw"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 4c5521e97bb..d3853fc9de1 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -16,7 +16,6 @@ buildGoPackage { fetchSubmodules = true; }; - enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake go-bindata ]; buildInputs = [ @@ -45,7 +44,6 @@ buildGoPackage { description = "High performance anonymous realtime imageboard"; license = licenses.agpl3Plus; maintainers = with maintainers; [ chiiruno ]; - platforms = platforms.all; broken = true; # Broken on Hydra since 2019-04-18: # https://hydra.nixos.org/build/98885902 }; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 4b9e96cbcaf..19e228b1624 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,24 +2,26 @@ buildGoModule rec { pname = "minio"; - version = "2020-05-01T22-19-14Z"; + version = "2020-08-08T04-50-06Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0yyq5j82rcl8yhn2jg8sjfxii6kzbrbmxvb05yiwv7p0q42ag5rn"; + sha256 = "0l5yd3k154h3q9sc5psv80n9wpnhpj5sb3r9v9gsqcam46ljwpna"; }; - vendorSha256 = "15yx5nkyf424v42glg3cx0gkqckdfv1xn25570s9cwf8zid0zlxd"; + vendorSha256 = "1xxhvgawkj2lq39cxgl4l5v41m6nsask79n2cxfpcgb00fqq147x"; doCheck = false; subPackages = [ "." ]; - buildFlagsArray = [''-ldflags= - -s -w -X github.com/minio/minio/cmd.Version=${version} - '']; + patchPhase = '' + sed -i "s/Version.*/Version = \"${version}\"/g" cmd/build-constants.go + sed -i "s/ReleaseTag.*/ReleaseTag = \"RELEASE.${version}\"/g" cmd/build-constants.go + sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go + ''; passthru.tests.minio = nixosTests.minio; diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix index 8677a8d03f2..f28ef6617c7 100644 --- a/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { description = "Bot for Prometheus' Alertmanager"; homepage = "https://github.com/metalmatze/alertmanager-bot"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ mmahut ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index ca2a5bbee58..d18b5e2e373 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/mdlayher/apcupsd_exporter"; license = licenses.mit; maintainers = with maintainers; [ maintainers."1000101" mdlayher ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index 21c469694c8..03f09992b81 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -22,6 +22,5 @@ buildGoPackage rec { homepage = "https://github.com/ribbybibby/s3_exporter"; license = licenses.asl20; maintainers = [ maintainers.mmahut ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 06eba474c99..e6dcfb4a346 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -22,6 +22,5 @@ buildGoPackage rec { homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter"; license = licenses.asl20; maintainers = [ maintainers.mmahut ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index 68bac5c560e..2c2fabf2357 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -22,6 +22,5 @@ buildGoPackage rec { homepage = "https://github.com/martin-helmich/prometheus-nginxlog-exporter"; license = licenses.asl20; maintainers = with maintainers; [ mmahut ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 722e06ab072..b0e9ef356a6 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests, fetchpatch }: buildGoModule rec { pname = "telegraf"; @@ -15,10 +15,16 @@ buildGoModule rec { sha256 = "045wjpq29dr0s48ns3a4p8pw1j0ssfcw6m91iim4pkrppj7bm2di"; }; - runVend = true; - vendorSha256 = "0c2sayg49b2rq3fnrbf741b6zy8byhwxlnxkhf5160gzqn6jy2rw"; + patches = [ + # https://github.com/influxdata/telegraf/pull/7988 + # fix broken cgo vendoring + (fetchpatch { + url = "https://github.com/influxdata/telegraf/commit/63e1f41d8ff246d191d008ff7f69d69cc34b4fae.patch"; + sha256 = "0ikifc4414bid3g6hhxz18cw71z63s5g805klx98vrndjlpbqkzw"; + }) + ]; - doCheck = false; + vendorSha256 = "0f95xigpkindd7dmci8kqpqq5dlirimbqh8ai73142asbrd5h4yr"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 8f632ed9b58..b2c52d77df5 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.6.10"; + version = "1.6.11"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "0g9iywm0s08b0ax1qx4j5lixfc1m6p48lv14vlil6wns4azc3fsc"; + sha256 = "05mwghfmp459f7c0yph0xp1a5k6c0wghxzqm0n8jw7yfj7qixv88"; }; postPatch = '' diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 743fc0fa1e5..b0ae2ebc2dc 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -20,6 +20,5 @@ buildGoPackage rec { license = licenses.asl20; maintainers = [ maintainers.swdunlop ]; homepage = "https://nats.io/"; - platforms = platforms.all; }; } diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index efaec689a1a..e5bce49d057 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -19,6 +19,5 @@ buildGoPackage rec { license = licenses.asl20; maintainers = [ maintainers.swdunlop ]; homepage = "https://nats.io/"; - platforms = platforms.all; }; } diff --git a/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch b/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch deleted file mode 100644 index 173fa1e0c63..00000000000 --- a/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake -index f7790748..995621e0 100644 ---- a/cmake/build_configurations/mysql_release.cmake -+++ b/cmake/build_configurations/mysql_release.cmake -@@ -121,7 +121,6 @@ ENDIF() - - IF(UNIX) - SET(WITH_EXTRA_CHARSETS all CACHE STRING "") -- SET(PLUGIN_AUTH_PAM YES) - - IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") - IF(NOT IGNORE_AIO_CHECK) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d6e52134301..3ba4e367312 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -23,14 +23,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.4.13"; + version = "10.4.14"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1pwibmm52sc04qxp832pc3ylxw9wq90fjc7nxpcyp3yys49bpfs5"; + sha256 = "1z469j39chq7d3dp39cljjbzcz0wl1g7rii85x46290jw1cwsbzr"; name = "mariadb-${version}.tar.gz"; }; @@ -128,10 +128,10 @@ client = stdenv.mkDerivation (common // { patches = common.patches ++ [ ./cmake-plugin-includedir.patch - ./cmake-without-plugin-auth-pam.patch ]; cmakeFlags = common.cmakeFlags ++ [ + "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_SERVER=ON" "-DWITH_WSREP=OFF" "-DINSTALL_MYSQLSHAREDIR=share/mysql-client" @@ -139,7 +139,7 @@ client = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' rm -r "$out"/share/doc - rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan} + rm "$out"/bin/{mysqltest,mytop} libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt} @@ -162,9 +162,7 @@ server = stdenv.mkDerivation (common // { ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; - patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [ - ./cmake-without-plugin-auth-pam.patch - ]; + patches = common.patches; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" @@ -190,6 +188,7 @@ server = stdenv.mkDerivation (common // { ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ "-DWITH_JEMALLOC=static" ] ++ optional stdenv.hostPlatform.isDarwin [ + "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_OQGRAPH=1" ]; diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index ffba1bd8e3b..8186e9128d9 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "plv8"; - version = "2.3.14"; + version = "2.3.15"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "12g7z0xkb6zg2qd0hppk2izq238v1k52vb13jlvaij1rbhh10mbp"; + sha256 = "1cv94n49gq2b377gqyq7pjjzw98czv4mwl3sx97y18c20zwp6rk3"; }; makefile = "Makefile.shared"; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index c8e26b5a82b..9feb45d311a 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.0.1"; + version = "3.0.2"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "0lv37v8f3143kfm9sdvw59461q2lndxiqvaw47lvmnaha7wk4m2s"; + sha256 = "1jmji8i2wjabkrzqil683lypnmimigdmn64a10j3kj3kzlfn98d3"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index 15c163d16f1..15adcb069e7 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -22,6 +22,5 @@ buildGoPackage rec { homepage = "https://github.com/Comcast/trickster"; license = licenses.asl20; maintainers = with maintainers; [ maintainers."1000101" ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 7d0079fca20..4be6ef68274 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -25,6 +25,5 @@ rustPlatform.buildRustPackage rec { ''; license = with licenses; [ mit ]; maintainers = with maintainers; [ leenaars ]; - platforms = platforms.all; }; } diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index ca2f7a6d515..f84f150bc55 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.redox-os.org/redox-os/ion"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; - platforms = platforms.all; }; passthru = { diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index af8188883d9..22d6c1bfdec 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -1,28 +1,21 @@ -{ stdenv, fetchFromGitHub, python3, fetchpatch }: +{ stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { program = "dex"; name = "${program}-${version}"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "jceb"; repo = program; rev = "v${version}"; - sha256 = "13dkjd1373mbvskrdrp0865llr3zvdr90sc6a6jqswh3crmgmz4k"; + sha256 = "03aapcywnz4kl548cygpi25m8adwbmqlmwgxa66v4156ax9dqs86"; }; propagatedBuildInputs = [ python3 ]; nativeBuildInputs = [ python3.pkgs.sphinx ]; makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ]; - patches = [ - (fetchpatch { - url = "https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch"; - sha256 = "06dfkfzxp8199by0jc5wim8g8qw38j09dq9p6n9w4zaasla60pjq"; - }) - ]; - meta = with stdenv.lib; { description = "A program to generate and execute DesktopEntry files of the Application type"; homepage = "https://github.com/jceb/dex"; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 667e8eb61d4..27ea33b6035 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -36,7 +36,6 @@ buildGoModule rec { description = "A CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; license = licenses.asl20; - platforms = platforms.all; maintainers = with maintainers; [ xrelkd ]; }; } diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index eeae7fbe1bf..a174937e5a1 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -18,6 +18,5 @@ buildGoPackage rec { homepage = "https://github.com/scaleway/scaleway-cli"; license = licenses.mit; maintainers = with maintainers; [ nickhu ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index b96d6d75725..1057eb71dd6 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -24,7 +24,6 @@ buildGoPackage rec { description = "Rsync for block devices and disk images"; homepage = "https://github.com/dop251/diskrsync"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 1973c119486..4c338eed4b0 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kopia"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0jxl2zq3s3czz52ndq7zbj8liij0519745pbcqaj42x851c1p6mj"; + sha256 = "1wz4sqjcih1m4bjxxdrsggai931q72zz8ikf2rwkp4alz12wr355"; }; vendorSha256 = "1npxr7gp59xv38zdx1diilfxij6lb0cmvsnzvjx6n8g0326gf2ii"; @@ -17,6 +17,12 @@ buildGoModule rec { subPackages = [ "." ]; + buildFlagsArray = '' + -ldflags= + -X github.com/kopia/kopia/repo.BuildVersion=${version} + -X github.com/kopia/kopia/repo.BuildInfo=${src.rev} + ''; + postConfigure = '' # make 'vendor' writable cp -L -r vendor tmp-vendor @@ -31,7 +37,6 @@ buildGoModule rec { meta = with lib; { homepage = "https://kopia.io"; description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication"; - platforms = platforms.all; license = licenses.asl20; maintainers = [ maintainers.bbigras ]; }; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index e2d415d92f6..83b14d87db7 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -32,7 +32,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dpc/rdedup"; license = licenses.mpl20; maintainers = with maintainers; [ dywedir ]; - platforms = platforms.all; broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index 0ebf67ccf49..85a6b169f74 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, brotli }: +{ lib, buildGoModule, fetchFromGitHub, brotli }: buildGoModule rec { pname = "wal-g"; - version = "0.2.15"; + version = "0.2.17"; src = fetchFromGitHub { owner = "wal-g"; repo = "wal-g"; rev = "v${version}"; - sha256 = "1hslhs9i4wib6c74gdq9yail958ff1y11pymjww2xr84wkwd9v7i"; + sha256 = "0r6vy2b3xqwa22286srwngk63sq4aza6aj7brwc130vypcps7svp"; }; - vendorSha256 = "0jjr33k27k6h27sa01ipz0aydch3i9klknqb3yq8f048zkb54gv8"; + vendorSha256 = "0r73l4kxzldca1vg5mshq6iqsxcrndcbmbp3d7i9pxyb2kig8gv5"; buildInputs = [ brotli ]; @@ -23,10 +23,10 @@ buildGoModule rec { mv $out/bin/pg $out/bin/wal-g ''; - meta = { + meta = with lib; { homepage = "https://github.com/wal-g/wal-g"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; description = "An archival restoration tool for PostgreSQL"; - maintainers = [ stdenv.lib.maintainers.ocharles ]; + maintainers = with maintainers; [ ocharles marsam ]; }; } diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index 0f1bf806551..29560cfe6e5 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://flam3.com/"; maintainers = [ maintainers.nand0p ]; platforms = platforms.linux; - license = licenses.cc-by-nc-sa-20; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 00a18cbbac4..965c799a217 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -23,6 +23,5 @@ rustPlatform.buildRustPackage rec { description = "A multithreaded lossless PNG compression optimizer"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index d11f715464d..374e090af6a 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -23,6 +23,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ivanceras/svgbob"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 350fdefba5c..201b43f4f44 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec { description = "A tool for tidying and optimizing SVGs"; homepage = "https://github.com/RazrFalcon/svgcleaner"; license = licenses.gpl2; - platforms = platforms.all; maintainers = [ maintainers.mehandes ]; }; } diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index ba35711a6ee..2b332bd3256 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/atanunq/viu"; license = licenses.mit; maintainers = with maintainers; [ petabyteboy ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index f04acb72b47..2e812d9b7b3 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -14,13 +14,13 @@ let }; in clangStdenv.mkDerivation rec { name = "fcitx-mozc-${version}"; - version = "2.20.2673.102"; + version = "2.23.2815.102"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "280e38fe3d9db4df52f0713acf2ca65898cd697a"; - sha256 = "0s599f817gjgqynm4n1yll1ipd25ai2c55y8k6wvhg9s7qaxnyhs"; + rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8"; + sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; }; nativeBuildInputs = [ gyp which ninja python pkgconfig ]; @@ -32,18 +32,23 @@ in clangStdenv.mkDerivation rec { tar -xzf ${icons} -C $sourceRoot/src ''; - patch_version = "2.18.2612.102.1"; + patch_version = "${version}.1"; patches = [ (fetchpatch rec { name = "fcitx-mozc-${patch_version}.patch"; url = "https://download.fcitx-im.org/fcitx-mozc/${name}"; - sha256 = "1f9m4310kz09v5qvnv75ka2vq63m7by023qrkpddgq4dv7gxx3ca"; + sha256 = "0a8q3vzcbai1ccdrl6qdb81gvbw8aby4lqkl6qs9hg68p6zg42hg"; }) # https://github.com/google/mozc/pull/444 - fix for gcc8 STL (fetchpatch { url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch"; sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla"; }) + # Support dates after 2019 + (fetchpatch { + url = "https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch"; + sha256 = "1dsiiglrmm8i8shn2hv0j2b8pv6miysjrimj4569h606j4lwmcw2"; + }) ]; postPatch = '' @@ -52,7 +57,7 @@ in clangStdenv.mkDerivation rec { ''; configurePhase = '' - export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1" + export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 use_fcitx5=0" cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc ''; @@ -100,7 +105,7 @@ in clangStdenv.mkDerivation rec { downloadPage = "http://download.fcitx-im.org/fcitx-mozc/"; license = licenses.free; platforms = platforms.linux; - maintainers = [ maintainers.ericsagnes ]; + maintainers = with maintainers; [ gebner ericsagnes ]; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 9b73345d5e8..bd34f2c49a5 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -37,6 +37,11 @@ in clangStdenv.mkDerivation rec { url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch"; sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla"; }) + # Support dates after 2019 + (fetchpatch { + url = "https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch"; + sha256 = "1dsiiglrmm8i8shn2hv0j2b8pv6miysjrimj4569h606j4lwmcw2"; + }) ]; postUnpack = '' diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 9902142df35..b4e5501fb73 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -36,6 +36,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sharkdp/bat"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir lilyball zowoq ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index ac315b2e816..7ad6bc2cc69 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -67,6 +67,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://dystroy.org/broot/"; maintainers = with maintainers; [ danieldk ]; license = with licenses; [ mit ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index ad27d146742..a87aa33ab11 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { description = "Manage your dotfiles across multiple machines, securely"; license = licenses.mit; maintainers = with maintainers; [ jhillyerd ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index bc23958b581..16263e2b6c3 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -23,6 +23,5 @@ buildGoPackage rec { homepage = "https://${goPackagePath}"; license = licenses.asl20; maintainers = [ maintainers.nicknovitski ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 2f4c117c615..11523ae3758 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -22,6 +22,5 @@ buildGoPackage rec { homepage = "https://github.com/technosophos/dashing"; license = licenses.mit; maintainers = [ ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index b055bfb04fa..da504ad3ba3 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -17,6 +17,5 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/NerdyPepper/dijo"; license = licenses.mit; maintainers = with maintainers; [ infinisil ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 8f09b91a709..1096cce496e 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, bash }: +{ stdenv, fetchFromGitHub, buildGoModule, bash, fish, zsh }: buildGoModule rec { pname = "direnv"; @@ -6,8 +6,6 @@ buildGoModule rec { vendorSha256 = null; - doCheck = false; - src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; @@ -31,6 +29,13 @@ buildGoModule rec { echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish ''; + checkInputs = [ fish zsh ]; + + checkPhase = '' + export HOME=$(mktemp -d) + make test-go test-bash test-fish test-zsh + ''; + meta = with stdenv.lib; { description = "A shell extension that manages your environment"; longDescription = '' diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix index dd9490b4267..1eb3dd7a0f7 100644 --- a/pkgs/tools/misc/diskonaut/default.nix +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec { description = "Terminal disk space navigator"; homepage = "https://github.com/imsnif/diskonaut"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ evanjs ]; }; } diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index dd33d0b0915..b4cdde95b80 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -25,6 +25,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Byron/dua-cli"; license = with licenses; [ mit ]; maintainers = with maintainers; [ killercup ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index 74f2eadb140..75e8d5d4887 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -25,6 +25,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bootandy/dust"; license = licenses.asl20; maintainers = [ maintainers.infinisil ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix index 5bfbb53c106..be563345b2c 100644 --- a/pkgs/tools/misc/envsubst/default.nix +++ b/pkgs/tools/misc/envsubst/default.nix @@ -16,7 +16,6 @@ buildGoPackage rec { description = "Environment variables substitution for Go"; homepage = "https://github.com/a8m/envsubst"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ nicknovitski ]; }; } diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 1f56eda0a42..89a05815f51 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -33,6 +33,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sharkdp/fd"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir globin ma27 zowoq ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index d979e1e1a00..312c7bbe3e9 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/jhspetersson/fselect"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index b51ca76b12c..ff9250a2bf6 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -31,6 +31,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sharkdp/hyperfine"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.thoughtpolice ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 2f63eaf4380..1c2d7ab6717 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ul/kak-lsp"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = [ maintainers.spacekookie ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/tools/misc/libgen-cli/default.nix index dd04f24179b..26627500e8b 100644 --- a/pkgs/tools/misc/libgen-cli/default.nix +++ b/pkgs/tools/misc/libgen-cli/default.nix @@ -35,7 +35,6 @@ buildGoModule rec { contents. ''; license = licenses.asl20; - platforms = platforms.all; maintainers = with maintainers; [ zaninime ]; }; } diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index a6570adf120..3a87e0a1bb8 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -23,6 +23,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/raftario/licensor"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix index 4d9324af180..51b9b94ef70 100644 --- a/pkgs/tools/misc/lnch/default.nix +++ b/pkgs/tools/misc/lnch/default.nix @@ -16,7 +16,6 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/oem/lnch"; description = "A small go app that launches a process and moves it out of the process group"; - platforms = platforms.all; license = licenses.publicDomain; # really I don't know }; } diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index e272c56e0ac..a761530a0a0 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -25,7 +25,6 @@ buildGoPackage rec { pass-through to standard make. ''; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.gabesoft ]; }; } diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index cff7df1801f..d92f2346563 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.0.0"; + version = "1.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = "${version}"; - sha256 = "1lwmg6mn3lf7s0345v53zadxn9v0x8z6pcbj90v5dx3pgrq41gs8"; + sha256 = "sha256-xMz6e0OLeB3eltGrLV3Hew0lMjH5LSgqJ1l7JT2Ho/M="; }; # Substitute instead of wrapping because the resulting file is diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index ac06b44055c..3a3a1a77037 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -35,6 +35,5 @@ buildGoPackage rec { homepage = "https://github.com/variadico/noti"; license = licenses.mit; maintainers = with maintainers; [ stites marsam ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/tools/misc/page/default.nix index 07109515c5c..c93084a16d7 100644 --- a/pkgs/tools/misc/page/default.nix +++ b/pkgs/tools/misc/page/default.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec { description = "Use neovim as pager"; homepage = "https://github.com/I60R/page"; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.s1341 ]; }; } diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index 35bd84005b5..8e1787f29a8 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -21,7 +21,6 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "http://docs.phraseapp.com"; description = "PhraseApp API v2 Command Line Client"; - platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ manveru ]; }; diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/tools/misc/shell-hist/default.nix index fd30d0370d8..c4c496b978f 100644 --- a/pkgs/tools/misc/shell-hist/default.nix +++ b/pkgs/tools/misc/shell-hist/default.nix @@ -18,6 +18,5 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/jamesmunns/shell-hist"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = [ maintainers.spacekookie ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index 3fa6551534f..99de1c3d175 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -41,6 +41,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Aloxaf/silicon"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ evanjs ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index f5b446539cc..e89cf366136 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -39,6 +39,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lotabout/skim"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 142caea7056..a170eef35fb 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -45,6 +45,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://starship.rs"; license = licenses.isc; maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman marsam ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix index dd48156d456..a8376356e86 100644 --- a/pkgs/tools/misc/systrayhelper/default.nix +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -36,6 +36,5 @@ buildGoPackage rec { license = licenses.mit; # It depends on the inputs, i guess? not sure about solaris, for instance. go supports it though # I hope nix can figure this out?! ¯\\_(ツ)_/¯ - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix index b8e984e90c4..374bf9b54b2 100644 --- a/pkgs/tools/misc/teleconsole/default.nix +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -22,7 +22,6 @@ buildGoPackage rec { homepage = "https://www.teleconsole.com/"; description = "Share your terminal session with people you trust"; license = licenses.asl20; - platforms = platforms.all; # Builds for Aarch64 not possible in the current release due to # incompatibilities further up the dependency chain. # See: diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index b4f834bdd1a..b63ffb1cd10 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -31,6 +31,5 @@ buildGoPackage rec { description = "Cowsay replacement with unicode and partial ansi escape support"; license = stdenv.lib.licenses.cc0; maintainers = [ stdenv.lib.maintainers.chiiruno ]; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 04cfd4ebb1f..578d2ba42e5 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { description = "Upgrade all the things"; homepage = "https://github.com/r-darwish/topgrade"; license = licenses.gpl3; - platforms = platforms.all; maintainers = with maintainers; [ filalex77 hugoreeves ]; }; } diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 25d92905bd8..b0edf3e7de0 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.umlet.com"; license = licenses.gpl3; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index c441242885e..ddbd78c699c 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -37,6 +37,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/timberio/vector"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index f9805531f86..21df532f948 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -21,6 +21,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/spacejam/void"; license = licenses.gpl3; maintainers = with maintainers; [ spacekookie ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index b0e069f3090..c936b159963 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -30,6 +30,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/vi/websocat"; license = licenses.mit; maintainers = with maintainers; [ thoughtpolice filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 889ab823a9c..04c1902f3a0 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2; }; } diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/tools/misc/xxv/default.nix index 6b20c39b185..b22dfc7e4cd 100644 --- a/pkgs/tools/misc/xxv/default.nix +++ b/pkgs/tools/misc/xxv/default.nix @@ -35,6 +35,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://chrisvest.github.io/xxv/"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ lilyball ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/tools/misc/zabbixctl/default.nix index b74ab51680d..c54456ede3d 100644 --- a/pkgs/tools/misc/zabbixctl/default.nix +++ b/pkgs/tools/misc/zabbixctl/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { description = "Most effective way for operating in Zabbix Server"; homepage = "https://github.com/kovetskiy/zabbixctl"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ mmahut ]; }; } diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index f6c018f4e05..3e4cbfd8433 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -30,6 +30,5 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ysndr cole-h ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 8da370be334..b690b63ef4b 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.7.3"; + version = "3.8.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "083c59yig9z0ksvcm9dvy0mv13k79rgnvqrr5qhbhzjz3bgzy1dq"; + sha256 = "0hm5h8glva0d9mj870j56bc721w4br7dzwhns096rgzyv93m7rx0"; }; - vendorSha256 = "1s8g0qqg3m6hdvc5v3s86l3ba5grmyhx0lf2ymi39k5dpcg8l19s"; + vendorSha256 = "1g3jbdx7m5m56ifcc1p6hgz2wzmb287cyyaiz03ffdvwd3k73k4j"; doCheck = false; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index 944fccb0ec5..b8f2d70848d 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -42,7 +42,6 @@ in rustPlatform.buildRustPackage rec { description = "Bukubrow is a WebExtension for Buku, a command-line bookmark manager"; homepage = "https://github.com/SamHH/bukubrow-host"; license = licenses.gpl3; - platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index a0b10df6e56..c26af7743c4 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -25,6 +25,5 @@ buildGoModule rec { homepage = "https://github.com/Dreamacro/clash"; license = licenses.gpl3; maintainers = with maintainers; [ contrun filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index dc29a95d92b..c3d07ddca95 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -75,7 +75,6 @@ in buildGoPackage rec { ''; homepage = "https://www.datadoghq.com"; license = licenses.bsd3; - platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice domenkozar rvl ]; }; } diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 8f1294eb751..a59f70f633b 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -19,7 +19,6 @@ buildGoPackage rec { description = "Live process collector for the DataDog Agent v6"; homepage = "https://www.datadoghq.com"; license = licenses.bsd3; - platforms = platforms.all; maintainers = with maintainers; [ domenkozar rvl ]; }; } diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 1382cbf86e3..52c7161f8e0 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/AdguardTeam/dnsproxy"; license = licenses.gpl3; maintainers = with maintainers; [ contrun ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 34b03aff399..452a9873bec 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.0.9"; + version = "6.0.11"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "16s5m9i9fx370ssqnqxi01isrs9p3k7w8a4kkcgr4lq99vxys915"; + sha256 = "0yjf639ldfaxrw4pbg9avdkhhmcpnx58j3x70zskvgkajny8yqqr"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 763bcac5a29..07c7dda6446 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -32,6 +32,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Edu4rdSHL/findomain"; license = licenses.gpl3; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index d0d788b1609..a998b25e3e7 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -28,6 +28,5 @@ buildGoModule rec { homepage = "https://github.com/fatedier/frp"; license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/go-shadowsocks2/default.nix b/pkgs/tools/networking/go-shadowsocks2/default.nix index 1591b6acf5b..6b55c21b5b0 100644 --- a/pkgs/tools/networking/go-shadowsocks2/default.nix +++ b/pkgs/tools/networking/go-shadowsocks2/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { description = "Fresh implementation of Shadowsocks in Go"; homepage = "https://github.com/shadowsocks/go-shadowsocks2/"; license = licenses.asl20; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 20b7c9d3f8b..505ecc4c222 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,22 +2,26 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-04-25T00-43-23Z"; + version = "2020-08-08T02-33-58Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "0ff2fyr3787zp0lpgbph064am33py2wzjikzmxd3zwp3y0dic770"; + sha256 = "15bkl3q0jidrwy04l0cdmha43r9wlxmlqkhmwz98b57rjrq6grql"; }; - vendorSha256 = "0nfcxz47v5gl0wih59xarhz82nd8wy61c3ijvg2v08ipk29zivcc"; + vendorSha256 = "1fsx8zl2qkyf1gx3s6giccd86xawx9d1h4jdnyn1m36clsq9jkpc"; doCheck = false; subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/minio/mc/cmd.Version=${version}" ]; + patchPhase = '' + sed -i "s/Version.*/Version = \"${version}\"/g" cmd/build-constants.go + sed -i "s/ReleaseTag.*/ReleaseTag = \"RELEASE.${version}\"/g" cmd/build-constants.go + sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go + ''; meta = with stdenv.lib; { homepage = "https://github.com/minio/mc"; diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 2e464630056..178979b2caf 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -39,7 +39,6 @@ buildGoModule rec { homepage = "https://github.com/slackhq/nebula"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 47e5a2f4181..95d015f6964 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 -, withGnome ? true, gnome3, fetchpatch, libnma }: +, withGnome ? true, gnome3, fetchpatch, libnma, glib }: let pname = "NetworkManager-iodine"; @@ -27,7 +27,7 @@ in stdenv.mkDerivation { }) ]; - buildInputs = [ iodine networkmanager ] + buildInputs = [ iodine networkmanager glib ] ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index 9c1d046e4fb..6cd0d2e75f5 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, libnma }: +, gtk3, withGnome ? true, gnome3, glib, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation { }) ]; - buildInputs = [ vpnc networkmanager ] + buildInputs = [ vpnc networkmanager glib ] ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix index 4ce866e9040..e9772b193d3 100644 --- a/pkgs/tools/networking/oneshot/default.nix +++ b/pkgs/tools/networking/oneshot/default.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/raphaelreyna/oneshot"; license = licenses.mit; maintainers = with maintainers; [ edibopp ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 0e1e6b9b42e..5f7247248e7 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -24,7 +24,6 @@ buildGoModule rec { ''; homepage = "https://overdodactyl.github.io/ShadowFox/"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix index 83f1e372aa5..ec57e851f4b 100644 --- a/pkgs/tools/networking/sniffglue/default.nix +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "0vyxlqwh90shihp80fk0plnkjix9i37n2dnypzyz6nx44xd5737s"; + sha256 = "0lkz25z0qy1giss4rnhkx9fvsdd8ckf4z1gqw46zl664x96bb705"; }; - cargoSha256 = "162p3a696k281cygqpl6gg4makwk2v0g2jnf1gd108dnz4jya11l"; + cargoSha256 = "01ya9535whi2kviw57f25n8h05ckpb4bq1h7qav6srai97rm937s"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 940d63963dc..90cd64b83ad 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -36,7 +36,6 @@ buildGoModule rec { "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; license = licenses.lgpl3; - platforms = platforms.all; maintainers = with maintainers; [ ehmry gazally lassulus ]; }; } diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index 84bea234c20..c4d9aae267e 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -17,6 +17,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/EmbarkStudios/cargo-about"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ evanjs ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 01acc2ed6ed..acd08817780 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -23,6 +23,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://rustsec.org"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ basvandijk ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index 96ef0eef8c5..43a2fccd878 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -33,6 +33,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mmstick/cargo-deb"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix index d90d0fe7979..682cfde78fa 100644 --- a/pkgs/tools/package-management/cargo-deps/default.nix +++ b/pkgs/tools/package-management/cargo-deps/default.nix @@ -18,6 +18,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/m-cat/cargo-deps"; license = licenses.mit; maintainers = with maintainers; [ arcnmx ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 7bcc6c12ee9..b3449566d45 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -25,6 +25,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/killercup/cargo-edit"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gerschtli jb55 filalex77 killercup ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix index 4d35e284040..5bca56d993d 100644 --- a/pkgs/tools/package-management/cargo-graph/default.nix +++ b/pkgs/tools/package-management/cargo-graph/default.nix @@ -18,6 +18,5 @@ rustPlatform.buildRustPackage rec { description = "A cargo subcommand for creating GraphViz DOT files and dependency graphs"; license = with licenses; [ mit ]; maintainers = with maintainers; [ basvandijk ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix index b3c404f476f..ba461398e66 100644 --- a/pkgs/tools/package-management/cargo-license/default.nix +++ b/pkgs/tools/package-management/cargo-license/default.nix @@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/onur/cargo-license"; license = with licenses; [ mit ]; maintainers = with maintainers; [ basvandijk ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 866c4cabc8d..5d4eef2fbe5 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec { description = "A cargo subcommand for displaying when Rust dependencies are out of date"; homepage = "https://github.com/kbknapp/cargo-outdated"; license = with licenses; [ asl20 /* or */ mit ]; - platforms = platforms.all; maintainers = with maintainers; [ sondr3 ivan ]; }; } diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 69a55bcda91..0b92e5fb9ae 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -21,6 +21,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sunng87/cargo-release"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 8dc07d287d2..b9f586ccc6a 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -7,7 +7,9 @@ , libssh2 , openssl , pkg-config -, zlib }: +, Security +, zlib +}: rustPlatform.buildRustPackage rec { pname = "cargo-update"; @@ -25,13 +27,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libgit2 libssh2 openssl zlib ] - ++ stdenv.lib.optional stdenv.isDarwin curl; + ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ]; meta = with stdenv.lib; { description = "A cargo subcommand for checking and applying updates to installed executables"; homepage = "https://github.com/nabijaczleweli/cargo-update"; license = licenses.mit; maintainers = with maintainers; [ gerschtli filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index db26f9e0b08..37a638c5670 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -35,6 +35,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bennofs/nix-index"; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.bennofs ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix index 3bc0b35c0f1..5782aa9dc35 100644 --- a/pkgs/tools/package-management/nix-simple-deploy/default.nix +++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix @@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec { description = "Deploy software or an entire NixOS system configuration to another NixOS system"; homepage = "https://github.com/misuzu/nix-simple-deploy"; license = with licenses; [ asl20 /* OR */ mit ]; - platforms = platforms.all; maintainers = with maintainers; [ misuzu ]; }; } diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix index cf14ec12402..7b6048660c4 100644 --- a/pkgs/tools/security/2fa/default.nix +++ b/pkgs/tools/security/2fa/default.nix @@ -16,7 +16,6 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://rsc.io/2fa"; description = "Two-factor authentication on the command line"; - platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs ]; license = licenses.bsd3; }; diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index d5c1f7ec6fd..b540be3928a 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -25,7 +25,6 @@ buildGoPackage rec { description = "aws-vault like tool for Okta authentication"; license = licenses.mit; maintainers = [maintainers.imalsogreg]; - platforms = platforms.all; homepage = "https://github.com/segmentio/aws-okta"; downloadPage = "https://github.com/segmentio/aws-okta"; }; diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 6494002a473..a8ca38e1f1d 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://www.bettercap.org/"; license = with licenses; gpl3; maintainers = with maintainers; [ y0no ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 2223c38a9cf..ebf65b07234 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -40,6 +40,5 @@ in rustPlatform.buildRustPackage rec { homepage = "https://github.com/dani-garcia/bitwarden_rs"; license = licenses.gpl3; maintainers = with maintainers; [ msteen ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index 2e3291bd014..9aec14e0a41 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -50,7 +50,6 @@ buildGoModule rec { description = "Browserpass native client app"; homepage = "https://github.com/browserpass/browserpass-native"; license = licenses.isc; - platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs infinisil ]; }; } diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index 4d2e2fe7e95..99ba5c9e29b 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -16,7 +16,6 @@ buildGoPackage rec { meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Tools to bootstrap CAs, certificate requests, and signed certificates"; - platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ volth ]; }; diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index ee3eebac991..54a084ff596 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec { description = "A simple yet robust commandline random password generator."; homepage = "https://github.com/cyplo/genpass"; license = licenses.agpl3; - platforms = platforms.all; maintainers = with maintainers; [ cyplo ]; }; } diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix index 5bda599f0f0..dc8ea8b2c9b 100644 --- a/pkgs/tools/security/hash_extender/default.nix +++ b/pkgs/tools/security/hash_extender/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { description = "Tool to automate hash length extension attacks"; homepage = "https://github.com/iagox86/hash_extender"; license = licenses.bsd3; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 910bcc522e7..f829d56d6fd 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -23,7 +23,6 @@ buildGoPackage rec { homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops."; maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; license = licenses.asl20; }; } diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 2161aa5f1cd..be3de71f25c 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mike-engel/jwt-cli"; license = with licenses; [ mit ]; maintainers = with maintainers; [ rycee ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index a3a9ec4becf..6b389a379d6 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -89,7 +89,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://sequoia-pgp.org/"; license = licenses.gpl3; maintainers = with maintainers; [ minijackson doronbehar ]; - platforms = platforms.all; broken = stdenv.targetPlatform.isDarwin; }; } diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 5cc7dbac5da..61afb9082d0 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, botan, libobjc, Security }: +{ stdenv, fetchurl, botan2, libobjc, Security }: stdenv.mkDerivation rec { pname = "softhsm"; - version = "2.5.0"; + version = "2.6.1"; src = fetchurl { url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz"; - sha256 = "1cijq78jr3mzg7jj11r0krawijp99p253f4qdqr94n728p7mdalj"; + hash = "sha256:1wkmyi6n3z2pak1cj5yk6v6bv9w0m24skycya48iikab0mrr8931"; }; configureFlags = [ "--with-crypto-backend=botan" - "--with-botan=${botan}" + "--with-botan=${botan2}" "--sysconfdir=$out/etc" "--localstatedir=$out/var" ]; @@ -20,13 +20,24 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ]; - buildInputs = [ botan ]; + buildInputs = [ botan2 ]; postInstall = "rm -rf $out/var"; meta = with stdenv.lib; { homepage = "https://www.opendnssec.org/softhsm"; description = "Cryptographic store accessible through a PKCS #11 interface"; + longDescription = " + SoftHSM provides a software implementation of a generic + cryptographic device with a PKCS#11 interface, which is of + course especially useful in environments where a dedicated hardware + implementation of such a device - for instance a Hardware + Security Module (HSM) or smartcard - is not available. + + SoftHSM follows the OASIS PKCS#11 standard, meaning it should be + able to work with many cryptographic products. SoftHSM is a + programme of The Commons Conservancy. + "; license = licenses.bsd2; maintainers = [ maintainers.leenaars ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index b5272534ffe..f5d7ff4759e 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -11,9 +11,12 @@ buildGoModule rec { sha256 = "10qfzmq1wdgpvv319khzicalix1x4fqava0wry3bzz84k5c9dabs"; }; - vendorSha256 = "1crphp41bfivfmfp3cl7pjca3ypds6mr3847msd4wvfq4g6imk55"; + runVend = true; + vendorSha256 = "09vdhdgj74ifdhl6rmxddkvk7ls26jn8gswzcxf9389zkjzi7822"; - doCheck = false; + preCheck = '' + export HOME=$(mktemp -d) + ''; meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index 30fbac1387f..9966ace14f4 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -36,7 +36,6 @@ buildGoModule rec { ''; homepage = "https://github.com/gsamokovarov/jump"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ sondr3 ]; }; } diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index 04aacc181c9..d0f81414741 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dduan/tre"; license = licenses.mit; maintainers = [ maintainers.dduan ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 4afab278370..22a18b1cffb 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dalance/amber"; license = with licenses; [ mit ]; maintainers = [ maintainers.bdesham ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index f38ada46c11..38f544496d5 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec { description = "Colourise your checksum output"; homepage = "https://github.com/ticky/coloursum"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; }; } diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index 016cc40977b..4fa7814ad00 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mookid/diffr"; license = with licenses; [ mit ]; maintainers = with maintainers; [ davidtwco ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index 4ea24328b9c..d15683894a2 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/facebookincubator/fastmod"; license = licenses.asl20; maintainers = with maintainers; [ jduan ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 9dc0a7d443c..9cfdc9c9b7e 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-lang-nursery/mdbook"; license = [ licenses.mpl20 ]; maintainers = [ maintainers.havvy ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 57243175264..0d5f878af08 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -34,6 +34,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lunaryorn/mdcat"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ davidtwco ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 53aa9ac7b76..b53c5646e70 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/monochromegane/the_platinum_searcher"; description = "A code search tool similar to ack and the_silver_searcher(ag)."; - platforms = platforms.all; license = licenses.mit; }; } diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index 97d3f8960d9..8da7a54ebb2 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -58,6 +58,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/phiresky/ripgrep-all"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ zaninime ma27 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 548b6fd22de..9a72e023d6d 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -39,6 +39,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/BurntSushi/ripgrep"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = with maintainers; [ tailhook globin ma27 zowoq ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index 535a00b7b4d..7ebf739414a 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/TankerHQ/ruplacer"; license = [ licenses.bsd3 ]; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index a6af316e121..1fa508b1ef6 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec { description = "Intuitive find & replace CLI (sed alternative)"; homepage = "https://github.com/chmln/sd"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ amar1729 filalex77 ]; }; } diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index 830810a84c4..5a36de5f720 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -21,6 +21,5 @@ buildGoPackage rec { homepage = "https://sift-tool.org"; maintainers = [ maintainers.carlsverre ]; license = licenses.gpl3; - platforms = platforms.all; }; } diff --git a/pkgs/tools/text/smu/default.nix b/pkgs/tools/text/smu/default.nix index 50bceb4fcb3..854e70c7622 100644 --- a/pkgs/tools/text/smu/default.nix +++ b/pkgs/tools/text/smu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "simple markup - markdown like syntax"; homepage = "https://github.com/Gottox/smu"; license = licenses.mit; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index 927d0d14be6..b17dba7a127 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/BurntSushi/xsv"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = [ maintainers.jgertm ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index f5ac36690fd..3b9c0581eca 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -27,6 +27,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://tectonic-typesetting.github.io/"; license = with licenses; [ mit ]; maintainers = [ maintainers.lluchs ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index f8d547b0285..f883c423d01 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -35,6 +35,5 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}"; license = licenses.bsd2; maintainers = [ maintainers.primeos ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix index c557361f122..20b461fa346 100644 --- a/pkgs/tools/virtualization/marathonctl/default.nix +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -18,7 +18,6 @@ buildGoPackage { meta = with stdenv.lib; { homepage = "https://github.com/shoenig/marathonctl"; description = "CLI tool for Marathon"; - platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ manveru ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index baa46a708c1..9d7dad11bc3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -71,6 +71,7 @@ mapAliases ({ catfish = xfce.catfish; # added 2019-12-22 cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 checkbashism = checkbashisms; # added 2016-08-16 + chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15 cide = throw "deprecated in 2019-09-11: abandoned by upstream"; cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 cifs_utils = cifs-utils; # added 2016-08 @@ -281,8 +282,10 @@ mapAliases ({ m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 + marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 + mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 @@ -297,7 +300,9 @@ mapAliases ({ # floating point textures patents are expired, # so package reduced to alias mesa_drivers = mesa.drivers; + mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 midoriWrapper = midori; # added 2015-01 + mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # added 2020-08-15 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c19fa3fe6e..4b6baf4af2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1442,7 +1442,6 @@ in bs-platform = callPackage ../development/compilers/bs-platform {}; c3d = callPackage ../applications/graphics/c3d { - stdenv = gcc8Stdenv; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -1674,6 +1673,8 @@ in dante = callPackage ../servers/dante { }; + dapr-cli = callPackage ../development/tools/dapr/cli {}; + dasher = callPackage ../applications/accessibility/dasher { }; datamash = callPackage ../tools/misc/datamash { }; @@ -2112,8 +2113,6 @@ in marlin-calc = callPackage ../tools/misc/marlin-calc {}; - mathics = with python2Packages; toPythonApplication mathics; - masscan = callPackage ../tools/security/masscan { stdenv = gccStdenv; }; @@ -2741,7 +2740,7 @@ in mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; @@ -3472,7 +3471,7 @@ in mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { }; @@ -5207,8 +5206,15 @@ in mailhog = callPackage ../servers/mail/mailhog {}; mailnag = callPackage ../applications/networking/mailreaders/mailnag { - pythonPackages = python3Packages; + availablePlugins = { + # More are listed here: https://github.com/pulb/mailnag/#desktop-integration + # Use the attributes here as arguments to `plugins` list + goa = callPackage ../applications/networking/mailreaders/mailnag/goa-plugin.nix { }; + }; }; + mailnagWithPlugins = mailnag.withPlugins( + builtins.attrValues mailnag.availablePlugins + ); mailsend = callPackage ../tools/networking/mailsend { }; @@ -5388,6 +5394,8 @@ in molly-guard = callPackage ../os-specific/linux/molly-guard { }; + molotov = callPackage ../applications/video/molotov {}; + moneyplex = callPackage ../applications/office/moneyplex { }; monit = callPackage ../tools/system/monit { }; @@ -7214,6 +7222,8 @@ in tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; + tinycbor = callPackage ../development/libraries/tinycbor { }; + tiny8086 = callPackage ../applications/virtualization/8086tiny { }; tinyemu = callPackage ../applications/virtualization/tinyemu { }; @@ -7909,6 +7919,8 @@ in clipnotify = callPackage ../tools/misc/clipnotify { }; + x3270 = callPackage ../applications/misc/x3270 { }; + xclip = callPackage ../tools/misc/xclip { }; xcur2png = callPackage ../tools/graphics/xcur2png { }; @@ -9404,7 +9416,9 @@ in cargo-audit = callPackage ../tools/package-management/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-c = callPackage ../development/tools/rust/cargo-c { }; + cargo-c = callPackage ../development/tools/rust/cargo-c { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9419,7 +9433,9 @@ in }; cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; - cargo-update = callPackage ../tools/package-management/cargo-update { }; + cargo-update = callPackage ../tools/package-management/cargo-update { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-asm = callPackage ../development/tools/rust/cargo-asm { inherit (darwin.apple_sdk.frameworks) Security; @@ -9432,6 +9448,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; + cargo-fund = callPackage ../development/tools/rust/cargo-fund { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { inherit (darwin) libiconv; @@ -9817,13 +9836,6 @@ in me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { }; - mesos = callPackage ../applications/networking/cluster/mesos { - sasl = cyrus_sasl; - inherit (pythonPackages) python boto setuptools wrapPython; - pythonProtobuf = pythonPackages.protobuf.override { protobuf = protobuf3_6; }; - perf = linuxPackages.perf; - }; - mesos-dns = callPackage ../servers/mesos-dns { }; metamath = callPackage ../development/interpreters/metamath { }; @@ -9892,14 +9904,43 @@ in # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. - pythonFull = python.override{x11Support=true;}; - python2Full = python2.override{x11Support=true;}; - python27Full = python27.override{x11Support=true;}; - python3Full = python3.override{x11Support=true;}; - python36Full = python36.override{x11Support=true;}; - python37Full = python37.override{x11Support=true;}; - python38Full = python38.override{x11Support=true;}; - python39Full = python39.override{x11Support=true;}; + pythonFull = python.override { + self = pythonFull; + x11Support = true; + }; + python2Full = python2.override { + self = python2Full; + x11Support = true; + }; + python27Full = python27.override { + self = python27Full; + x11Support = true; + }; + python3Full = python3.override { + self = python3Full; + bluezSupport = true; + x11Support = true; + }; + python36Full = python36.override { + self = python36Full; + bluezSupport = true; + x11Support = true; + }; + python37Full = python37.override { + self = python37Full; + bluezSupport = true; + x11Support = true; + }; + python38Full = python38.override { + self = python38Full; + bluezSupport = true; + x11Support = true; + }; + python39Full = python39.override { + self = python39Full; + bluezSupport = true; + x11Support = true; + }; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -10772,7 +10813,7 @@ in gradle_4_10 = res.gradleGen.gradle_4_10; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; - gradle_6 = res.gradleGen.gradle_6_5; + gradle_6 = res.gradleGen.gradle_6_6; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -11450,7 +11491,8 @@ in yodl = callPackage ../development/tools/misc/yodl { }; yq = callPackage ../development/tools/yq { - inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict; + inherit (python3Packages) + buildPythonApplication fetchPypi argcomplete pyyaml xmltodict pytest coverage flake8 toml; }; yq-go = callPackage ../development/tools/yq-go { }; @@ -12757,7 +12799,9 @@ in isso = callPackage ../servers/isso { }; - itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; + itk4 = callPackage ../development/libraries/itk/4.x.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; itk = callPackage ../development/libraries/itk { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -13973,6 +14017,8 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + rang = callPackage ../development/libraries/rang { }; + libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { src = pkgs.fetchurl { url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; @@ -14958,7 +15004,6 @@ in simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; - stdenv = gcc8Stdenv; }; sfml = callPackage ../development/libraries/sfml { @@ -15406,6 +15451,14 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; + vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + IOKit CFNetwork Security ApplicationServices + CoreText IOSurface ImageIO OpenGL GLUT; + }; + vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; @@ -17370,6 +17423,14 @@ in ]; }; + linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -17650,6 +17711,9 @@ in linuxPackages_latest-libre = recurseIntoAttrs (linuxPackagesFor linux_latest-libre); linux_latest-libre = linux-libre.override { linux = linux_latest; }; + # zen-kernel + linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); + # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); @@ -18603,6 +18667,8 @@ in luculent = callPackage ../data/fonts/luculent { }; + luna-icons = callPackage ../data/icons/luna-icons { }; + maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; mailcap = callPackage ../data/misc/mailcap { }; @@ -19441,8 +19507,6 @@ in chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); - chronos = callPackage ../applications/networking/cluster/chronos { }; - chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); chromiumDev = lowPrio (chromium.override { channel = "dev"; }); @@ -20329,6 +20393,8 @@ in gitolite = callPackage ../applications/version-management/gitolite { }; + gitoxide = callPackage ../applications/version-management/gitoxide { }; + inherit (gnome3) gitg; gmrun = callPackage ../applications/misc/gmrun {}; @@ -21288,7 +21354,6 @@ in mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; - marathon = callPackage ../applications/networking/cluster/marathon { }; marathonctl = callPackage ../tools/virtualization/marathonctl { } ; markdown-pp = callPackage ../tools/text/markdown-pp { }; @@ -23968,8 +24033,6 @@ in masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; - mist = callPackage ../applications/blockchains/mist.nix { }; - nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; @@ -24288,6 +24351,8 @@ in }; }; + fslint = callPackage ../applications/misc/fslint {}; + galaxis = callPackage ../games/galaxis { }; gambatte = callPackage ../games/gambatte { }; @@ -25089,6 +25154,8 @@ in eigen = eigen2; }; + d-seams = callPackage ../applications/science/chemistry/d-seams {}; + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; jmol = callPackage ../applications/science/chemistry/jmol { }; @@ -25133,9 +25200,7 @@ in alliance = callPackage ../applications/science/electronics/alliance { }; - ants = callPackage ../applications/science/biology/ants { - stdenv = gcc8Stdenv; - }; + ants = callPackage ../applications/science/biology/ants { }; aragorn = callPackage ../applications/science/biology/aragorn { }; @@ -25189,7 +25254,7 @@ in est-sfs = callPackage ../applications/science/biology/est-sfs { }; - ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; }; + ezminc = callPackage ../applications/science/biology/EZminc { }; exonerate = callPackage ../applications/science/biology/exonerate { }; @@ -25833,6 +25898,7 @@ in gap-full = lowPrio (gap.override { packageSet = "full"; }); geogebra = callPackage ../applications/science/math/geogebra { }; + geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { }; maxima = callPackage ../applications/science/math/maxima { ecl = null; @@ -26319,6 +26385,8 @@ in icu = icu58; }; + mamba = callPackage ../applications/audio/mamba{ }; + mame = libsForQt5.callPackage ../misc/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3bfa780fe17..c9ff92d0d5e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5396,6 +5396,23 @@ let }; }; + DBDMariaDB = buildPerlPackage { + pname = "DBD-MariaDB"; + version = "1.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.21.tar.gz"; + sha256 = "068l4ybja5mmy89lwgzl9c1xs37f4fgvf7j7n8k4f78dg8rjp5zm"; + }; + buildInputs = [ pkgs.mariadb-connector-c DevelChecklib TestDeep ]; + propagatedBuildInputs = [ DBI ]; + meta = { + homepage = "https://github.com/gooddata/DBD-MariaDB"; + description = "MariaDB and MySQL driver for the Perl5 Database Interface (DBI)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + DBDmysql = buildPerlPackage { pname = "DBD-mysql"; version = "4.050"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5ad32d8ee1..76e5fd9dcd1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2566,6 +2566,8 @@ in { mxnet = callPackage ../development/python-modules/mxnet { }; + nplusone = callPackage ../development/python-modules/nplusone { }; + parsy = callPackage ../development/python-modules/parsy { }; portalocker = callPackage ../development/python-modules/portalocker { }; @@ -2726,6 +2728,8 @@ in { pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; + pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; + pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; @@ -4738,8 +4742,6 @@ in { markdown-macros = callPackage ../development/python-modules/markdown-macros { }; - mathics = callPackage ../development/python-modules/mathics { }; - matplotlib = let path = if isPy3k then ../development/python-modules/matplotlib/default.nix else ../development/python-modules/matplotlib/2.nix; @@ -6548,6 +6550,8 @@ in { stevedore = callPackage ../development/python-modules/stevedore {}; + svglib = callPackage ../development/python-modules/svglib { }; + text-unidecode = callPackage ../development/python-modules/text-unidecode { }; Theano = callPackage ../development/python-modules/Theano rec { |