Merge remote-tracking branch 'upstream/master' into haskell-no-rec

This commit is contained in:
John Ericson
2018-09-24 20:09:25 -04:00
1589 changed files with 83711 additions and 36849 deletions
+7
View File
@@ -81,6 +81,8 @@ mapAliases ({
dwarf_fortress = dwarf-fortress; # added 2016-01-23
emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25
emacsMelpa = emacs25PackagesNg; # for backward compatibility
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18
enblendenfuse = enblend-enfuse; # 2015-09-30
evolution_data_server = evolution-data-server; # added 2018-02-25
etcdctl = etcd; # added 2018-04-25
@@ -104,6 +106,7 @@ mapAliases ({
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
gnustep-make = gnustep.make; # added 2016-7-6
go-pup = pup; # added 2017-12-19
goimports = gotools; # added 2018-09-16
googleAuthenticator = google-authenticator; # added 2016-10-16
grantlee5 = libsForQt5.grantlee; # added 2015-12-19
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
@@ -129,6 +132,7 @@ mapAliases ({
iana_etc = iana-etc; # added 2017-03-08
idea = jetbrains; # added 2017-04-03
inotifyTools = inotify-tools;
jbuilder = dune; # added 2018-09-09
joseki = apache-jena-fuseki; # added 2016-02-28
json_glib = json-glib; # added 2018-02-25
kdiff3-qt5 = kdiff3; # added 2017-02-18
@@ -290,9 +294,12 @@ mapAliases ({
vimprobable2Wrapper = vimprobable2; # added 2015-01
virtviewer = virt-viewer; # added 2015-12-24
vorbisTools = vorbis-tools; # added 2016-01-26
weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06
weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22
wireguard = wireguard-tools; # added 2018-05-19
morituri = whipper; # added 2018-09-13
x11 = xlibsWrapper; # added 2015-09
xbmc = kodi; # added 2018-04-25
xbmcPlain = kodiPlain; # added 2018-04-25
File diff suppressed because it is too large Load Diff
+12 -135
View File
@@ -402,50 +402,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
Deedle = buildDotnetPackage rec {
Deedle = fetchNuGet rec {
baseName = "Deedle";
version = "1.2.0";
src = fetchFromGitHub {
owner = "BlueMountainCapital";
repo = baseName;
rev = "v${version}";
sha256 = "115zzh3q57w8wr02cl2v8wijnj1rg01j1mk9zbzixbb4aird72n5";
};
# Enough files from this repo are needed that it will be quicker to just get the entire repo
fsharpDataSrc = fetchFromGitHub {
owner = "fsharp";
repo = "FSharp.Data";
rev = "2.2.3";
sha256 = "1h3v9rc8k0khp61cv5n01larqbxd3xcx3q52sw5zf9l0661vw7qr";
};
buildInputs = [
fsharp
dotnetPackages.FsCheck
dotnetPackages.FSharpCompilerService
dotnetPackages.FSharpData
dotnetPackages.FSharpFormatting
dotnetPackages.MathNetNumerics
dotnetPackages.NUnit
];
preConfigure = ''
mkdir -vp paket-files/fsharp
ln -sv ${fsharpDataSrc} paket-files/fsharp/FSharp.Data
'';
xBuildFiles = [ "Deedle.Core.sln" ]; # Come back later to get RProvider as well
outputFiles = [ "bin/*" "LICENSE.md" ];
meta = {
description = "Deedle is an easy to use library for data and time series manipulation and for scientific programming";
homepage = "http://bluemountaincapital.github.io/Deedle/";
license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [ obadz ];
platforms = with stdenv.lib.platforms; linux;
};
version = "1.2.5";
sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw";
outputFiles = [ "*" ];
};
ExcelDna = buildDotnetPackage rec {
@@ -871,40 +832,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
NewtonsoftJson = buildDotnetPackage rec {
NewtonsoftJson = fetchNuGet {
baseName = "Newtonsoft.Json";
version = "6.0.8";
src = fetchurl {
name = "${baseName}-${version}.tar.gz";
url = "https://github.com/JamesNK/Newtonsoft.Json/archive/${version}.tar.gz";
sha256 = "14znf5mycka578bxjnlnz6a3f9nfkc682hgmgg42gdzksnarvhlm";
};
buildInputs = [
fsharp
dotnetPackages.NUnit
dotnetPackages.SystemCollectionsImmutable
dotnetPackages.Autofac
];
patches = [ ../development/dotnet-modules/patches/newtonsoft-json.references.patch ];
postConfigure = ''
# Just to make sure there's no attempt to call these executables
rm -rvf Tools
'';
xBuildFiles = [ "Src/Newtonsoft.Json.sln" ];
outputFiles = [ "Src/Newtonsoft.Json/bin/Release/Net45/*" ];
meta = {
description = "Popular high-performance JSON framework for .NET";
homepage = "https://www.newtonsoft.com/json";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ obadz ];
platforms = with stdenv.lib.platforms; linux;
};
version = "11.0.2";
sha256 = "07na27n4mlw77f3hg5jpayzxll7f4gyna6x7k9cybmxpbs6l77k7";
outputFiles = [ "*" ];
};
Nuget = buildDotnetPackage {
@@ -927,66 +859,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
exeFiles = [ "nuget.exe" ];
};
Paket = buildDotnetPackage rec {
Paket = fetchNuGet {
baseName = "Paket";
version = "1.18.2";
src = fetchFromGitHub {
owner = "fsprojects";
repo = "Paket";
rev = version;
sha256 = "04iwy3mggz7xn36lhzyrwqzlw451a16jblwx131qjm6fnac6rq1m";
};
buildInputs = [
fsharp
dotnetPackages.NewtonsoftJson
dotnetPackages.UnionArgParser
dotnetPackages.NUnit
];
fileFsUnit = fetchurl {
name = "FsUnit.fs";
url = https://raw.githubusercontent.com/forki/FsUnit/81d27fd09575a32c4ed52eadb2eeac5f365b8348/FsUnit.fs;
sha256 = "1zxigqgb2s2v755622jbbzibvf91990x2dijhbdgg646vsybkpdp";
};
fileGlobbing = fetchurl {
name = "Globbing.fs";
url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/src/app/FakeLib/Globbing/Globbing.fs;
sha256 = "1v7d7666a61j6f8ksh0q40hfsc5b03448viq17xa91xgb7skhyx7";
};
fileErrorHandling = fetchurl {
name = "ErrorHandling.fs";
url = https://raw.githubusercontent.com/fsprojects/Chessie/3017092260b4a59a3b4b25bf8fca6be6eb7487eb/src/Chessie/ErrorHandling.fs;
sha256 = "0ka9ilfbl4izxc1wqd5vlfjnp7n2xcckfhp13gzhqbdx7464van9";
};
postConfigure = ''
# Copy said single-files-in-git-repos
mkdir -p "paket-files/forki/FsUnit"
cp -v "${fileFsUnit}" "paket-files/forki/FsUnit/FsUnit.fs"
mkdir -p "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing"
cp -v "${fileGlobbing}" "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing/Globbing.fs"
mkdir -p "paket-files/fsprojects/Chessie/src/Chessie"
cp -v "${fileErrorHandling}" "paket-files/fsprojects/Chessie/src/Chessie/ErrorHandling.fs"
'';
xBuildFiles = [ "Paket.sln" ];
outputFiles = [ "bin/*" ];
exeFiles = [ "paket.exe" ];
meta = {
description = "A dependency manager for .NET and Mono projects";
homepage = "http://fsprojects.github.io/Paket/";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ obadz ];
platforms = with stdenv.lib.platforms; linux;
};
version = "5.179.1";
sha256 = "11rzna03i145qj08hwrynya548fwk8xzxmg65swyaf19jd7gzg82";
outputFiles = [ "*" ];
};
Projekt = buildDotnetPackage rec {
+1 -26
View File
@@ -178,7 +178,7 @@ let
for file in elpy.el elpy-pkg.el; do
substituteInPlace $file \
--replace "company \"0.8.2\"" "company \"${company.version}\"" \
--replace "find-file-in-project \"3.3\"" "find-file-in-project \"${find-file-in-project.version}\"" \
--replace "find-file-in-project \"3.3\"" "find-file-in-project \"${(melpaPackages self).find-file-in-project.version}\"" \
--replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \
--replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \
--replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\""
@@ -226,31 +226,6 @@ let
ess-R-object-popup =
callPackage ../applications/editors/emacs-modes/ess-R-object-popup { };
find-file-in-project = melpaBuild rec {
pname = "find-file-in-project";
version = "3.5";
src = fetchFromGitHub {
owner = "technomancy";
repo = pname;
rev = "53a8d8174f915d9dcf5ac6954b1c0cae61266177";
sha256 = "0wky8vqg08iw34prbz04bqmhfhj82y93swb8zkz6la2vf9da0gmd";
};
recipe = writeText "recipe" ''
(find-file-in-project
:repo "technomancy/find-file-in-project"
:fetcher github)
'';
meta = {
description = "Quick access to project files in Emacs";
longDescription = ''
Find files in a project quickly.
This program provides a couple methods for quickly finding any file in a
given project. It depends on GNU find.
'';
license = gpl3Plus;
};
};
filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { };
font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { };
+19 -18
View File
@@ -380,35 +380,36 @@ let
luadbi = buildLuaPackage rec {
name = "luadbi-${version}";
version = "0.5";
src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/luadbi/luadbi.${version}.tar.gz";
sha256 = "07ikxgxgfpimnwf7zrqwcwma83ss3wm2nzjxpwv2a1c0vmc684a9";
version = "0.6";
src = fetchFromGitHub {
owner = "mwild1";
repo = "luadbi";
rev = "v${version}";
sha256 = "1cpl84pl75wqd9zph3w4srd5lxij359p8xmmf7xpdbxz67695vah";
};
sourceRoot = ".";
buildInputs = [ mysql.connector-c postgresql sqlite ];
MYSQL_INC="-I${mysql.connector-c}/include/mysql";
preConfigure = ''
substituteInPlace Makefile --replace CC=gcc CC=cc
'' + stdenv.lib.optionalString stdenv.isDarwin ''
buildInputs = [ mysql postgresql sqlite ];
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile \
--replace '-shared' '-bundle -undefined dynamic_lookup -all_load'
'';
NIX_CFLAGS_COMPILE = [
"-I${mysql.connector-c}/include/mysql"
"-L${mysql.connector-c}/lib/mysql"
"-I${postgresql}/include/server"
installFlags = [
"LUA_CDIR=$(out)/lib/lua/${lua.luaversion}"
"LUA_LDIR=$(out)/share/lua/${lua.luaversion}"
];
installPhase = ''
mkdir -p $out/lib/lua/${lua.luaversion}
install -p DBI.lua *.so $out/lib/lua/${lua.luaversion}
'';
installTargets = [
"install_lua" "install_mysql" "install_psql" "install_sqlite3"
];
meta = with stdenv.lib; {
homepage = "https://code.google.com/archive/p/luadbi/";
homepage = https://github.com/mwild1/luadbi;
license = licenses.mit;
platforms = stdenv.lib.platforms.unix;
};
};
+3 -3
View File
@@ -54,7 +54,7 @@ releaseTools.sourceTarball rec {
mkdir $TMPDIR/foo
ln -s $(readlink -f .) $TMPDIR/foo/bar
p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace)
p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox)
p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox --show-trace)
if [ "$p1" != "$p2" ]; then
echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!"
exit 1
@@ -63,9 +63,9 @@ releaseTools.sourceTarball rec {
# Run the regression tests in `lib'.
if
# `set -e` doesn't work inside here, so need to && instead :(
res="$(nix-instantiate --eval --strict lib/tests/misc.nix)" \
res="$(nix-instantiate --eval --strict lib/tests/misc.nix --show-trace)" \
&& [[ "$res" == "[ ]" ]] \
&& res="$(nix-instantiate --eval --strict lib/tests/systems.nix)" \
&& res="$(nix-instantiate --eval --strict lib/tests/systems.nix --show-trace)" \
&& [[ "$res" == "[ ]" ]]
then
true
+10 -2
View File
@@ -220,6 +220,12 @@ let
digestif = callPackage ../development/ocaml-modules/digestif { };
doc-ock = callPackage ../development/ocaml-modules/doc-ock { };
doc-ock-html = callPackage ../development/ocaml-modules/doc-ock-html { };
doc-ock-xml = callPackage ../development/ocaml-modules/doc-ock-xml { };
dolmen = callPackage ../development/ocaml-modules/dolmen { };
dolog = callPackage ../development/ocaml-modules/dolog { };
@@ -240,8 +246,6 @@ let
erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { };
erm_xmpp_0_3 = callPackage ../development/ocaml-modules/erm_xmpp/0.3.nix { };
estring = callPackage ../development/ocaml-modules/estring { };
ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { };
@@ -535,6 +539,8 @@ let
octavius = callPackage ../development/ocaml-modules/octavius { };
odoc = callPackage ../development/ocaml-modules/odoc { };
ojquery = callPackage ../development/ocaml-modules/ojquery { };
omd = callPackage ../development/ocaml-modules/omd { };
@@ -564,6 +570,8 @@ let
result = callPackage ../development/ocaml-modules/ocaml-result { };
seq = callPackage ../development/ocaml-modules/seq { };
sequence = callPackage ../development/ocaml-modules/sequence { };
spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
+21 -81
View File
@@ -1250,7 +1250,6 @@ let
meta = {
description = "Serves PODs right from your Catalyst application";
license = stdenv.lib.licenses.bsd3;
maintainers = [ maintainers.rycee ];
};
};
@@ -1478,7 +1477,6 @@ let
propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ];
meta = {
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -1506,7 +1504,6 @@ let
meta = {
description = "Catalyst Plugin for Log::Handler";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ stdenv.lib.maintainers.rycee ];
};
};
@@ -1534,7 +1531,6 @@ let
meta = {
description = "Per-session custom expiry times";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ stdenv.lib.maintainers.rycee ];
};
};
@@ -1572,7 +1568,6 @@ let
meta = {
description = "File storage backend for session data";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ stdenv.lib.maintainers.rycee ];
};
};
@@ -1614,7 +1609,6 @@ let
meta = {
description = "Handle passing of status messages between screens of a web application";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ stdenv.lib.maintainers.rycee ];
};
};
@@ -1629,7 +1623,6 @@ let
meta = {
description = "CSV view class";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -1752,7 +1745,6 @@ let
meta = {
description = "Handle Common Gateway Interface requests and responses";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -1895,7 +1887,6 @@ let
meta = {
description = "Unified cache handling interface";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -2509,7 +2500,6 @@ let
homepage = https://github.com/rjbs/Config-INI;
description = "Simple .ini-file format";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -2568,7 +2558,6 @@ let
homepage = https://github.com/rjbs/Config-MVP;
description = "Multivalue-property package-oriented configuration";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -2631,6 +2620,7 @@ let
prePatch = ''
# Attempts to use network.
rm t/01-proxy-http.t
rm t/01-proxy-proc-safeexec.t
'';
meta = {
description = "A generic connection to a hierarchical-structured data set";
@@ -2801,7 +2791,6 @@ let
meta = {
description = "Read and write Changes files";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ rycee ];
};
};
@@ -3074,7 +3063,6 @@ let
meta = with stdenv.lib; {
description = "Perl wrapper around OpenSSL's AES library";
license = with licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
platforms = platforms.unix;
};
};
@@ -3561,7 +3549,6 @@ let
meta = {
description = "Domain and host name validation";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -3576,7 +3563,6 @@ let
meta = {
description = "IPv4 and IPv6 validation methods";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -3590,7 +3576,6 @@ let
meta = {
description = "Common URL validation methods";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -3823,7 +3808,6 @@ let
meta = {
description = "Parse and format MySQL dates and times";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -4333,7 +4317,6 @@ let
meta = {
description = "Adding keywords to perl, in perl";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ rycee ];
};
};
@@ -4495,7 +4478,6 @@ let
meta = {
description = "Perl extension for 32 bit Jenkins Hashing Algorithm";
license = stdenv.lib.licenses.artistic2;
maintainers = [ maintainers.rycee ];
};
};
@@ -4915,7 +4897,6 @@ let
homepage = https://github.com/rjbs/Email-Abstract;
description = "Unified interface to mail representations";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -4967,7 +4948,6 @@ let
homepage = https://github.com/rjbs/Email-Date-Format;
description = "Produce RFC 2822 date strings";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -5009,7 +4989,6 @@ let
homepage = https://github.com/rjbs/Email-MIME;
description = "Easy MIME message handling";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ rycee ];
};
};
@@ -5038,7 +5017,6 @@ let
homepage = https://github.com/rjbs/Email-MIME-ContentType;
description = "Parse a MIME Content-Type Header";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ rycee ];
};
propagatedBuildInputs = [ Encode ];
};
@@ -5054,7 +5032,6 @@ let
homepage = https://github.com/rjbs/Email-MIME-Encodings;
description = "A unified interface to MIME encoding and decoding";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ rycee ];
};
};
@@ -5069,7 +5046,6 @@ let
homepage = https://github.com/rjbs/Email-Send;
description = "Simply Sending Email";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
buildInputs = [ MIMETools MailTools ];
};
@@ -5102,7 +5078,6 @@ let
homepage = https://github.com/rjbs/Email-Sender;
description = "A library for sending email";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -5117,7 +5092,6 @@ let
homepage = https://github.com/rjbs/Email-Simple;
description = "Simple parsing of RFC2822 message format and headers";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -5140,7 +5114,6 @@ let
propagatedBuildInputs = [ EmailValid ];
meta = {
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -5220,7 +5193,6 @@ let
meta = {
description = "Determine the locale encoding";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -5936,7 +5908,6 @@ let
meta = {
description = "Determine MIME types of data or files using libmagic";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -6053,7 +6024,6 @@ let
meta = {
description = "Read a file backwards by lines";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -6239,7 +6209,6 @@ let
homepage = https://github.com/tommybutler/file-util/wiki;
description = "Easy, versatile, portable file handling";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -6352,7 +6321,6 @@ let
meta = {
description = "Validation with simple chains of constraints";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
buildInputs = [ CGI ];
};
@@ -6465,10 +6433,10 @@ let
};
GetoptLongDescriptive = buildPerlPackage rec {
name = "Getopt-Long-Descriptive-0.103";
name = "Getopt-Long-Descriptive-0.102";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
sha256 = "70e1bae7404a9dfb638b5d12e5bd4ea97e3bee743a4555909307d68e0111f4b2";
sha256 = "9ad4b98f294aa0515cc3150a1ae878d39e470762b78d8bd9df055eba9dea2846";
};
buildInputs = [ CPANMetaCheck TestFatal TestWarnings ];
propagatedBuildInputs = [ ParamsValidate SubExporter ];
@@ -6868,7 +6836,6 @@ let
meta = {
description = "Provide the stuff missing in Hash::Util";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -7591,7 +7558,6 @@ let
meta = {
description = "Alternative but compatible interface to modules that export symbols";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -7694,7 +7660,6 @@ let
meta = {
description = "Open an HTML file with automatic charset detection";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -7825,7 +7790,6 @@ let
meta = {
description = "IO::Socket with read/write timeout";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -8785,7 +8749,6 @@ let
homepage = https://github.com/preaction/Log-Any;
description = "Bringing loggers and listeners together";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -8830,7 +8793,6 @@ let
meta = {
description = "Log messages to several outputs";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -8890,7 +8852,6 @@ let
homepage = https://mschilli.github.io/log4perl/;
description = "Log4j implementation for Perl";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -9221,7 +9182,6 @@ let
meta = {
description = "Various e-mail related modules";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -9510,7 +9470,6 @@ let
meta = {
description = "Low-calorie MIME generator (DEPRECATED)";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -9551,7 +9510,6 @@ let
homepage = https://github.com/rjbs/mixin-linewise;
description = "Write your linewise code for handles; this does the rest";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -9692,11 +9650,12 @@ let
sha256 = "004ly9xxjlsbrr2vhxsa1n84z3034gxrzr7z0wl45szd8v1v6qwh";
};
buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ];
propagatedBuildInputs = [ DevelCheckCompiler ];
perlPreHook = "export LD=$CC";
meta = {
description = "A Module::Build class for building XS modules";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
propagatedBuildInputs = [ DevelCheckCompiler ];
};
ModuleCPANTSAnalyse = buildPerlPackage rec {
@@ -10030,24 +9989,28 @@ let
license = stdenv.lib.licenses.asl20;
};
};
Mojolicious = buildPerlPackage rec {
name = "Mojolicious-7.93";
name = "Mojolicious-8.0";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
sha256 = "00c30fc566fee0823af0a75bdf4f170531655df14beca6d51f0e453a43aaad5d";
sha256 = "b266fd32f12cca2504be012e785f34eb09c0a132df52be183ff5d494e87f0b98";
};
buildInputs = [ ExtUtilsMakeMaker ];
propagatedBuildInputs = [ IOSocketIP JSONPP PodSimple TimeLocal ];
meta = {
homepage = https://mojolicious.org/;
homepage = https://mojolicious.org;
description = "Real-time web framework";
license = with stdenv.lib.licenses; [ artistic2 ];
license = stdenv.lib.licenses.artistic2;
maintainers = [ maintainers.thoughtpolice ];
};
};
MojoIOLoopForkCall = buildPerlModule rec {
name = "Mojo-IOLoop-ForkCall-0.19";
name = "Mojo-IOLoop-ForkCall-0.20";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz";
sha256 = "a436b71c7d1450f79b9810f4f46e24f5ffe1e1428da473d4315673e08e4dec62";
sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b";
};
propagatedBuildInputs = [ IOPipely Mojolicious ];
meta = {
@@ -10095,7 +10058,6 @@ let
meta = {
description = "Minimalist Object Orientation (with Moose compatibility)";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -10403,7 +10365,6 @@ let
homepage = https://github.com/gfx/mousex-getopt;
description = "A Mouse role for processing command line options";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -10504,7 +10465,6 @@ let
homepage = https://github.com/moose/MooseX-Getopt;
description = "A Moose role for processing command line options";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -10763,7 +10723,6 @@ let
homepage = https://github.com/moose/MooseX-Types;
description = "Organise your Moose types in libraries";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -10929,6 +10888,7 @@ let
sha256 = "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l";
};
buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ];
perlPreHook = "export LD=$CC";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector";
hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
};
@@ -11060,7 +11020,6 @@ let
meta = {
description = "Manages IPv4 and IPv6 addresses and subnets";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -11253,7 +11212,6 @@ let
meta = {
description = "Work with TLD names";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -11694,6 +11652,8 @@ let
sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9";
};
buildInputs = [ pkgs.zookeeper_mt ];
# fix "error: format not a string literal and no format arguments [-Werror=format-security]"
hardeningDisable = stdenv.lib.optional (stdenv.lib.versionAtLeast perl.version "5.28") "format";
NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include";
NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt";
meta = {
@@ -11794,7 +11754,6 @@ let
homepage = https://github.com/dluxhu/perl-parallel-forkmanager;
description = "A simple parallel processing fork manager";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -12189,7 +12148,6 @@ let
meta = {
description = "A PerlIO layer that adds read & write timeout to a handle";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -12811,7 +12769,6 @@ let
homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger;
description = "A thing that takes a string of Perl and rewrites its documentation";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -12852,7 +12809,6 @@ let
homepage = https://github.com/neilb/Pod-POM;
description = "POD Object Model";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -12866,7 +12822,6 @@ let
meta = {
description = "Generate the TOC of a POD with Pod::POM";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -13041,7 +12996,6 @@ let
homepage = https://github.com/rjbs/Pod-Weaver;
description = "Weave together a Pod document from an outline";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -13105,7 +13059,6 @@ let
homepage = https://github.com/sanko/readonly;
description = "Facility for creating read-only scalars, arrays, hashes";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -13130,7 +13083,6 @@ let
homepage = https://github.com/PerlRedis/perl-redis;
description = "Perl binding for Redis database";
license = stdenv.lib.licenses.artistic2;
maintainers = [ maintainers.rycee ];
platforms = stdenv.lib.platforms.unix;
};
};
@@ -13318,7 +13270,6 @@ let
meta = {
description = "Roles. Like a nouvelle cuisine portion size slice of Moose";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -13593,7 +13544,6 @@ let
homepage = https://github.com/rjbs/Software-License;
description = "Packages that provide templated software licenses";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -14147,7 +14097,6 @@ let
homepage = https://github.com/rjbs/Sub-Exporter-ForMethods;
description = "Helper routines for using Sub::Exporter to build methods";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -14201,7 +14150,6 @@ let
meta = {
description = "Tool for inspecting subroutines";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -14228,7 +14176,6 @@ let
homepage = https://github.com/p5sagit/Sub-Name;
description = "(Re)name a sub";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -14408,7 +14355,6 @@ let
meta = {
description = "Perl interface to the UNIX syslog(3) calls";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -14797,7 +14743,6 @@ let
meta = {
description = "Format a header and rows into a table";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -14873,7 +14818,6 @@ let
meta = {
description = "Distribution with a rich set of tools built upon the Test2 framework";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -14925,6 +14869,7 @@ let
meta = {
description = "Aggregate C<*.t> tests to make them run faster";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
broken = stdenv.lib.versionAtLeast perl.version "5.26"; # This module only works with Test::More version < 1.3, but you have 1.302133
};
};
@@ -14963,7 +14908,6 @@ let
meta = {
description = "Easily create test classes in an xUnit/JUnit style";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -15172,7 +15116,6 @@ let
homepage = https://github.com/rjbs/Test-Fatal;
description = "Incredibly simple helpers for testing code with exceptions";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -15725,6 +15668,7 @@ let
};
buildInputs = [ TestRun TestTrap ];
propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ];
doCheck = !stdenv.isDarwin;
meta = {
homepage = http://web-cpan.berlios.de/modules/Test-Run/;
description = "Analyze tests from the command line using Test::Run";
@@ -15859,7 +15803,6 @@ let
meta = {
description = "Basic utilities for writing tests";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -16014,7 +15957,6 @@ let
homepage = https://github.com/karenetheridge/Test-Warnings;
description = "Test for warnings and the lack of them";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -16211,7 +16153,6 @@ let
meta = {
description = "Comma-separated values manipulator (using XS or PurePerl)";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -16225,7 +16166,6 @@ let
meta = {
description = "Encoding aware Text::CSV";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -16733,7 +16673,6 @@ let
homepage = https://github.com/rjbs/Throwable;
description = "A role for classes that can be thrown";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
@@ -17056,6 +16995,7 @@ let
meta = {
description = "Turns ref() into a multimethod";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
broken = stdenv.lib.versionAtLeast perl.version "5.26"; # 'OP {aka struct op}' has no member named 'op_sibling'
};
};
+10 -10
View File
@@ -198,9 +198,9 @@ let
};
xdebug26 = assert isPhp7; buildPecl {
name = "xdebug-2.6.0";
name = "xdebug-2.6.1";
sha256 = "1p6b54ypi5lq4ka3pyy2gswdf1d5vjb9y8lp9fqcp3zn7g04q9mm";
sha256 = "0xxxy6n4lv7ghi9liqx133yskg07lw316vhcds43n1sjq3b93rns";
doCheck = true;
checkTarget = "test";
@@ -335,11 +335,11 @@ let
composer = pkgs.stdenv.mkDerivation rec {
name = "composer-${version}";
version = "1.6.5";
version = "1.7.2";
src = pkgs.fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "0d1lpvq8wylh5qgxhbqb5r7j3c6qk0bz4b5vg187jsl6z6fvxgk7";
sha256 = "03km8qw3nshj7qzk5pidziha2ldx1l2yxhh2s7vpg25f9782hd7c";
};
unpackPhase = ":";
@@ -450,11 +450,11 @@ let
phpcs = pkgs.stdenv.mkDerivation rec {
name = "phpcs-${version}";
version = "3.3.1";
version = "3.3.2";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
sha256 = "0kw1ffr688wbcip2hmr7yi7bpdf4kzwh22yvxw17lyddzq6vrqaw";
sha256 = "0np3bsj32mwyrcccw5pgypz7wchd5l89bq951w9a7bxh80gjhak9";
};
phases = [ "installPhase" ];
@@ -477,11 +477,11 @@ let
phpcbf = pkgs.stdenv.mkDerivation rec {
name = "phpcbf-${version}";
version = "3.3.1";
version = "3.3.2";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
sha256 = "0q75h8y4rbysyzh3i5nzqqln2d8592p0sz6y11rr2hz0g9qw4gim";
sha256 = "1qxcd7lkqrfjibkrqq1f5szrcjmd6682mwaxha7v93pj9f92wgn4";
};
phases = [ "installPhase" ];
@@ -504,11 +504,11 @@ let
psysh = pkgs.stdenv.mkDerivation rec {
name = "psysh-${version}";
version = "0.9.6";
version = "0.9.8";
src = pkgs.fetchurl {
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
sha256 = "06icmyn7v229mpfplqj76kjnp1gh4ns0nrxa7bsckyqhzi425kc6";
sha256 = "0xs9bl0hplkm2hajmm4qca65bm2x7wnx4vbmk0d2jxpvwrgqgnzd";
};
phases = [ "installPhase" ];
+109 -303
View File
@@ -216,6 +216,8 @@ in {
backports_csv = callPackage ../development/python-modules/backports_csv {};
backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
bap = callPackage ../development/python-modules/bap {
bap = pkgs.ocamlPackages.bap;
};
@@ -288,6 +290,8 @@ in {
distorm3 = callPackage ../development/python-modules/distorm3 { };
distributed = callPackage ../development/python-modules/distributed { };
docutils = callPackage ../development/python-modules/docutils { };
dogtail = callPackage ../development/python-modules/dogtail { };
@@ -298,6 +302,10 @@ in {
fire = callPackage ../development/python-modules/fire { };
fuse = callPackage ../development/python-modules/fuse-python { fuse = pkgs.fuse; };
genanki = callPackage ../development/python-modules/genanki { };
globus-sdk = callPackage ../development/python-modules/globus-sdk { };
goocalendar = callPackage ../development/python-modules/goocalendar { };
@@ -334,6 +342,8 @@ in {
mail-parser = callPackage ../development/python-modules/mail-parser { };
markerlib = callPackage ../development/python-modules/markerlib { };
monty = callPackage ../development/python-modules/monty { };
mpi4py = callPackage ../development/python-modules/mpi4py {
@@ -378,6 +388,8 @@ in {
phonopy = callPackage ../development/python-modules/phonopy { };
pims = callPackage ../development/python-modules/pims { };
plantuml = callPackage ../tools/misc/plantuml { };
pymysql = callPackage ../development/python-modules/pymysql { };
@@ -461,10 +473,14 @@ in {
pykerberos = callPackage ../development/python-modules/pykerberos { };
pykeepass = callPackage ../development/python-modules/pykeepass { };
pymatgen = callPackage ../development/python-modules/pymatgen { };
pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { };
pymsgbox = callPackage ../development/python-modules/pymsgbox { };
pynisher = callPackage ../development/python-modules/pynisher { };
pyparser = callPackage ../development/python-modules/pyparser { };
@@ -495,8 +511,12 @@ in {
pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
python-binance = callPackage ../development/python-modules/python-binance { };
python-hosts = callPackage ../development/python-modules/python-hosts { };
python-lz4 = callPackage ../development/python-modules/python-lz4 { };
python-igraph = callPackage ../development/python-modules/python-igraph {
pkgconfig = pkgs.pkgconfig;
igraph = pkgs.igraph;
@@ -536,8 +556,12 @@ in {
seekpath = callPackage ../development/python-modules/seekpath { };
selectors2 = callPackage ../development/python-modules/selectors2 { };
serversyncstorage = callPackage ../development/python-modules/serversyncstorage {};
shellingham = callPackage ../development/python-modules/shellingham {};
simpleeval = callPackage ../development/python-modules/simpleeval { };
singledispatch = callPackage ../development/python-modules/singledispatch { };
@@ -550,6 +574,8 @@ in {
slackclient = callPackage ../development/python-modules/slackclient { };
slicerator = callPackage ../development/python-modules/slicerator { };
spglib = callPackage ../development/python-modules/spglib { };
statistics = callPackage ../development/python-modules/statistics { };
@@ -568,6 +594,8 @@ in {
trio = callPackage ../development/python-modules/trio {};
sniffio = callPackage ../development/python-modules/sniffio { };
tokenserver = callPackage ../development/python-modules/tokenserver {};
toml = callPackage ../development/python-modules/toml { };
@@ -980,6 +1008,8 @@ in {
inherit (pkgs) gcc wirelesstools;
};
base58 = callPackage ../development/python-modules/base58 {};
batinfo = callPackage ../development/python-modules/batinfo {};
bcdoc = callPackage ../development/python-modules/bcdoc {};
@@ -1093,6 +1123,8 @@ in {
};
blessed = callPackage ../development/python-modules/blessed {};
block-io = callPackage ../development/python-modules/block-io {};
# Build boost for this specific Python version
# TODO: use separate output for libboost_python.so
@@ -1448,6 +1480,8 @@ in {
disabled = !isPy27;
buildInputs = optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
src = pkgs.fetchurl {
url = "http://cddb-py.sourceforge.net/${name}.tar.gz";
sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
@@ -1512,6 +1546,10 @@ in {
click = callPackage ../development/python-modules/click {};
click-completion = callPackage ../development/python-modules/click-completion {};
click-didyoumean = callPackage ../development/python-modules/click-didyoumean {};
click-log = callPackage ../development/python-modules/click-log {};
click-plugins = callPackage ../development/python-modules/click-plugins {};
@@ -1645,6 +1683,12 @@ in {
envs = callPackage ../development/python-modules/envs { };
eth-hash = callPackage ../development/python-modules/eth-hash { };
eth-typing = callPackage ../development/python-modules/eth-typing { };
eth-utils = callPackage ../development/python-modules/eth-utils { };
jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { };
jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { };
@@ -1704,35 +1748,7 @@ in {
idna = callPackage ../development/python-modules/idna { };
mahotas = buildPythonPackage rec {
name = "python-mahotas-${version}";
version = "1.4.2";
src = pkgs.fetchurl {
url = "https://github.com/luispedro/mahotas/archive/v${version}.tar.gz";
sha256 = "1mvsxh0pa5vdvbknlv1m68n7gw2cv4pyqgqp3r770rnmf6nxbp7m";
};
buildInputs = with self; [
nose
pillow
scipy
];
propagatedBuildInputs = with self; [
numpy
imread
];
disabled = stdenv.isi686; # Failing tests
meta = with stdenv.lib; {
description = "Computer vision package based on numpy";
homepage = http://mahotas.readthedocs.io/;
maintainers = with maintainers; [ luispedro ];
license = licenses.mit;
platforms = platforms.linux;
};
};
mahotas = callPackage ../development/python-modules/mahotas { };
MDP = callPackage ../development/python-modules/mdp {};
@@ -1788,6 +1804,13 @@ in {
doCheck = !isPy3k;
postPatch = ''
substituteInPlace python/setup.py \
--replace "graphviz<0.9.0" "graphviz<0.10.0" \
--replace "numpy<=1.15.0" "numpy<1.16.0" \
--replace "requests<2.19.0" "requests<2.20.0"
'';
preConfigure = ''
cd python
'';
@@ -1824,6 +1847,8 @@ in {
pyjade = callPackage ../development/python-modules/pyjade {};
pyjet = callPackage ../development/python-modules/pyjet {};
PyLD = callPackage ../development/python-modules/PyLD { };
python-jose = callPackage ../development/python-modules/python-jose {};
@@ -1890,6 +1915,8 @@ in {
pytest-django = callPackage ../development/python-modules/pytest-django { };
pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { };
pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { };
pytest-forked = callPackage ../development/python-modules/pytest-forked { };
@@ -1914,6 +1941,8 @@ in {
pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
pytest-repeat = callPackage ../development/python-modules/pytest-repeat { };
pytestrunner = callPackage ../development/python-modules/pytestrunner { };
pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { };
@@ -1975,40 +2004,22 @@ in {
dask = callPackage ../development/python-modules/dask { };
dask-glm = callPackage ../development/python-modules/dask-glm { };
dask-image = callPackage ../development/python-modules/dask-image { };
dask-jobqueue = callPackage ../development/python-modules/dask-jobqueue { };
dask-ml = callPackage ../development/python-modules/dask-ml { };
dask-xgboost = callPackage ../development/python-modules/dask-xgboost { };
datrie = callPackage ../development/python-modules/datrie { };
heapdict = callPackage ../development/python-modules/heapdict { };
zict = callPackage ../development/python-modules/zict { };
distributed = buildPythonPackage rec {
name = "distributed-${version}";
version = "1.15.1";
src = pkgs.fetchurl {
url = "mirror://pypi/d/distributed/${name}.tar.gz";
sha256 = "037a07sdf2ch1d360nqwqz3b4ld8msydng7mw4i5s902v7xr05l6";
};
buildInputs = with self; [ pytest docutils ];
propagatedBuildInputs = with self; [
dask six boto3 s3fs tblib locket msgpack-python click cloudpickle tornado
psutil botocore zict lz4 sortedcollections sortedcontainers
] ++ (if !isPy3k then [ singledispatch ] else []);
# py.test not picking up local config file, even when running
# manually: E ValueError: no option named '--runslow'
doCheck = false;
meta = {
description = "Distributed computation in Python.";
homepage = "http://distributed.readthedocs.io/en/latest/";
license = licenses.bsd3;
maintainers = with maintainers; [ teh ];
};
};
digital-ocean = callPackage ../development/python-modules/digitalocean { };
leather = callPackage ../development/python-modules/leather { };
@@ -2031,6 +2042,8 @@ in {
requests-cache = callPackage ../development/python-modules/requests-cache { };
requests-file = callPackage ../development/python-modules/requests-file { };
requests-kerberos = callPackage ../development/python-modules/requests-kerberos { };
requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {};
@@ -2196,27 +2209,9 @@ in {
elasticsearch = callPackage ../development/python-modules/elasticsearch { };
elasticsearchdsl = buildPythonPackage (rec {
name = "elasticsearch-dsl-0.0.9";
src = pkgs.fetchurl {
url = "mirror://pypi/e/elasticsearch-dsl/${name}.tar.gz";
sha256 = "1gdcdshk881vy18p0czcmbb3i4s5hl8llnfg6961b6x7jkvhihbj";
};
buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 pytz ];
# ImportError: No module named test_elasticsearch_dsl
# Tests require a local instance of elasticsearch
doCheck = false;
meta = {
description = "Python client for Elasticsearch";
homepage = https://github.com/elasticsearch/elasticsearch-dsl-py;
license = licenses.asl20;
maintainers = with maintainers; [ desiderius ];
};
});
elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { };
# alias
elasticsearchdsl = self.elasticsearch-dsl;
elasticsearch-curator = callPackage ../development/python-modules/elasticsearch-curator { };
@@ -2617,48 +2612,9 @@ in {
GeoIP = callPackage ../development/python-modules/GeoIP { };
gmpy = buildPythonPackage rec {
name = "gmpy-1.17";
disabled = isPyPy;
gmpy = callPackage ../development/python-modules/gmpy { };
src = pkgs.fetchurl {
url = "mirror://pypi/g/gmpy/${name}.zip";
sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14";
};
buildInputs = [
pkgs.gcc
pkgs.gmp
];
meta = {
description = "GMP or MPIR interface to Python 2.4+ and 3.x";
homepage = http://code.google.com/p/gmpy/;
};
};
gmpy2 = buildPythonPackage rec {
name = "gmpy2-2.0.6";
disabled = isPyPy;
src = pkgs.fetchurl {
url = "mirror://pypi/g/gmpy2/${name}.zip";
sha256 = "5041d0ae24407c24487106099f5bcc4abb1a5f58d90e6712cc95321975eddbd4";
};
buildInputs = [
pkgs.gcc
pkgs.gmp
pkgs.mpfr
pkgs.libmpc
];
meta = {
description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x";
homepage = http://code.google.com/p/gmpy/;
license = licenses.gpl3Plus;
};
};
gmpy2 = callPackage ../development/python-modules/gmpy2 { };
gmusicapi = with pkgs; buildPythonPackage rec {
name = "gmusicapi-10.1.0";
@@ -3725,6 +3681,8 @@ in {
};
};
phe = callPackage ../development/python-modules/phe { };
phpserialize = callPackage ../development/python-modules/phpserialize { };
plaid-python = callPackage ../development/python-modules/plaid-python { };
@@ -5663,8 +5621,6 @@ in {
};
};
fuse = callPackage ../development/python-modules/python-fuse { fuse = pkgs.fuse; };
fusepy = buildPythonPackage rec {
name = "fusepy-2.0.4";
@@ -5916,14 +5872,14 @@ in {
glances = buildPythonPackage rec {
name = "glances-${version}";
version = "3.0";
version = "3.0.1";
disabled = isPyPy;
src = pkgs.fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
sha256 = "19pymw104l05af710ph69znqiz9av3if7436kigjlwd65gxnghkc";
sha256 = "18pyp6ij3bzybqj771v48n7yn3a1spk6ncg1kgp6hfpjhpqiw87x";
};
# Requires access to /sys/class/power_supply
@@ -6154,13 +6110,13 @@ in {
hetzner = buildPythonPackage rec {
name = "hetzner-${version}";
version = "0.8.0";
version = "0.8.1";
src = pkgs.fetchFromGitHub {
repo = "hetzner";
owner = "aszlig";
rev = "v${version}";
sha256 = "04q2q2w2qkhfly8rfjg2h5pnh42gs18l6cmipqc37yf7qvkw3nd0";
sha256 = "1xd1klvjskv0pg8ginih597jkk491a55b8dq80dsm61m5sbsx3vq";
};
meta = {
@@ -7840,6 +7796,8 @@ in {
mypy = callPackage ../development/python-modules/mypy { };
mypy_extensions = callPackage ../development/python-modules/mypy/extensions.nix { };
mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };
mwclient = buildPythonPackage rec {
@@ -7937,11 +7895,11 @@ in {
graphviz = buildPythonPackage rec {
name = "graphviz-${version}";
version = "0.5.2";
version = "0.9";
src = pkgs.fetchurl {
url = "mirror://pypi/g/graphviz/${name}.zip";
sha256 = "0jh31nlm0qbxwylhdkwnb69pcjlc5z03fcfbs0gvgzp3hfrngsk0";
sha256 = "14r9brj4r31b3qy1nnn34v3l4h0n39bqxg9sn2fz4p3pp5mglnl6";
};
propagatedBuildInputs = [ pkgs.graphviz ];
@@ -9510,31 +9468,7 @@ in {
};
};
pgspecial = buildPythonPackage rec {
pname = "pgspecial";
version = "1.8.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "1dwlv3m4jl34zsakmvxg6hgbfv786jl8dcffxsrlnmcpks829xc9";
};
buildInputs = with self; [ pytest psycopg2 ];
checkPhase = ''
find tests -name \*.pyc -delete
py.test tests
'';
propagatedBuildInputs = with self; [ click sqlparse ];
meta = {
description = "Meta-commands handler for Postgres Database";
homepage = https://pypi.python.org/pypi/pgspecial;
license = licenses.bsd3;
};
};
pgspecial = callPackage ../development/python-modules/pgspecial { };
pickleshare = buildPythonPackage rec {
version = "0.7.4";
@@ -9804,21 +9738,7 @@ in {
psutil = callPackage ../development/python-modules/psutil { };
psycopg2 = buildPythonPackage rec {
name = "psycopg2-2.7.1";
disabled = isPyPy;
src = pkgs.fetchurl {
url = "mirror://pypi/p/psycopg2/${name}.tar.gz";
sha256 = "86c9355f5374b008c8479bc00023b295c07d508f7c3b91dbd2e74f8925b1d9c6";
};
buildInputs = optional stdenv.isDarwin pkgs.openssl;
propagatedBuildInputs = with self; [ pkgs.postgresql ];
doCheck = false;
meta = {
description = "PostgreSQL database adapter for the Python programming language";
license = with licenses; [ gpl2 zpl20 ];
};
};
psycopg2 = callPackage ../development/python-modules/psycopg2 {};
ptpython = callPackage ../development/python-modules/ptpython {};
@@ -10905,6 +10825,8 @@ in {
python-language-server = callPackage ../development/python-modules/python-language-server {};
python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server {};
pyls-black = callPackage ../development/python-modules/pyls-black {};
pyls-isort = callPackage ../development/python-modules/pyls-isort {};
@@ -11209,6 +11131,8 @@ in {
};
});
pyreadability = callPackage ../development/python-modules/pyreadability { };
pyscss = buildPythonPackage rec {
name = "pyScss-${version}";
version = "1.3.5";
@@ -12451,6 +12375,8 @@ in {
shapely = callPackage ../development/python-modules/shapely { };
sharedmem = callPackage ../development/python-modules/sharedmem { };
soco = callPackage ../development/python-modules/soco { };
sopel = buildPythonPackage rec {
@@ -14951,6 +14877,7 @@ EOF
};
tornado = callPackage ../development/python-modules/tornado { };
tornado_4 = callPackage ../development/python-modules/tornado { version = "4.5.3"; };
tokenlib = buildPythonPackage rec {
name = "tokenlib-${version}";
@@ -16286,6 +16213,8 @@ EOF
potr = callPackage ../development/python-modules/potr {};
python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { };
pluggy = callPackage ../development/python-modules/pluggy {};
xcffib = callPackage ../development/python-modules/xcffib {};
@@ -16802,22 +16731,7 @@ EOF
cudaSupport = true;
};
tflearn = buildPythonPackage rec {
name = "tflearn-0.2.1";
meta = {
description = "Deep learning library featuring a higher-level API for TensorFlow";
homepage = "https://github.com/tflearn/tflearn";
license = licenses.mit;
};
propagatedBuildInputs = with self; [ scipy h5py pillow tensorflow ];
src = pkgs.fetchurl {
url = "mirror://pypi/t/tflearn/${name}.tar.gz";
sha256 = "1n884c4j35409id2bncyj5fvmmfpdqj3pk6wrv0s1znnvs0lkii0";
};
};
tflearn = callPackage ../development/python-modules/tflearn { };
simpleai = buildPythonPackage rec {
version = "0.7.11";
@@ -16960,137 +16874,25 @@ EOF
python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { };
irc = buildPythonPackage rec {
name = "irc-${version}";
version = "14.2.2";
irc = callPackage ../development/python-modules/irc { };
src = pkgs.fetchurl {
url = "mirror://pypi/i/irc/${name}.tar.gz";
sha256 = "0a6qjl4fjj98wxc8gaf5rxg94v7a0ydjdiw6pcka5fy814xl2i28";
};
jaraco_logging = callPackage ../development/python-modules/jaraco_logging { };
doCheck = false;
jaraco_text = callPackage ../development/python-modules/jaraco_text { };
buildInputs = with self; [ setuptools_scm ];
jaraco_collections = callPackage ../development/python-modules/jaraco_collections { };
propagatedBuildInputs = with self; [
six jaraco_logging jaraco_text jaraco_stream jaraco_stream pytz
jaraco_itertools
];
};
jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { };
jaraco_logging = buildPythonPackage rec {
name = "jaraco.logging-${version}";
version = "1.5";
src = pkgs.fetchurl {
url = "mirror://pypi/j/jaraco.logging/${name}.tar.gz";
sha256 = "1lvw9zphiymiiar47kd0x0dbc9x2jks8w1kirg3ff8nd80k95j05";
};
doCheck = false;
buildInputs = with self; [ setuptools_scm ];
propagatedBuildInputs = with self; [ tempora six ];
};
jaraco_text = buildPythonPackage rec {
name = "jaraco.text-${version}";
version = "1.7";
src = pkgs.fetchurl {
url = "mirror://pypi/j/jaraco.text/${name}.tar.gz";
sha256 = "07ccc0zc28sb1kyfyviw3n8f581qynrshqvqg1xsp4gkf1m2ibhh";
};
doCheck = false;
buildInputs = with self; [ setuptools_scm ];
propagatedBuildInputs = with self; [ jaraco_functools jaraco_collections ];
};
jaraco_collections = buildPythonPackage rec {
name = "jaraco.collections-${version}";
version = "1.3.2";
src = pkgs.fetchurl {
url = "mirror://pypi/j/jaraco.collections/${name}.tar.gz";
sha256 = "0mvyn9d4bs5zw9z84wwsbgff6s28vg6h4i8qhyb667fqi7xgr1w5";
};
doCheck = false;
buildInputs = with self; [ setuptools_scm ];
propagatedBuildInputs = with self; [ six jaraco_classes ];
# break dependency cycle
patchPhase = ''
sed -i "/'jaraco.text',/d" setup.py
'';
};
jaraco_itertools = buildPythonPackage rec {
name = "jaraco.itertools-${version}";
version = "1.7.1";
src = pkgs.fetchurl {
url = "mirror://pypi/j/jaraco.itertools/${name}.tar.gz";
sha256 = "0yvxp5nwhy4wc4naq5v152vbnxqcn5k031g089chq2lk5kr7np5z";
};
doCheck = false;
buildInputs = with self; [ setuptools_scm ];
propagatedBuildInputs = with self; [ inflect more-itertools six ];
};
inflect = buildPythonPackage rec {
name = "inflect-${version}";
version = "0.2.5";
src = pkgs.fetchurl {
url = "mirror://pypi/i/inflect/${name}.tar.gz";
sha256 = "065866j9msrivbr74yrag53ch0lav7xz18qvjkiblkhinbfch510";
};
};
inflect = callPackage ../development/python-modules/inflect { };
more-itertools = callPackage ../development/python-modules/more-itertools { };
jaraco_functools = callPackage ../development/python-modules/jaraco_functools { };
jaraco_classes = buildPythonPackage rec {
name = "jaraco.classes-${version}";
version = "1.4";
jaraco_classes = callPackage ../development/python-modules/jaraco_classes { };
src = pkgs.fetchurl {
url = "mirror://pypi/j/jaraco.classes/${name}.tar.gz";
sha256 = "1yn1wa6m5rdhk4grmnycx3i5pzzdlwfx83h944c9g5rqggmg612h";
};
doCheck = false;
buildInputs = with self; [ setuptools_scm ];
};
jaraco_stream = buildPythonPackage rec {
name = "jaraco.stream-${version}";
version = "1.1.1";
src = pkgs.fetchurl {
url = "mirror://pypi/j/jaraco.stream/${name}.tar.gz";
sha256 = "0iwg5ljc2z8wwyl2wv7lldwviwd0q4rsccascyqvqqs0l2rcn4gi";
};
doCheck = false;
buildInputs = with self; [ setuptools_scm ];
propagatedBuildInputs = with self; [ six ];
};
jaraco_stream = callPackage ../development/python-modules/jaraco_stream { };
tempora= callPackage ../development/python-modules/tempora { };
@@ -17145,6 +16947,8 @@ EOF
black = callPackage ../development/python-modules/black { };
bjoern = callPackage ../development/python-modules/bjoern { };
autobahn = callPackage ../development/python-modules/autobahn { };
jsonref = callPackage ../development/python-modules/jsonref { };
@@ -17266,6 +17070,8 @@ EOF
textacy = callPackage ../development/python-modules/textacy { };
tldextract = callPackage ../development/python-modules/tldextract { };
pyemd = callPackage ../development/python-modules/pyemd { };
pulp = callPackage ../development/python-modules/pulp { };
+5 -11
View File
@@ -79,17 +79,11 @@ let
# The old identifiers for cross-compiling. These should eventually be removed,
# and the packages that rely on them refactored accordingly.
platformCompat = self: super: {
buildPlatform = lib.warn
"top-level `buildPlatform` is deprecated since 18.09. Please use `stdenv.buildPlatform`."
super.stdenv.buildPlatform;
hostPlatform = lib.warn
"top-level `hostPlatform` is deprecated since 18.09. Please use `stdenv.hostPlatform`."
super.stdenv.hostPlatform;
targetPlatform = lib.warn
"top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`."
super.stdenv.targetPlatform;
inherit (super.stdenv.hostPlatform) system;
platformCompat = self: super: let
inherit (super.stdenv) buildPlatform hostPlatform targetPlatform;
in {
inherit buildPlatform hostPlatform targetPlatform;
inherit (hostPlatform) system;
};
splice = self: super: import ./splice.nix lib self (buildPackages != null);