diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 95 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 195 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 67 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
5 files changed, 311 insertions, 52 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd4edf1c0dad..4d539d5cb976 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1117,6 +1117,8 @@ with pkgs; flex = flex_2_5_35; }; + cplex = callPackage ../applications/science/math/cplex { releasePath = config.cplex.releasePath or null; }; + cpulimit = callPackage ../tools/misc/cpulimit { }; codesearch = callPackage ../tools/text/codesearch { }; @@ -1486,6 +1488,10 @@ with pkgs; syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; + inherit (callPackages ../servers/rainloop { }) + rainloop-community + rainloop-standard; + ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { @@ -1821,6 +1827,10 @@ with pkgs; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; + libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { + inherit (xorg) libXaw; + }; + skktools = callPackage ../tools/inputmethods/skk/skktools { }; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; @@ -7014,6 +7024,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; + mono514 = callPackage ../development/compilers/mono/5.14.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; mosml = callPackage ../development/compilers/mosml { }; @@ -7026,6 +7041,8 @@ with pkgs; neko = callPackage ../development/compilers/neko { }; + nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { }; + nasm = callPackage ../development/compilers/nasm { }; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; @@ -7458,7 +7475,6 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - perl = perl524; inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -8640,9 +8656,13 @@ with pkgs; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; texinfo = texinfo6; - texinfoInteractive = appendToName "interactive" ( - texinfo.override { interactive = true; } - ); + texinfoInteractive = appendToName "interactive" (texinfo.override { + interactive = true; + # doCheck = true -> some xlocale.h problem with perl 5.28.0 + # (it's mistakenly trying to include the non-existent header) + perl = perl526; + buildPackages = buildPackages // { perl = buildPackages.perl526; }; + }); texi2html = callPackage ../development/tools/misc/texi2html { }; @@ -9651,7 +9671,6 @@ with pkgs; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; - gdktarget = if stdenv.isDarwin then "quartz" else "x11"; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -9659,7 +9678,9 @@ with pkgs; gdktarget = "x11"; }; - gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; + gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + }; gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; @@ -12613,12 +12634,26 @@ with pkgs; ### DEVELOPMENT / PERL MODULES - buildPerlPackage = callPackage ../development/perl-modules/generic perl; - - perlPackages = recurseIntoAttrs (callPackage ./perl-packages.nix { + perl522Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { + perl = perl522; + overrides = (config.perlPackageOverrides or (p: {})) pkgs; + }); + perl524Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { + perl = perl524; + overrides = (config.perlPackageOverrides or (p: {})) pkgs; + }); + perl526Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { + perl = perl526; + overrides = (config.perlPackageOverrides or (p: {})) pkgs; + }); + perl528Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { + perl = perl528; overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); + perlPackages = perl528Packages; + inherit (perlPackages) perl buildPerlPackage; + perlXMLParser = perlPackages.XMLParser; ack = perlPackages.ack; @@ -13484,6 +13519,8 @@ with pkgs; microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; + iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { }; + inherit (callPackages ../os-specific/linux/apparmor { python = python3; }) libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches; @@ -15652,7 +15689,14 @@ with pkgs; dbvisualizer = callPackage ../applications/misc/dbvisualizer {}; - dd-agent = callPackage ../tools/networking/dd-agent { }; + dd-agent = callPackage ../tools/networking/dd-agent/5.nix { }; + datadog-agent = callPackage ../tools/networking/dd-agent/6.nix { + pythonPackages = datadog-integrations-core {}; + }; + datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { + python = python27; + extraIntegrations = extras; + }; ddgr = callPackage ../applications/misc/ddgr { }; @@ -16697,6 +16741,8 @@ with pkgs; slack = callPackage ../applications/networking/instant-messengers/slack { }; + slack-cli = callPackage ../tools/networking/slack-cli { }; + singularity = callPackage ../applications/virtualization/singularity { }; spectrwm = callPackage ../applications/window-managers/spectrwm { }; @@ -17277,6 +17323,10 @@ with pkgs; minitube = libsForQt5.callPackage ../applications/video/minitube { }; + mimic = callPackage ../applications/audio/mimic { + pulseaudioSupport = config.pulseaudio or false; + }; + mimms = callPackage ../applications/audio/mimms {}; meh = callPackage ../applications/graphics/meh {}; @@ -18003,6 +18053,8 @@ with pkgs; qt = qt4; }; + qsstv = qt5.callPackage ../applications/misc/qsstv { }; + qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { }; @@ -18154,6 +18206,8 @@ with pkgs; rofi-menugen = callPackage ../applications/misc/rofi-menugen { }; + rofi-systemd = callPackage ../tools/system/rofi-systemd { }; + rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; rstudio = libsForQt5.callPackage ../applications/editors/rstudio { @@ -18303,6 +18357,8 @@ with pkgs; viber = callPackage ../applications/networking/instant-messengers/viber { }; + wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; + sonic-pi = callPackage ../applications/audio/sonic-pi { ruby = ruby_2_3; }; @@ -18838,7 +18894,6 @@ with pkgs; virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; - enableExtensionPack = config.virtualbox.enableExtensionPack or false; pulseSupport = config.pulseaudio or true; }; @@ -18851,6 +18906,12 @@ with pkgs; headless = true; }); + virtualboxExtpack = callPackage ../applications/virtualization/virtualbox/extpack.nix { }; + + virtualboxWithExtpack = lowPrio (virtualbox.override { + extensionPack = virtualboxExtpack; + }); + virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix { fltk = fltk13; }; @@ -19586,6 +19647,8 @@ with pkgs; eternity = callPackage ../games/eternity-engine { }; + eureka-editor = callPackage ../applications/misc/eureka-editor { }; + extremetuxracer = callPackage ../games/extremetuxracer { libpng = libpng12; }; @@ -20396,6 +20459,8 @@ with pkgs; kallisto = callPackage ../applications/science/biology/kallisto { }; + mirtk = callPackage ../development/libraries/science/biology/mirtk { }; + muscle = callPackage ../applications/science/biology/muscle { }; n3 = callPackage ../applications/science/biology/N3 { @@ -20497,6 +20562,8 @@ with pkgs; cliquer = callPackage ../development/libraries/science/math/cliquer { }; + ecos = callPackage ../development/libraries/science/math/ecos { }; + flintqs = callPackage ../development/libraries/science/math/flintqs { }; gurobi = callPackage ../applications/science/math/gurobi { }; @@ -20817,15 +20884,18 @@ with pkgs; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {}; tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {gtk = gtk2;}; - aiger = callPackage ../applications/science/logic/aiger {}; avy = callPackage ../applications/science/logic/avy {}; + btor2tools = callPackage ../applications/science/logic/btor2tools {}; + boolector = callPackage ../applications/science/logic/boolector {}; symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; + lingeling = callPackage ../applications/science/logic/lingeling {}; + ### SCIENCE / ELECTRONICS adms = callPackage ../applications/science/electronics/adms { }; @@ -20872,6 +20942,7 @@ with pkgs; cudnnSupport = cudaSupport; # Used only for image loading. opencv3 = opencv3WithoutCuda; + inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }; caffe2 = callPackage ../development/libraries/science/math/caffe2 { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c7d4c18810f0..7933ca46b98a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -7,7 +7,7 @@ { fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat -, glib, gobjectIntrospection, libevent, zlib, autoreconfHook +, glib, gobjectIntrospection, libevent, zlib, autoreconfHook, gnum4 , mysql, postgresql, cyrus_sasl , fetchFromGitHub, libmpack, which, fetchpatch, writeText }: @@ -43,6 +43,32 @@ let inherit lua; }; + basexx = buildLuaPackage rec { + version = "0.4.0"; + name = "basexx-${version}"; + + src = fetchFromGitHub { + owner = "aiq"; + repo = "basexx"; + rev = "v${version}"; + sha256 = "12y0ng9bp5b98iax35pnp0kc0mb42spv1cbywvfq6amik6l0ya7g"; + }; + + buildPhase = ":"; + installPhase = '' + install -Dt "$out/lib/lua/${lua.luaversion}/" \ + lib/basexx.lua + ''; + + meta = with stdenv.lib; { + description = "Lua library for base2, base16, base32, base64, base85"; + homepage = "https://github.com/aiq/basexx"; + license = licenses.mit; + maintainers = with maintainers; [ vcunat ]; + platforms = platforms.all; + }; + }; + bit32 = buildLuaPackage rec { version = "5.3.0"; name = "bit32-${version}"; @@ -72,6 +98,93 @@ let }; }; + compat53 = buildLuaPackage rec { + version = "0.7"; + name = "compat53-${version}"; + + src = fetchFromGitHub { + owner = "keplerproject"; + repo = "lua-compat-5.3"; + rev = "v${version}"; + sha256 = "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + postConfigure = '' + CFLAGS+=" -shared $(pkg-config --libs ${if isLuaJIT then "luajit" else "lua"})" + ''; + + buildPhase = '' + cc lstrlib.c $CFLAGS -o string.so + cc ltablib.c $CFLAGS -o table.so + cc lutf8lib.c $CFLAGS -o utf8.so + ''; + + # There's no need to separate *.lua and *.so, I guess? TODO: conventions? + installPhase = '' + install -Dt "$out/lib/lua/${lua.luaversion}/compat53" \ + compat53/*.lua *.so + ''; + + meta = with stdenv.lib; { + description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1"; + homepage = "https://github.com/keplerproject/lua-compat-5.3"; + license = licenses.mit; + maintainers = with maintainers; [ vcunat ]; + platforms = platforms.all; + }; + }; + + cqueues = buildLuaPackage rec { + name = "cqueues-${version}"; + version = "20171014"; + + src = fetchurl { + url = "https://www.25thandclement.com/~william/projects/releases/${name}.tgz"; + sha256 = "1dabhpn6r0hlln8vx9hxm34pfcm46qzgpb2apmziwg5z51fi4ksb"; + }; + + preConfigure = ''export prefix=$out''; + + nativeBuildInputs = [ gnum4 ]; + buildInputs = [ openssl ]; + + meta = with stdenv.lib; { + description = "A type of event loop for Lua"; + homepage = "https://www.25thandclement.com/~william/projects/cqueues.html"; + license = licenses.mit; + maintainers = with maintainers; [ vcunat ]; + platforms = platforms.unix; + }; + }; + + fifo = buildLuaPackage rec { + version = "0.2"; + name = "fifo-${version}"; + + src = fetchFromGitHub { + owner = "daurnimator"; + repo = "fifo.lua"; + rev = version; + sha256 = "1800k7h5hxsvm05bjdr65djjml678lwb0661cll78z1ys2037nzn"; + }; + + buildPhase = ":"; + installPhase = '' + mkdir -p "$out/lib/lua/${lua.luaversion}" + mv fifo.lua "$out/lib/lua/${lua.luaversion}/" + ''; + + meta = with stdenv.lib; { + description = "A lua library/'class' that implements a FIFO"; + homepage = "https://github.com/daurnimator/fifo.lua"; + license = licenses.mit; + maintainers = with maintainers; [ vcunat ]; + platforms = platforms.all; + }; + }; + luabitop = buildLuaPackage rec { version = "1.0.2"; name = "bitop-${version}"; @@ -109,6 +222,38 @@ let }; }; + http = buildLuaPackage rec { + version = "0.2"; + name = "http-${version}"; + + src = fetchFromGitHub { + owner = "daurnimator"; + repo = "lua-http"; + rev = "v${version}"; + sha256 = "0a8vsj49alaf1fkhv51n5mgpjq8izfff3shcjs8xk7p2bc46vd7i"; + }; + + /* TODO: separate docs derivation? (pandoc is heavy) + nativeBuildInputs = [ pandoc ]; + makeFlags = [ "-C doc" "lua-http.html" "lua-http.3" ]; + */ + + buildPhase = ":"; + installPhase = '' + install -Dt "$out/lib/lua/${lua.luaversion}/http" \ + http/*.lua + install -Dt "$out/lib/lua/${lua.luaversion}/http/compat" \ + http/compat/*.lua + ''; + + meta = with stdenv.lib; { + description = "HTTP library for lua"; + homepage = "https://daurnimator.github.io/lua-http/${version}/"; + license = licenses.mit; + maintainers = with maintainers; [ vcunat ]; + }; + }; + luacheck = buildLuaPackage rec { pname = "luacheck"; version = "0.20.0"; @@ -298,6 +443,28 @@ let }; }; + luaossl = buildLuaPackage rec { + name = "luaossl-${version}"; + version = "20170903"; + + src = fetchurl { + url = "https://www.25thandclement.com/~william/projects/releases/${name}.tgz"; + sha256 = "10392bvd0lzyibipblgiss09zlqh3a5zgqg1b9lgbybpqb9cv2k3"; + }; + + preConfigure = ''export prefix=$out''; + + buildInputs = [ openssl ]; + + meta = with stdenv.lib; { + description = "Comprehensive binding to OpenSSL for Lua 5.1+"; + homepage = "https://www.25thandclement.com/~william/projects/luaossl.html"; + license = licenses.mit; + maintainers = with maintainers; [ vcunat ]; + platforms = platforms.unix; + }; + }; + luaposix = buildLuaPackage rec { name = "posix-${version}"; version = "34.0.4"; @@ -688,6 +855,32 @@ let }; }; + lpeg_patterns = buildLuaPackage rec { + version = "0.5"; + name = "lpeg_patterns-${version}"; + + src = fetchFromGitHub { + owner = "daurnimator"; + repo = "lpeg_patterns"; + rev = "v${version}"; + sha256 = "1s3c179a64r45ffkawv9dnxw4mzwkzj00nr9z2gs5haajgpjivw6"; + }; + + buildPhase = ":"; + installPhase = '' + mkdir -p "$out/lib/lua/${lua.luaversion}" + mv lpeg_patterns "$out/lib/lua/${lua.luaversion}/" + ''; + + meta = with stdenv.lib; { + description = "A collection of LPEG patterns"; + homepage = "https://github.com/daurnimator/lpeg_patterns"; + license = licenses.mit; + maintainers = with maintainers; [ vcunat ]; + inherit (lpeg.meta) platforms; + }; + }; + cjson = buildLuaPackage rec { name = "cjson-${version}"; version = "2.1.0"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a644438c5a00..94881cf2ff37 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7,13 +7,16 @@ {config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}: -let self = _self // overrides; _self = with self; { +let + inherit (stdenv.lib) maintainers; + self = _self // overrides; + _self = with self; { inherit perl; - inherit (pkgs) buildPerlPackage; + callPackage = pkgs.newScope self; - inherit (stdenv.lib) maintainers; + buildPerlPackage = callPackage ../development/perl-modules/generic { }; # Helper functions for packages that use Module::Build to build. buildPerlModule = { buildInputs ? [], ... } @ args: @@ -751,10 +754,7 @@ let self = _self // overrides; _self = with self; { }; }; - BerkeleyDB = import ../development/perl-modules/BerkeleyDB { - inherit buildPerlPackage fetchurl; - inherit (pkgs) db; - }; + BerkeleyDB = callPackage ../development/perl-modules/BerkeleyDB { }; BHooksEndOfScope = buildPerlPackage rec { name = "B-Hooks-EndOfScope-0.24"; @@ -2424,10 +2424,7 @@ let self = _self // overrides; _self = with self; { }; }; - CompressRawZlib = import ../development/perl-modules/Compress-Raw-Zlib { - inherit fetchurl buildPerlPackage stdenv; - inherit (pkgs) zlib; - }; + CompressRawZlib = callPackage ../development/perl-modules/Compress-Raw-Zlib { }; CompressUnLZMA = buildPerlPackage rec { name = "Compress-unLZMA-0.05"; @@ -4064,30 +4061,15 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; }; - DBDSQLite = import ../development/perl-modules/DBD-SQLite { - inherit stdenv fetchurl buildPerlPackage DBI; - inherit (pkgs) sqlite; - }; + DBDSQLite = callPackage ../development/perl-modules/DBD-SQLite { }; - DBDmysql = import ../development/perl-modules/DBD-mysql { - inherit fetchurl buildPerlPackage DBI; - inherit (pkgs) mysql; - }; + DBDmysql = callPackage ../development/perl-modules/DBD-mysql { }; - DBDPg = import ../development/perl-modules/DBD-Pg { - inherit stdenv fetchurl buildPerlPackage DBI; - inherit (pkgs) postgresql; - }; + DBDPg = callPackage ../development/perl-modules/DBD-Pg { }; - DBDsybase = import ../development/perl-modules/DBD-sybase { - inherit fetchurl buildPerlPackage DBI; - inherit (pkgs) freetds; - }; + DBDsybase = callPackage ../development/perl-modules/DBD-sybase { }; - DBFile = import ../development/perl-modules/DB_File { - inherit fetchurl buildPerlPackage; - inherit (pkgs) db; - }; + DBFile = callPackage ../development/perl-modules/DB_File { }; DBI = buildPerlPackage rec { name = "DBI-${version}"; @@ -9066,9 +9048,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ LWP NetDNS ]; }; - maatkit = import ../development/perl-modules/maatkit { - inherit fetchurl buildPerlPackage stdenv DBDmysql; - }; + maatkit = callPackage ../development/perl-modules/maatkit { }; MacPasteboard = buildPerlPackage rec { name = "Mac-Pasteboard-0.009"; @@ -9561,7 +9541,19 @@ let self = _self // overrides; _self = with self; { }; }; - MNI-Perllib = pkgs.callPackage ../development/perl-modules/MNI {}; + MLDBM = buildPerlPackage rec { + name = "MLDBM-2.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.tar.gz"; + sha256 = "586880ed0c20801abbf6734747e13e0203edefece6ebc4f20ddb5059f02a17a2"; + }; + meta = { + description = "Store multi-level Perl hash structure in single level tied hash"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + MNI-Perllib = callPackage ../development/perl-modules/MNI {}; Mo = buildPerlPackage rec { name = "Mo-0.40"; @@ -11201,8 +11193,9 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz"; sha256 = "8391696db9e96c374b72984c0bad9c7d1c9f3b4efe68f9ddf429a77548e0e269"; }; - buildInputs = [ TestPod TestPodCoverage ]; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.dbus XMLTwig ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ TestPod TestPodCoverage pkgs.dbus ]; + propagatedBuildInputs = [ XMLTwig ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/dbus; description = "Extension for the DBus bindings"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 8592e3136aee..ef6da6ed8042 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -109,7 +109,7 @@ let imagick = buildPecl { name = "imagick-3.4.3"; sha256 = "0z2nc92xfc5axa9f2dy95rmsd2c81q8cs1pm4anh0a50x9g5ng0z"; - configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; + configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.pcre ]; }; @@ -120,7 +120,7 @@ let sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic"; - configureFlags = "--with-zlib-dir=${pkgs.zlib.dev}"; + configureFlags = [ "--with-zlib-dir=${pkgs.zlib.dev}" ]; makeFlags = [ "CFLAGS=-fgnu89-inline" ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1546df815b90..ebbcccd6f3d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17282,6 +17282,8 @@ EOF uranium = callPackage ../development/python-modules/uranium { }; + uuid = callPackage ../development/python-modules/uuid { }; + versioneer = callPackage ../development/python-modules/versioneer { }; vine = callPackage ../development/python-modules/vine { }; |