diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 365 | ||||
-rw-r--r-- | pkgs/top-level/default.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 77 | ||||
-rw-r--r-- | pkgs/top-level/impure.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 132 | ||||
-rw-r--r-- | pkgs/top-level/platforms.nix | 486 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 919 | ||||
-rw-r--r-- | pkgs/top-level/release-cross.nix | 67 | ||||
-rw-r--r-- | pkgs/top-level/release-lib.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/release-python.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/release-small.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/rust-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/splice.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 17 |
16 files changed, 982 insertions, 1152 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9dca8e7e26cd..1046b86dbb44 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -62,6 +62,7 @@ doNotDisplayTwice rec { gnustep-make = gnustep.make; # added 2016-7-6 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 + idea = jetbrains; # added 2017-04-03 inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29caabbda57f..e8df4011bc7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -153,6 +153,8 @@ with pkgs; fetchpatch = callPackage ../build-support/fetchpatch { }; + fetchs3 = callPackage ../build-support/fetchs3 { }; + fetchsvn = callPackage ../build-support/fetchsvn { sshSupport = true; }; @@ -303,7 +305,7 @@ with pkgs; composableDerivation = callPackage ../../lib/composable-derivation.nix { }; - platforms = import ./platforms.nix; + inherit (lib.systems) platforms; setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh; @@ -539,6 +541,8 @@ with pkgs; gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; + glyr = callPackage ../tools/audio/glyr { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; @@ -555,8 +559,6 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; - install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; - xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv = callPackage ../development/mobile/titaniumenv { @@ -654,6 +656,10 @@ with pkgs; blink = callPackage ../applications/networking/instant-messengers/blink { }; + quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; + + tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; + blink1-tool = callPackage ../tools/misc/blink1-tool { }; blitz = callPackage ../development/libraries/blitz { @@ -703,6 +709,8 @@ with pkgs; btrbk = callPackage ../tools/backup/btrbk { }; + buildtorrent = callPackage ../tools/misc/buildtorrent { }; + bwm_ng = callPackage ../tools/networking/bwm-ng { }; byobu = callPackage ../tools/misc/byobu { @@ -768,6 +776,8 @@ with pkgs; ckbcomp = callPackage ../tools/X11/ckbcomp { }; + clac = callPackage ../tools/misc/clac {}; + clasp = callPackage ../tools/misc/clasp { }; cli53 = callPackage ../tools/admin/cli53 { }; @@ -826,6 +836,8 @@ with pkgs; daemontools = callPackage ../tools/admin/daemontools { }; + dale = callPackage ../development/compilers/dale { }; + dante = callPackage ../servers/dante { }; datamash = callPackage ../tools/misc/datamash { }; @@ -873,6 +885,8 @@ with pkgs; ditaa = callPackage ../tools/graphics/ditaa { }; + dino = callPackage ../applications/networking/instant-messengers/dino { }; + dlx = callPackage ../misc/emulators/dlx { }; dosage = pythonPackages.dosage; @@ -911,7 +925,6 @@ with pkgs; facter = callPackage ../tools/system/facter { boost = boost160; - ruby = ruby_2_1; }; fasd = callPackage ../tools/misc/fasd { }; @@ -940,6 +953,8 @@ with pkgs; gdrivefs = python27Packages.gdrivefs; + gdrive = callPackage ../applications/networking/gdrive { }; + go-dependency-manager = callPackage ../development/tools/gdm { }; gencfsm = callPackage ../tools/security/gencfsm { }; @@ -974,9 +989,7 @@ with pkgs; interlock = callPackage ../servers/interlock {}; - jbuilder = callPackage ../development/tools/ocaml/jbuilder { - inherit (ocaml-ng.ocamlPackages_4_03) ocaml; - }; + jbuilder = callPackage ../development/tools/ocaml/jbuilder { }; kapacitor = callPackage ../servers/monitoring/kapacitor { }; @@ -1000,6 +1013,8 @@ with pkgs; mpdris2 = callPackage ../tools/audio/mpdris2 { }; + nfdump = callPackage ../tools/networking/nfdump { }; + playerctl = callPackage ../tools/audio/playerctl { }; syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; @@ -1287,7 +1302,9 @@ with pkgs; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { - protobuf = protobuf.override { stdenv = clangStdenv; }; + python = python2; + inherit (python2Packages) gyp; + protobuf = protobuf3_2.override { stdenv = clangStdenv; }; }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { @@ -1534,6 +1551,8 @@ with pkgs; docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; + dockbarx = callPackage ../applications/misc/dockbarx { }; + dog = callPackage ../tools/system/dog { }; dosfstools = callPackage ../tools/filesystems/dosfstools { }; @@ -1624,7 +1643,7 @@ with pkgs; emscripten = callPackage ../development/compilers/emscripten { }; emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { }; - emscriptenfastcomp-wrapped = wrapCCWith ccWrapperFun stdenv.cc.libc '' + emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc '' # hardening flags break WASM support cat > $out/nix-support/add-hardening.sh '' emscriptenfastcomp-unwrapped; @@ -1717,6 +1736,8 @@ with pkgs; pillow; }; + fanficfare = callPackage ../tools/text/fanficfare { }; + fastd = callPackage ../tools/networking/fastd { }; fatsort = callPackage ../tools/filesystems/fatsort { }; @@ -2481,6 +2502,8 @@ with pkgs; jsduck = callPackage ../development/tools/jsduck { }; + jucipp = callPackage ../applications/editors/jucipp { }; + jwhois = callPackage ../tools/networking/jwhois { }; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; @@ -3047,6 +3070,8 @@ with pkgs; mysqltuner = callPackage ../tools/misc/mysqltuner { }; + mytetra = libsForQt5.callPackage ../applications/office/mytetra { }; + nabi = callPackage ../tools/inputmethods/nabi { }; namazu = callPackage ../tools/text/namazu { }; @@ -3361,6 +3386,8 @@ with pkgs; paperwork = callPackage ../applications/office/paperwork { }; + papertrail = callPackage ../tools/text/papertrail { }; + par2cmdline = callPackage ../tools/networking/par2cmdline { }; parallel = callPackage ../tools/misc/parallel { }; @@ -3492,7 +3519,9 @@ with pkgs; libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_mac = callPackage ../tools/security/pinentry-mac { }; + pinentry_mac = callPackage ../tools/security/pinentry-mac { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; pingtcp = callPackage ../tools/networking/pingtcp { }; @@ -3670,6 +3699,8 @@ with pkgs; radarr = callPackage ../servers/radarr { }; + radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { }; + radvd = callPackage ../tools/networking/radvd { }; rambox = callPackage ../applications/networking/instant-messengers/rambox { }; @@ -4195,7 +4226,14 @@ with pkgs; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - torbrowser = callPackage ../applications/networking/browsers/torbrowser { }; + # added 2017-04-05 + torbrowser = /* builtins.trace '' + [1;31mWARNING[0m: torbrowser package was renamed to tor-browser-bundle-bin. + + Also, consider using nix-built tor-browser-unwrapped package instead. Read its longDescription. + '' */ tor-browser-bundle-bin; + + tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; touchegg = callPackage ../tools/inputmethods/touchegg { }; @@ -4680,6 +4718,8 @@ with pkgs; xsel = callPackage ../tools/misc/xsel { }; + xsv = callPackages ../tools/text/xsv { }; + xtreemfs = callPackage ../tools/filesystems/xtreemfs {}; xurls = callPackage ../tools/text/xurls {}; @@ -4863,7 +4903,7 @@ with pkgs; clangSelf = clangWrapSelf llvmPackagesSelf.clang; - clangWrapSelf = build: callPackage ../build-support/cc-wrapper { + clangWrapSelf = build: ccWrapperFun { cc = build; isClang = true; stdenv = clangStdenv; @@ -4932,8 +4972,8 @@ with pkgs; extraBuildCommands = '' echo "dontMoveLib64=1" >> $out/nix-support/setup-hook ''; - in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (cc.cc.override { - stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" cc.cc); + in wrapCCWith glibc_multi extraBuildCommands (cc.cc.override { + stdenv = overrideCC stdenv (wrapCCWith glibc_multi "" cc.cc); profiledCompiler = false; enableMultilib = true; })) @@ -4949,8 +4989,8 @@ with pkgs; gccCrossStageStatic = assert targetPlatform != buildPlatform; let libcCross1 = - if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers - else if stdenv.cross.libc == "libSystem" then darwin.xcode + if targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers + else if targetPlatform.libc == "libSystem" then darwin.xcode else null; in wrapGCCCross { gcc = forcedNativePackages.gcc.cc.override { @@ -4960,10 +5000,10 @@ with pkgs; libcCross = libcCross1; enableShared = false; # Why is this needed? - inherit (forcedNativePackages) binutilsCross; + inherit (forcedNativePackages) binutils; }; libc = libcCross1; - binutils = binutilsCross; + inherit (forcedNativePackages) binutils; cross = targetPlatform; }; @@ -4971,7 +5011,7 @@ with pkgs; gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapGCCCross { gcc = gccCrossStageStatic.gcc; libc = windows.mingw_headers2; - binutils = binutilsCross; + inherit (forcedNativePackages) binutils; cross = targetPlatform; }; @@ -4980,14 +5020,11 @@ with pkgs; cross = targetPlatform; crossStageStatic = false; - # XXX: We have troubles cross-compiling libstdc++ on MinGW (see - # <http://hydra.nixos.org/build/4268232>), so don't even try. - langCC = targetPlatform.config != "i686-pc-mingw32"; # Why is this needed? - inherit (forcedNativePackages) binutilsCross; + inherit (forcedNativePackages) binutils; }; libc = libcCross; - binutils = binutilsCross; + inherit (forcedNativePackages) binutils; cross = targetPlatform; }; @@ -5085,7 +5122,7 @@ with pkgs; cross = null; libcCross = if targetPlatform != buildPlatform then libcCross else null; - isl = if !stdenv.isDarwin then isl_0_14 else null; + isl = isl_0_17; })); gfortran = gfortran5; @@ -5228,6 +5265,8 @@ with pkgs; all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { }; purescript = haskell.lib.justStaticExecutables haskellPackages.purescript; + psc-package = haskell.lib.justStaticExecutables + (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); inherit (ocamlPackages) haxe; @@ -5243,6 +5282,10 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; + fsharp41 = callPackage ../development/compilers/fsharp41 { + mono = mono46; + }; + fstar = callPackage ../development/compilers/fstar { ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; @@ -5576,6 +5619,8 @@ with pkgs; cargo = rust.cargo; rustc = rust.rustc; + cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + rustPlatform = recurseIntoAttrs (makeRustPlatform rust); makeRustPlatform = rust: lib.fix (self: @@ -5596,6 +5641,9 @@ with pkgs; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; + rustup = callPackage ../development/tools/rust/rustup { + inherit (darwin.apple_sdk.frameworks) Security; + }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; @@ -5680,7 +5728,7 @@ with pkgs; wla-dx = callPackage ../development/compilers/wla-dx { }; - wrapCCWith = ccWrapper: libc: extraBuildCommands: baseCC: ccWrapper { + wrapCCWith = libc: extraBuildCommands: baseCC: ccWrapperFun { nativeTools = stdenv.cc.nativeTools or false; nativeLibc = stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; @@ -5693,7 +5741,7 @@ with pkgs; ccWrapperFun = callPackage ../build-support/cc-wrapper; - wrapCC = wrapCCWith ccWrapperFun stdenv.cc.libc ""; + wrapCC = wrapCCWith stdenv.cc.libc ""; # legacy version, used for gnat bootstrapping wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old { nativeTools = stdenv.cc.nativeTools or false; @@ -5973,7 +6021,7 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl perl520 perl522; + inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -6022,7 +6070,7 @@ with pkgs; # available as `pythonPackages.tkinter` and can be used as any other Python package. python = python2; python2 = python27; - python3 = python35; + python3 = python36; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -6036,9 +6084,9 @@ with pkgs; python36Full = python36.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync - pythonPackages = python2Packages; - python2Packages = python27Packages; - python3Packages = python35Packages; + pythonPackages = python.pkgs; + python2Packages = python2.pkgs; + python3Packages = python3.pkgs; python27 = callPackage ../development/interpreters/python/cpython/2.7 { self = python27; @@ -6048,14 +6096,14 @@ with pkgs; self = python33; inherit (darwin) CF configd; }; - python34 = hiPrio (callPackage ../development/interpreters/python/cpython/3.4 { + python34 = callPackage ../development/interpreters/python/cpython/3.4 { inherit (darwin) CF configd; self = python34; - }); - python35 = hiPrio (callPackage ../development/interpreters/python/cpython/3.5 { + }; + python35 = callPackage ../development/interpreters/python/cpython/3.5 { inherit (darwin) CF configd; self = python35; - }); + }; python36 = callPackage ../development/interpreters/python/cpython/3.6 { inherit (darwin) CF configd; self = python36; @@ -6073,7 +6121,14 @@ with pkgs; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); - pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; }; + pypi2nix = callPackage ../development/tools/pypi2nix { + pythonPackages = python3Packages; + }; + + # These pyside tools do not provide any Python modules and are meant to be here. + # See ../development/python-modules/pyside/default.nix for details. + pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; + pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; svg2tikz = python27Packages.svg2tikz; @@ -6301,20 +6356,16 @@ with pkgs; binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw; - binutils-raw = callPackage ../development/tools/misc/binutils { inherit noSysDirs; }; + binutils-raw = callPackage ../development/tools/misc/binutils { + # FHS sys dirs presumably only have stuff for the build platform + noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; + cross = if targetPlatform != hostPlatform then targetPlatform else null; + }; - binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils { - inherit noSysDirs; + binutils_nogold = lowPrio (binutils-raw.override { gold = false; }); - binutilsCross = assert targetPlatform != buildPlatform; lowPrio ( - if targetPlatform.libc == "libSystem" then darwin.cctools_cross - else forcedNativePackages.binutils.override { - noSysDirs = true; - cross = targetPlatform; - }); - bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; @@ -6401,8 +6452,12 @@ with pkgs; coan = callPackage ../development/tools/analysis/coan { }; + compile-daemon = callPackage ../development/tools/compile-daemon { }; + complexity = callPackage ../development/tools/misc/complexity { }; + conan = callPackage ../development/tools/build-managers/conan { }; + cookiecutter = pythonPackages.cookiecutter; ctags = callPackage ../development/tools/misc/ctags { }; @@ -7735,9 +7790,15 @@ with pkgs; gnutls = gnutls35; - gnutls35 = callPackage ../development/libraries/gnutls/3.5.nix { - guileBindings = config.gnutls.guile or false; - }; + gnutls35 = callPackage + (if stdenv.isDarwin + # Avoid > 3.5.10 due to frameworks for now; see discussion on: + # https://github.com/NixOS/nixpkgs/commit/d6454e6a1 + then ../development/libraries/gnutls/3.5.10.nix + else ../development/libraries/gnutls/3.5.nix) + { + guileBindings = config.gnutls.guile or false; + }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { guileBindings = config.gnutls.guile or false; @@ -7846,6 +7907,10 @@ with pkgs; gtk = gtk2; }; + gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration { + gtk = gtk3; + }; + gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; gtkspell2 = callPackage ../development/libraries/gtkspell { }; @@ -8966,6 +9031,8 @@ with pkgs; libykneomgr = callPackage ../development/libraries/libykneomgr { }; + libytnef = callPackage ../development/libraries/libytnef { }; + libyubikey = callPackage ../development/libraries/libyubikey { }; libzen = callPackage ../development/libraries/libzen { }; @@ -8998,6 +9065,8 @@ with pkgs; log4cplus = callPackage ../development/libraries/log4cplus { }; + log4shib = callPackage ../development/libraries/log4shib { }; + loudmouth = callPackage ../development/libraries/loudmouth { }; luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; @@ -9049,10 +9118,12 @@ with pkgs; in mo.drivers ); + # Please, avoid using this attribute. It was meant as transitional hack + # for packages that assume that libGLU and libGL live in the same prefix. + # Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether + # you need libGLU or not (_glu propagates _noglu). mesa = mesaDarwinOr (buildEnv { name = "mesa-${mesa_noglu.version}"; - # FIXME: this causes mesa to have a runtime dependency on - # mesa_noglu.dev. paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ]; meta = { platforms = lib.platforms.unix; @@ -9255,11 +9326,13 @@ with pkgs; openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; openjpeg = openjpeg_2_1; + opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; + openscenegraph = callPackage ../development/libraries/openscenegraph { }; openslp = callPackage ../development/libraries/openslp {}; - libressl = libressl_2_4; + libressl = libressl_2_5; libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix { fetchurl = fetchurlBoot; }; @@ -9395,6 +9468,11 @@ with pkgs; proj = callPackage ../development/libraries/proj { }; + proselint = callPackage ../tools/text/proselint { + inherit (python3Packages) + buildPythonApplication click future six; + }; + postgis = callPackage ../development/libraries/postgis { }; protobuf = protobuf2_6; @@ -9529,9 +9607,9 @@ with pkgs; grantlee = callPackage ../development/libraries/grantlee/5.x.nix { }; - kirigami_1 = callPackage ../development/libraries/kirigami { }; - - kirigami_2 = callPackage ../development/libraries/kirigami/v2.nix { }; + inherit (callPackage ../development/libraries/kirigami { }) + kirigami_1 + kirigami_2; kirigami = kirigami_1; @@ -9547,6 +9625,10 @@ with pkgs; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + libqtav = callPackage ../development/libraries/libqtav { + libva = libva-full; # also wants libva-x11 + }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { ffmpeg = ffmpeg_2; }; @@ -9647,6 +9729,8 @@ with pkgs; haskell-lib = haskell.lib; }; + lambda-mod-zsh-theme = callPackage ../shells/lambda-mod-zsh-theme/default.nix { }; + leksah = callPackage ../development/tools/haskell/leksah { inherit (haskellPackages) ghcWithPackages; }; @@ -9695,6 +9779,8 @@ with pkgs; sad = callPackage ../applications/science/logic/sad { }; + safefile = callPackage ../development/libraries/safefile {}; + sbc = callPackage ../development/libraries/sbc { }; schroedinger = callPackage ../development/libraries/schroedinger { }; @@ -9767,6 +9853,8 @@ with pkgs; shapelib = callPackage ../development/libraries/shapelib { }; + shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; + skalibs = callPackage ../development/libraries/skalibs { }; slang = callPackage ../development/libraries/slang { }; @@ -10216,6 +10304,8 @@ with pkgs; xml-security-c = callPackage ../development/libraries/xml-security-c { }; + xml-tooling-c = callPackage ../development/libraries/xml-tooling-c { }; + xlslib = callPackage ../development/libraries/xlslib { }; xvidcore = callPackage ../development/libraries/xvidcore { }; @@ -10466,9 +10556,9 @@ with pkgs; python34Packages = python34.pkgs; - python35Packages = recurseIntoAttrs python35.pkgs; + python35Packages = python35.pkgs; - python36Packages = python36.pkgs; + python36Packages = recurseIntoAttrs python36.pkgs; pypyPackages = pypy.pkgs; @@ -10577,6 +10667,8 @@ with pkgs; bosun = callPackage ../servers/monitoring/bosun { }; scollector = bosun; + cayley = callPackage ../servers/cayley { }; + charybdis = callPackage ../servers/irc/charybdis {}; couchdb = callPackage ../servers/http/couchdb { @@ -10845,6 +10937,9 @@ with pkgs; mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { }; + percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { }; + percona-server = percona-server56; + riak = callPackage ../servers/nosql/riak/2.2.0.nix { erlang = erlang_basho_R16B02; }; @@ -10885,7 +10980,11 @@ with pkgs; neo4j = callPackage ../servers/nosql/neo4j { }; - net_snmp = callPackage ../servers/monitoring/net-snmp { }; + net_snmp = callPackage ../servers/monitoring/net-snmp { + # https://sourceforge.net/p/net-snmp/bugs/2712/ + # remove after net-snmp > 5.7.3 + perl = perl522; + }; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; @@ -11627,15 +11726,6 @@ with pkgs; ]; }; - linux_chromiumos_3_14 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.14.nix { - kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_14 - kernelPatches.chromiumos_mfd_fix_dependency - kernelPatches.chromiumos_no_link_restrictions - kernelPatches.genksyms_fix_segfault - kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 - ]; - }; - linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix { kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18 kernelPatches.chromiumos_no_link_restrictions @@ -11816,41 +11906,26 @@ with pkgs; # Build a kernel for Xen dom0 linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); - # Grsecurity packages - - linux_grsec_nixos = callPackage ../build-support/grsecurity { - inherit (lib) overrideDerivation; - kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix { - kernelPatches = with self.kernelPatches; [ - bridge_stp_helper - modinst_arg_list_too_long - ] ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; + # Hardened linux + linux_hardened = linux_4_9.override { + extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { + inherit stdenv; }; - grsecPatch = self.kernelPatches.grsecurity_testing; - kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ]; - extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { }; }; + linuxPackages_hardened = + recurseIntoAttrs (linuxPackagesFor linux_hardened); + + # Grsecurity packages + + linux_grsec_nixos = kernelPatches.grsecurity_testing; + linuxPackages_grsec_nixos = recurseIntoAttrs (linuxPackagesFor linux_grsec_nixos); - # An unsupported grsec xen guest kernel - linux_grsec_server_xen = linux_grsec_nixos.override { - extraConfig = '' - GRKERNSEC_CONFIG_AUTO y - GRKERNSEC_CONFIG_PRIORITY_SECURITY y - GRKERNSEC_CONFIG_SERVER y - GRKERNSEC_CONFIG_VIRT_GUEST y - GRKERNSEC_CONFIG_VIRT_XEN y - ''; - }; + linux_grsec_server_xen = linux_grsec_nixos; # ChromiumOS kernels - linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14); linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18); linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest); @@ -12241,7 +12316,7 @@ with pkgs; w32api = callPackage ../os-specific/windows/w32api { gccCross = gccCrossStageStatic; - binutilsCross = binutilsCross; + binutils = binutils; }; w32api_headers = w32api.override { @@ -12250,7 +12325,7 @@ with pkgs; mingw_runtime = callPackage ../os-specific/windows/mingwrt { gccCross = gccCrossMingw2; - binutilsCross = binutilsCross; + binutils = binutils; }; mingw_runtime_headers = mingw_runtime.override { @@ -12274,7 +12349,7 @@ with pkgs; mingw_w64 = callPackage ../os-specific/windows/mingw-w64 { gccCross = gccCrossStageStatic; - binutilsCross = binutilsCross; + binutils = binutils; }; mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64 { @@ -12422,6 +12497,8 @@ with pkgs; faba-mono-icons = callPackage ../data/icons/faba-mono-icons { }; + emacs-all-the-icons-fonts = callPackage ../data/fonts/emacs-all-the-icons-fonts { }; + emojione = callPackage ../data/fonts/emojione { inherit (nodePackages) svgo; inherit (pythonPackages) scfbuild; @@ -12429,6 +12506,8 @@ with pkgs; encode-sans = callPackage ../data/fonts/encode-sans { }; + envypn-font = callPackage ../data/fonts/envypn-font { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; @@ -12874,6 +12953,7 @@ with pkgs; go-ethereum = self.altcoins.go-ethereum; ethabi = self.altcoins.ethabi; + ethrun = self.altcoins.ethrun; stellar-core = self.altcoins.stellar-core; @@ -13083,6 +13163,7 @@ with pkgs; claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (gnome3) gsettings_desktop_schemas; + inherit (xorg) libSM; enableNetworkManager = config.networking.networkmanager.enable or false; }; @@ -13121,8 +13202,6 @@ with pkgs; inherit (gnome2) libgnomeui GConf; }; - cortex = callPackage ../applications/misc/cortex { }; - csound = callPackage ../applications/audio/csound { }; cinepaint = callPackage ../applications/graphics/cinepaint { @@ -13143,6 +13222,8 @@ with pkgs; convchain = callPackage ../tools/graphics/convchain {}; + coyim = callPackage ../applications/networking/instant-messengers/coyim {}; + cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; csdp = callPackage ../applications/science/math/csdp { @@ -13574,7 +13655,7 @@ with pkgs; fbreader = callPackage ../applications/misc/fbreader { }; - fdr = libsForQt56.callPackage ../applications/science/programming/fdr { }; + fdr = libsForQt5.callPackage ../applications/science/programming/fdr { }; fehlstart = callPackage ../applications/misc/fehlstart { }; @@ -13709,13 +13790,18 @@ with pkgs; filezilla = callPackage ../applications/networking/ftp/filezilla { }; - inherit (callPackages ../applications/networking/browsers/firefox { - inherit (gnome2) libIDL; - libpng = libpng_apng; - enableGTK3 = true; - python = python2; - gnused = gnused_422; - }) firefox-unwrapped firefox-esr-unwrapped; + firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { + callPackage = pkgs.newScope { + inherit (gnome2) libIDL; + libpng = libpng_apng; + python = python2; + gnused = gnused_422; + }; + }); + + firefox-unwrapped = firefoxPackages.firefox; + firefox-esr-unwrapped = firefoxPackages.firefox-esr; + tor-browser-unwrapped = firefoxPackages.tor-browser; firefox = wrapFirefox firefox-unwrapped { }; firefox-esr = wrapFirefox firefox-esr-unwrapped { }; @@ -13754,15 +13840,15 @@ with pkgs; flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { - debug = config.flashplayer.debug or false; + debug = config.flashplayer.debug or false; }; flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix { - debug = config.flashplayer.debug or false; + debug = config.flashplayer.debug or false; }; flashplayer-standalone-debugger = flashplayer-standalone.override { - debug = true; + debug = true; }; fluxbox = callPackage ../applications/window-managers/fluxbox { }; @@ -13812,6 +13898,8 @@ with pkgs; getxbook = callPackage ../applications/misc/getxbook {}; + ghq = gitAndTools.ghq; + gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { inherit (gnome2) libart_lgpl; webkit = null; @@ -13890,7 +13978,7 @@ with pkgs; libart = pkgs.gnome2.libart_lgpl; }; - idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_extras; }); + jetbrains = recurseIntoAttrs (callPackages ../applications/editors/jetbrains { androidsdk = androidsdk_extras; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; @@ -13983,7 +14071,9 @@ with pkgs; gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; + gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { + inherit (darwin) IOKit; + }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; @@ -14282,7 +14372,8 @@ with pkgs; inherit (kdeApplications) akonadi ark dolphin ffmpegthumbs filelight gwenview kate - kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig konsole krfb marble + kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig + kolourpaint konsole krfb marble okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; @@ -14751,6 +14842,8 @@ with pkgs; oroborus = callPackage ../applications/window-managers/oroborus {}; + osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; + ostinato = callPackage ../applications/networking/ostinato { }; panamax_api = callPackage ../applications/networking/cluster/panamax/api { @@ -15026,6 +15119,8 @@ with pkgs; pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { }; + pidgin-carbons = callPackage ../applications/networking/instant-messengers/pidgin-plugins/carbons { }; + pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { }; pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; @@ -15169,8 +15264,8 @@ with pkgs; qt = qt4; }; - # 0.5.7 segfaults when opening the main panel with qt 5.7 - qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { }; + # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK + qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; qsynth = callPackage ../applications/audio/qsynth { }; @@ -15388,6 +15483,8 @@ with pkgs; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; + skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; + skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; @@ -15958,8 +16055,7 @@ with pkgs; gtk = gtk2; }; - # VLC 3.0 is needed to compile in C++11 mode (QT 5.7) - vlc_qt5 = libsForQt56.vlc; + vlc_qt5 = libsForQt5.vlc; vmpk = callPackage ../applications/audio/vmpk { }; @@ -16007,6 +16103,7 @@ with pkgs; weechat = callPackage ../applications/networking/irc/weechat { inherit (darwin) libobjc; inherit (darwin) libresolv; + guile = guile_2_0; }; westonLite = callPackage ../applications/window-managers/weston { @@ -16058,6 +16155,8 @@ with pkgs; inherit (python27Packages) cheetah; }; + worldengine-cli = python3Packages.worldengine; + wpsoffice = callPackage ../applications/office/wpsoffice {}; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; @@ -16188,7 +16287,7 @@ with pkgs; xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # v1.3.2 segfaults with qt 5.7 - xca = libsForQt56.callPackage ../applications/misc/xca { }; + xca = libsForQt5.callPackage ../applications/misc/xca { }; xcalib = callPackage ../tools/X11/xcalib { }; @@ -16554,6 +16653,8 @@ with pkgs; factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; + factorio-demo = callPackage ../games/factorio { releaseType = "demo"; }; + factorio-mods = callPackage ../games/factorio/mods.nix { }; factorio-utils = callPackage ../games/factorio/utils.nix { }; @@ -16646,6 +16747,8 @@ with pkgs; lua = lua5; }; + instead-launcher = callPackage ../games/instead-launcher { }; + ja2-stracciatella = callPackage ../games/ja2-stracciatella { }; klavaro = callPackage ../games/klavaro {}; @@ -17186,6 +17289,8 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + diamond = callPackage ../applications/science/biology/diamond { }; + ecopcr = callPackage ../applications/science/biology/ecopcr { }; emboss = callPackage ../applications/science/biology/emboss { }; @@ -17380,10 +17485,7 @@ with pkgs; version = "8.5pl3"; }; coq_8_6 = callPackage ../applications/science/logic/coq {}; - coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { - inherit (ocamlPackages) ocaml findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; - }; + coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; coq = coq_8_6; mkCoqPackages_8_4 = self: let callPackage = newScope self; in { @@ -17431,6 +17533,7 @@ with pkgs; mathcomp = callPackage ../development/coq-modules/mathcomp { }; math-classes = callPackage ../development/coq-modules/math-classes { }; ssreflect = callPackage ../development/coq-modules/ssreflect { }; + QuickChick = callPackage ../development/coq-modules/QuickChick {}; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; }; @@ -17446,6 +17549,7 @@ with pkgs; interval = callPackage ../development/coq-modules/interval {}; mathcomp = callPackage ../development/coq-modules/mathcomp { }; ssreflect = callPackage ../development/coq-modules/ssreflect { }; + QuickChick = callPackage ../development/coq-modules/QuickChick {}; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; }; @@ -17668,7 +17772,7 @@ with pkgs; yacas = callPackage ../applications/science/math/yacas { }; - speedcrunch = libsForQt56.callPackage ../applications/science/math/speedcrunch { }; + speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { }; ### SCIENCE / MISC @@ -17992,6 +18096,8 @@ with pkgs; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; + nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; + inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) nix-prefetch-bzr nix-prefetch-cvs @@ -18177,10 +18283,10 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_2; + terraform_0_9_4; terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_2; + terraform_0_9 = terraform_0_9_4; terraform = terraform_0_9; terragrunt = callPackage ../applications/networking/cluster/terragrunt { @@ -18472,4 +18578,11 @@ with pkgs; ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {}; + + NSPlist = callPackage ../development/libraries/NSPlist {}; + + PlistCpp = callPackage ../development/libraries/PlistCpp {}; + + xib2nib = callPackage ../development/tools/xib2nib {}; + } diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 3e3ecdeea6cb..96d5e1fe2839 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -40,6 +40,7 @@ let # Rename the function arguments configExpr = config; + crossSystem0 = crossSystem; in let lib = import ../../lib; @@ -52,12 +53,15 @@ in let then configExpr { inherit pkgs; } else configExpr; - # Allow setting the platform in the config file. Otherwise, let's use a - # reasonable default. - localSystem = - { platform = (import ./platforms.nix).selectPlatformBySystem args.localSystem.system; } - // builtins.intersectAttrs { platform = null; } config - // args.localSystem; + # From a minimum of `system` or `config` (actually a target triple, *not* + # nixpkgs configuration), infer the other one and platform as needed. + localSystem = lib.systems.elaborate ( + # Allow setting the platform in the config file. This take precedence over + # the inferred platform, but not over an explicitly passed-in one. + builtins.intersectAttrs { platform = null; } config + // args.localSystem); + + crossSystem = lib.mapNullable lib.systems.elaborate crossSystem0; # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 71f2326b9379..ac4c5eaac64c 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -46,6 +46,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net40/*" ]; }; + FSharpCore = fetchNuGet { + baseName = "FSharp.Core"; + version = "4.0.0.1"; + sha256 = "01nhjcxdz8l1r5vvdzhmgy5x7z5fqppab3ki34qg14axgf8jjygn"; + outputFiles = [ "*" ]; + }; + + FSharpData225 = fetchNuGet { + baseName = "FSharp.Data"; + version = "2.2.5"; + sha256 = "1c9l6bk0d2srccash2980y9phq3kmfm0m76k4wghnysnq94vm724"; + outputFiles = [ "*" ]; + }; + FSharpDataSQLProvider = fetchNuGet { baseName = "SQLProvider"; version = "0.0.9-alpha"; @@ -60,6 +74,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FsCheck262 = fetchNuGet { + baseName = "FsCheck"; + version = "2.6.2"; + sha256 = "0fh9yvsc4i61z31qf00d6gjv6xxd54pv1ykf5bpv95a5crc3qfvl"; + outputFiles = [ "*" ]; + }; + FsCheckNunit = fetchNuGet { baseName = "FsCheck.Nunit"; version = "1.0.4"; @@ -67,6 +88,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FSharpCompilerTools = fetchNuGet { + baseName = "FSharp.Compiler.Tools"; + version = "4.1.4"; + sha256 = "0vsp0khlnwh15ibg8s161rw6a6i8rlriclpq53paga447jllf0m8"; + outputFiles = [ "*" ]; + }; + FsLexYacc = fetchNuGet { baseName = "FsLexYacc"; version = "6.1.0"; @@ -74,6 +102,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "build/*" ]; }; + FsLexYacc704 = fetchNuGet { + baseName = "FsLexYacc"; + version = "7.0.4"; + sha256 = "01zpdb0pybdf0by02rwd7pb1g0cmnn8jxm2pibzxjxw6f4l43ywi"; + outputFiles = [ "*" ]; + }; + FsPickler = fetchNuGet { baseName = "FsPickler"; version = "1.2.9"; @@ -102,6 +137,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/*" ]; }; + NUnit350 = fetchNuGet { + baseName = "NUnit"; + version = "3.5.0"; + sha256 = "19fxq9cf754ygda5c8rn1zqs71pfxi7mb96jwqhlichnqih6i16z"; + outputFiles = [ "*" ]; + }; + NUnit2 = fetchNuGet { baseName = "NUnit"; version = "2.6.4"; @@ -153,6 +195,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "tools/*" ]; }; + SystemValueTuple = fetchNuGet { + baseName = "System.ValueTuple"; + version = "4.3.0"; + sha256 = "00p5s753xh5417arw3k6npf1pc1k3m1s9mrlkw5vmc7pg8lm6n88"; + outputFiles = [ "*" ]; + }; + RestSharp = fetchNuGet { baseName = "RestSharp"; version = "105.2.3"; @@ -195,6 +244,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/*" ]; }; + MicrosoftDiaSymReader = fetchNuGet { + baseName = "Microsoft.DiaSymReader"; + version = "1.1.0"; + sha256 = "04dgwy6nyxksd1nb24k5c5vz8naggg7hryadvwqnm2v3alkh6g88"; + outputFiles = [ "*" ]; + }; + + MicrosoftDiaSymReaderPortablePdb = fetchNuGet { + baseName = "Microsoft.DiaSymReader.PortablePdb"; + version = "1.2.0"; + sha256 = "0qa8sqg0lzz9galkkfyi8rkbkali0nxm3qd5y4dlxp96ngrq5ldz"; + outputFiles = [ "*" ]; + }; + NUnitRunners = fetchNuGet { baseName = "NUnit.Runners"; version = "2.6.4"; @@ -210,6 +273,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ]; }; + SystemCollectionsImmutable131 = fetchNuGet { + baseName = "System.Collections.Immutable"; + version = "1.3.1"; + sha256 = "149fcp7k7r9iw24dv5hbaij0c38kcv28dyhzbkggilfh4x2hy8c2"; + outputFiles = [ "*" ]; + }; + + SystemReflectionMetadata = fetchNuGet { + baseName = "System.Reflection.Metadata"; + version = "1.4.2"; + sha256 = "19fhdgd35yg52gyckhgwrphq07nv7v7r73hcg69ns94xfg1i6r7i"; + outputFiles = [ "*" ]; + }; + Suave = fetchNuGet { baseName = "Suave"; version = "0.29.0"; diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index c0f4e0fa089e..c0cf8fb09113 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -22,6 +22,7 @@ in # with unnamed parameters allowed by ... system ? localSystem.system , platform ? localSystem.platform +, crossSystem ? null , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or # $HOME/.config/nixpkgs/config.nix. @@ -61,7 +62,7 @@ in assert args ? localSystem -> !(args ? system || args ? platform); import ./. (builtins.removeAttrs args [ "system" "platform" ] // { - inherit config overlays; + inherit config overlays crossSystem; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. localSystem = { system = builtins.currentSystem; } // localSystem; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0e9efde834db..7cd58e66b0c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -734,6 +734,19 @@ let self = _self // overrides; _self = with self; { ]; }; + BusinessHours = buildPerlPackage rec { + name = "Business-Hours-0.12"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz"; + sha256 = "15c5g278m1x121blspf4bymxp89vysizr3z6s1g3sbpfdkrn4gyv"; + }; + buildInputs = [ TestPod TestPodCoverage ]; + propagatedBuildInputs = [ SetIntSpan TimeLocal ]; + meta = { + description = "Calculate business hours in a time period"; + }; + }; + BusinessISBN = buildPerlPackage rec { name = "Business-ISBN-2.09"; src = fetchurl { @@ -2777,6 +2790,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ Clone ]; }; + CSSMinifierXP = buildPerlPackage rec { + name = "CSS-Minifier-XS-0.09"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; + sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; + }; + meta = { + description = "XS based CSS minifier"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CSSSquish = buildPerlPackage { name = "CSS-Squish-0.10"; src = fetchurl { @@ -2997,6 +3022,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [TestException ClassAccessorChained]; }; + DataPagePageset = buildPerlPackage rec { + name = "Data-Page-Pageset-1.02"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz"; + sha256 = "142isi8la383dbjxj7lfgcbmmrpzwckcc4wma6rdl8ryajsipb6f"; + }; + buildInputs = [ TestPod TestPodCoverage ]; + propagatedBuildInputs = [ DataPage ]; + meta = { + description = "change long page list to be shorter and well navigate"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DataPassword = buildPerlPackage { name = "Data-Password-1.12"; src = fetchurl { @@ -5694,6 +5733,20 @@ let self = _self // overrides; _self = with self; { makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}"; }; + GDGraph = buildPerlPackage rec { + name = "GDGraph-1.54"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz"; + sha256 = "0kzsdc07ycxjainmz0dnsclb15w2j1y7g8b5mcb7vhannq85qvxr"; + }; + propagatedBuildInputs = [ GD GDText ]; + buildInputs = [ TestException CaptureTiny ]; + meta = { + description = "Graph Plotting Module for Perl 5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GDSecurityImage = buildPerlPackage { name = "GD-SecurityImage-1.72"; src = fetchurl { @@ -5707,6 +5760,18 @@ let self = _self // overrides; _self = with self; { }; }; + GDText = buildPerlPackage rec { + name = "GDTextUtil-0.86"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz"; + sha256 = "1g0nc7fz4d672ag7brlrrcz7ibm98x49qs75bq9z957ybkwcnvl8"; + }; + propagatedBuildInputs = [ GD ]; + meta = { + description = "Text utilities for use with GD"; + }; + }; + GeoIP = buildPerlPackage rec { name = "Geo-IP-1.45"; src = fetchurl { @@ -6832,7 +6897,7 @@ let self = _self // overrides; _self = with self; { sha256 = "74d22c44b5ad2e7190e2786e8a17d74bbf4cef89b4d1157ba33598b5a2720dad"; }; }; - + IOPager = buildPerlPackage { name = "IO-Pager-0.06"; src = fetchurl { @@ -7136,6 +7201,20 @@ let self = _self // overrides; _self = with self; { }; }; + JavaScriptMinifierXS = buildPerlPackage rec { + name = "JavaScript-Minifier-XS-0.11"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz"; + sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm"; + }; + propagatedBuildInputs = [ ]; + meta = { + description = "XS based JavaScript minifier"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + JSON = buildPerlPackage { name = "JSON-2.90"; src = fetchurl { @@ -8225,6 +8304,29 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ProcWaitStat ]; }; + MIMETools = buildPerlPackage rec { + name = "MIME-tools-5.509"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz"; + sha256 = "0wv9rzx5j1wjm01c3dg48qk9wlbm6iyf91j536idk09xj869ymv4"; + }; + propagatedBuildInputs = [ + MailTools + FilePath + FileTemp + MIMEBase64 + ]; + buildInputs = [ + TestDeep + TestPod + TestPodCoverage + ]; + meta = { + description = "class for parsed-and-decoded MIME message"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MIMELite = buildPerlPackage rec { name = "MIME-Lite-3.030"; src = fetchurl { @@ -8295,10 +8397,10 @@ let self = _self // overrides; _self = with self; { }; ModuleBuild = buildPerlPackage rec { - name = "Module-Build-0.4214"; + name = "Module-Build-0.4222"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "0gywap0dfr8sx4wr6wqc23sjag1b4xsw8l55ai4vhkfg324lhyf5"; + sha256 = "0q5i03lbx52g22bwvyb04ycky4niq379j1c3fhmlfdj7lzclajz7"; }; buildInputs = [ CPANMeta ExtUtilsCBuilder ]; meta = { @@ -11468,6 +11570,18 @@ let self = _self // overrides; _self = with self; { }; }; + SetIntSpan = buildPerlPackage rec { + name = "Set-IntSpan-1.19"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz"; + sha256 = "1l6znd40ylzvfwl02rlqzvakv602rmvwgm2xd768fpgc2fdm9dqi"; + }; + + meta = { + description = "Manages sets of integers"; + }; + }; + SetObject = buildPerlPackage { name = "Set-Object-1.34"; src = fetchurl { @@ -12319,7 +12433,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - + TaskFreecellSolverTesting = buildPerlModule rec { name = "Task-FreecellSolver-Testing-v0.0.10"; src = fetchurl { @@ -13541,7 +13655,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - + TestTrailingSpace = buildPerlPackage rec { name = "Test-TrailingSpace-0.0301"; src = fetchurl { @@ -14828,10 +14942,14 @@ let self = _self // overrides; _self = with self; { }; version = buildPerlPackage rec { - name = "version-0.9912"; + name = "version-0.9918"; src = fetchurl { url = "mirror://cpan/authors/id/J/JP/JPEACOCK/${name}.tar.gz"; - sha256 = "03hv7slgqrmzbbjjmxgvq91bjlbjg5xbp8n4h454amyab2adzw7b"; + sha256 = "54175c7ead4e2259c2fb2b83440b821e4287842067227e48fb899b5cae52237b"; + }; + meta = { + description = "Structured version objects"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix deleted file mode 100644 index 665950766f7e..000000000000 --- a/pkgs/top-level/platforms.nix +++ /dev/null @@ -1,486 +0,0 @@ -rec { - pcBase = { - name = "pc"; - uboot = null; - kernelHeadersBaseConfig = "defconfig"; - kernelBaseConfig = "defconfig"; - # Build whatever possible as a module, if not stated in the extra config. - kernelAutoModules = true; - kernelTarget = "bzImage"; - }; - - pc64 = pcBase // { kernelArch = "x86_64"; }; - - pc32 = pcBase // { kernelArch = "i386"; }; - - pc32_simplekernel = pc32 // { - kernelAutoModules = false; - }; - - pc64_simplekernel = pc64 // { - kernelAutoModules = false; - }; - - sheevaplug = { - name = "sheevaplug"; - kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v5_defconfig"; - kernelBaseConfig = "multi_v5_defconfig"; - kernelArch = "arm"; - kernelAutoModules = false; - kernelExtraConfig = '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS m - XFS_FS m - JFS_FS m - EXT4_FS m - USB_STORAGE_CYPRESS_ATACB m - - # mv cesa requires this sw fallback, for mv-sha1 - CRYPTO_SHA1 y - # Fast crypto - CRYPTO_TWOFISH y - CRYPTO_TWOFISH_COMMON y - CRYPTO_BLOWFISH y - CRYPTO_BLOWFISH_COMMON y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - WATCHDOG y - WATCHDOG_CORE y - ORION_WATCHDOG m - - ZRAM m - NETCONSOLE m - - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # systemd uses cgroups - CGROUPS y - - # Latencytop - LATENCYTOP y - - # Ubi for the mtd - MTD_UBI y - UBIFS_FS y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - UBIFS_FS_LZO y - UBIFS_FS_ZLIB y - UBIFS_FS_DEBUG n - - # Kdb, for kernel troubles - KGDB y - KGDB_SERIAL_CONSOLE y - KGDB_KDB y - ''; - kernelMakeFlags = [ "LOADADDR=0x0200000" ]; - kernelTarget = "uImage"; - uboot = "sheevaplug"; - # Only for uboot = uboot : - ubootConfig = "sheevaplug_config"; - kernelDTB = true; # Beyond 3.10 - gcc = { - arch = "armv5te"; - float = "soft"; - }; - }; - - raspberrypi = { - name = "raspberrypi"; - kernelMajor = "2.6"; - kernelHeadersBaseConfig = "bcm2835_defconfig"; - kernelBaseConfig = "bcmrpi_defconfig"; - kernelDTB = true; - kernelArch = "arm"; - kernelAutoModules = false; - kernelExtraConfig = '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS y - XFS_FS m - JFS_FS y - EXT4_FS y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - ZRAM m - - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # nixos mounts some cgroup - CGROUPS y - - # Latencytop - LATENCYTOP y - ''; - kernelTarget = "zImage"; - uboot = null; - gcc = { - arch = "armv6"; - fpu = "vfp"; - float = "hard"; - }; - }; - - raspberrypi2 = armv7l-hf-multiplatform // { - name = "raspberrypi2"; - kernelBaseConfig = "bcm2709_defconfig"; - kernelDTB = true; - kernelAutoModules = false; - kernelExtraConfig = '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS y - XFS_FS m - JFS_FS y - EXT4_FS y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - ZRAM m - - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # nixos mounts some cgroup - CGROUPS y - - # Latencytop - LATENCYTOP y - - # Disable the common config Xen, it doesn't build on ARM - XEN? n - ''; - kernelTarget = "zImage"; - uboot = null; - }; - - guruplug = sheevaplug // { - # Define `CONFIG_MACH_GURUPLUG' (see - # <http://kerneltrap.org/mailarchive/git-commits-head/2010/5/19/33618>) - # and other GuruPlug-specific things. Requires the `guruplug-defconfig' - # patch. - - kernelBaseConfig = "guruplug_defconfig"; - #kernelHeadersBaseConfig = "guruplug_defconfig"; - }; - - fuloong2f_n32 = { - name = "fuloong2f_n32"; - kernelMajor = "2.6"; - kernelHeadersBaseConfig = "fuloong2e_defconfig"; - kernelBaseConfig = "lemote2f_defconfig"; - kernelArch = "mips"; - kernelAutoModules = false; - kernelExtraConfig = '' - MIGRATION n - COMPACTION n - - # nixos mounts some cgroup - CGROUPS y - - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - EXT4_FS m - USB_STORAGE_CYPRESS_ATACB m - - IP_PNP y - IP_PNP_DHCP y - IP_PNP_BOOTP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # Needed for udev >= 150 - SYSFS_DEPRECATED_V2 n - - VGA_CONSOLE n - VT_HW_CONSOLE_BINDING y - SERIAL_8250_CONSOLE y - FRAMEBUFFER_CONSOLE y - EXT2_FS y - EXT3_FS y - REISERFS_FS y - MAGIC_SYSRQ y - - # The kernel doesn't boot at all, with FTRACE - FTRACE n - ''; - kernelTarget = "vmlinux"; - uboot = null; - gcc.arch = "loongson2f"; - }; - - beaglebone = armv7l-hf-multiplatform // { - name = "beaglebone"; - kernelBaseConfig = "omap2plus_defconfig"; - kernelAutoModules = false; - kernelExtraConfig = ""; # TBD kernel config - kernelTarget = "zImage"; - uboot = null; - }; - - armv7l-hf-multiplatform = { - name = "armv7l-hf-multiplatform"; - kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. - kernelHeadersBaseConfig = "multi_v7_defconfig"; - kernelBaseConfig = "multi_v7_defconfig"; - kernelArch = "arm"; - kernelDTB = true; - kernelAutoModules = true; - kernelPreferBuiltin = true; - uboot = null; - kernelTarget = "zImage"; - kernelExtraConfig = '' - # Fix broken sunxi-sid nvmem driver. - TI_CPTS y - - # Hangs ODROID-XU4 - ARM_BIG_LITTLE_CPUIDLE n - ''; - gcc = { - # Some table about fpu flags: - # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png - # Cortex-A5: -mfpu=neon-fp16 - # Cortex-A7 (rpi2): -mfpu=neon-vfpv4 - # Cortex-A8 (beaglebone): -mfpu=neon - # Cortex-A9: -mfpu=neon-fp16 - # Cortex-A15: -mfpu=neon-vfpv4 - - # More about FPU: - # https://wiki.debian.org/ArmHardFloatPort/VfpComparison - - # vfpv3-d16 is what Debian uses and seems to be the best compromise: NEON is not supported in e.g. Scaleway or Tegra 2, - # and the above page suggests NEON is only an improvement with hand-written assembly. - arch = "armv7-a"; - fpu = "vfpv3-d16"; - float = "hard"; - - # For Raspberry Pi the 2 the best would be: - # cpu = "cortex-a7"; - # fpu = "neon-vfpv4"; - }; - }; - - aarch64-multiplatform = { - name = "aarch64-multiplatform"; - kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. - kernelHeadersBaseConfig = "defconfig"; - kernelBaseConfig = "defconfig"; - kernelArch = "arm64"; - kernelDTB = true; - kernelAutoModules = true; - kernelPreferBuiltin = true; - kernelExtraConfig = '' - # Raspberry Pi 3 stuff. Not needed for kernels >= 4.10. - ARCH_BCM2835 y - BCM2835_MBOX y - BCM2835_WDT y - RASPBERRYPI_FIRMWARE y - RASPBERRYPI_POWER y - SERIAL_8250_BCM2835AUX y - SERIAL_8250_EXTENDED y - SERIAL_8250_SHARE_IRQ y - - # Cavium ThunderX stuff. - PCI_HOST_THUNDER_ECAM y - ''; - uboot = null; - kernelTarget = "Image"; - gcc = { - arch = "armv8-a"; - }; - }; - - selectPlatformBySystem = system: { - "i686-linux" = pc32; - "x86_64-linux" = pc64; - "armv5tel-linux" = sheevaplug; - "armv6l-linux" = raspberrypi; - "armv7l-linux" = armv7l-hf-multiplatform; - "aarch64-linux" = aarch64-multiplatform; - "mips64el-linux" = fuloong2f_n32; - }.${system} or pcBase; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75fcfd60f904..585655e746e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1,3 +1,11 @@ +# This file contains the Python packages set. +# Each attribute is a Python library or a helper function. +# Expressions for Python libraries are supposed to be in `pkgs/development/python-modules/<name>/default.nix`. +# Python packages that do not need to be available for each interpreter version do not belong in this packages set. +# Examples are Python-based cli tools. +# +# For more details, please see the Python section in the Nixpkgs manual. + { pkgs , stdenv , python @@ -49,8 +57,11 @@ let fetchSource = {pname, version, sha256}: # Fetch a source tarball. let - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - in pkgs.fetchurl {inherit url sha256;}; + urls = [ + "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz" + "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.zip" + ]; + in pkgs.fetchurl {inherit urls sha256;}; fetcher = (if format == "wheel" then fetchWheel else if format == "setuptools" then fetchSource else throw "Unsupported kind ${kind}"); @@ -118,6 +129,8 @@ in { }; }; + phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + agate-dbf = buildPythonPackage rec { name = "agate-dbf-0.1.0"; disabled = isPy3k; @@ -173,6 +186,8 @@ in { }; }; + asn1crypto = callPackage ../development/python-modules/asn1crypto { }; + # packages defined elsewhere bap = callPackage ../development/python-modules/bap { @@ -365,11 +380,9 @@ in { pyside = callPackage ../development/python-modules/pyside { }; - pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; - - pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; - - pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { }; + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { + inherit (pkgs) libxml2 libxslt; # Do not need the Python bindings. + }; pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; @@ -751,6 +764,24 @@ in { }; }; + aniso8601 = buildPythonPackage rec { + name = "aniso8601-${version}"; + version = "1.2.0"; + + meta = { + description = "Parses ISO 8601 strings."; + homepage = "https://bitbucket.org/nielsenb/aniso8601"; + license = licenses.bsd3; + }; + + propagatedBuildInputs = with self; [ dateutil ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/aniso8601/${name}.tar.gz"; + sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4"; + }; + }; + asgiref = buildPythonPackage rec { name = "asgiref-${version}"; version = "1.0.0"; @@ -1172,7 +1203,7 @@ in { }; meta = with pkgs.stdenv.lib; { - descriptions = "Library for reading, writing and rewriting python AST"; + description = "Library for reading, writing and rewriting python AST"; homepage = https://github.com/berkerpeksag/astor; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; @@ -1217,12 +1248,11 @@ in { }; apscheduler = buildPythonPackage rec { - name = "APScheduler-3.0.4"; - disabled = !isPy27; + name = "APScheduler-3.3.1"; src = pkgs.fetchurl { url = "mirror://pypi/A/APScheduler/${name}.tar.gz"; - sha256 = "1ljjhn6cv8b1pccsi3mgc887ypi2vim317r9p0zh0amd0bhkk6wb"; + sha256 = "f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b"; }; buildInputs = with self; [ @@ -1232,8 +1262,8 @@ in { twisted mock trollius - funcsigs gevent + setuptools_scm ]; propagatedBuildInputs = with self; [ @@ -1241,6 +1271,7 @@ in { pytz tzlocal futures + funcsigs ]; meta = with pkgs.stdenv.lib; { @@ -1623,6 +1654,23 @@ in { }; }; + noise = buildPythonPackage rec { + name = "noise-${version}"; + version = "1.2.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/n/noise/${name}.tar.gz"; + sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/caseman/noise"; + description = "Native-code and shader implementations of Perlin noise"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + awscli = buildPythonPackage rec { name = "awscli-${version}"; version = "1.11.75"; @@ -2027,13 +2075,13 @@ in { }; babelfish = buildPythonPackage rec { - version = "0.5.3"; + version = "0.5.5"; name = "babelfish-${version}"; disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/b/babelfish/${name}.tar.gz"; - sha256 = "0wrw21dyq7v6lbffwvi1ik43d7dhmcv8xvgrrihhiv7ys1rd3gag"; + sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; }; meta = { @@ -2470,6 +2518,22 @@ in { propagatedBuildInputs = with self; [ iowait psutil pyzmq tornado mock ]; }; + colorclass = buildPythonPackage rec { + version = "2.2.0"; + name = "colorclass-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/colorclass/${name}.tar.gz"; + sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b"; + }; + + meta = { + homepage = "https://github.com/Robpol86/colorclass"; + license = licenses.mit; + description = "Automatic support for console colors"; + }; + }; + colorlog = buildPythonPackage rec { name = "colorlog-${version}"; version = "2.6.1"; @@ -2522,6 +2586,8 @@ in { doCheck = false; # lazy packager }; + csscompressor = callPackage ../development/python-modules/csscompressor.nix {}; + csvkit = buildPythonPackage rec { name = "csvkit-${version}"; version = "0.9.1"; @@ -2984,11 +3050,10 @@ in { to do lots of things, you're probably outside the use cases. Either trust those users, or don't. ''; - homepage = https://github.com/jsocol/bleach; - downloadPage = https://github.com/jsocol/bleach/releases; + homepage = https://github.com/mozilla/bleach; + downloadPage = https://github.com/mozilla/bleach/releases; license = licenses.asl20; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; }; }; @@ -3187,6 +3252,9 @@ in { runHook postCheck ''; + # Network access + doCheck = false; + meta = { homepage = https://github.com/boto/boto3; license = stdenv.lib.licenses.asl20; @@ -3787,15 +3855,17 @@ in { cherrypy = buildPythonPackage (rec { name = "cherrypy-${version}"; - version = "3.2.2"; + version = "8.7.0"; src = pkgs.fetchurl { - url = "http://download.cherrypy.org/cherrypy/${version}/CherryPy-${version}.tar.gz"; - sha256 = "14dn129h69wj0h8yr0bjwbrk8kygl6mkfnxc5m3fxhlm4xb8hnnw"; + url = "mirror://pypi/C/CherryPy/CherryPy-${version}.tar.gz"; + sha256 = "cbf418bf46458a67eb841944f2d414c23bf59d090baf2a28704bd67243e6a79f"; }; - # error: invalid command 'test' - doCheck = false; + # wsgiserver.ssl_pyopenssl is broken on py3k. + doCheck = !isPy3k; + buildInputs = with self; [ pytest setuptools_scm pytestrunner ]; + propagatedBuildInputs = with self; [ six ]; meta = { homepage = "http://www.cherrypy.org"; @@ -4380,6 +4450,8 @@ in { }; }; + coveralls = callPackage ../development/python-modules/coveralls { }; + coverage = buildPythonPackage rec { name = "coverage-4.0.1"; @@ -4536,25 +4608,39 @@ in { cryptography = buildPythonPackage rec { # also bump cryptography_vectors - name = "cryptography-${version}"; - version = "1.7.2"; + pname = "cryptography"; + name = "${pname}${version}"; + version = "1.8.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/cryptography/${name}.tar.gz"; - sha256 = "1ad9zmzi31fnz31qfchxcwiydvlxq88xndlgsvzr7m537n5vd347"; + src = fetchPypi { + inherit pname version; + sha256 = "323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190"; }; - buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors - self.iso8601 self.pyasn1 self.pytest_29 self.py self.hypothesis self.pytz ] + buildInputs = [ pkgs.openssl self.cryptography_vectors ] ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security; - propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules pytz ] - ++ optional (pythonOlder "3.4") self.enum34; + propagatedBuildInputs = with self; [ + idna + asn1crypto + packaging + six + ] ++ optional (pythonOlder "3.4") enum34 + ++ optional (pythonOlder "3.3") ipaddress + ++ optional (!isPyPy) cffi; + + checkInputs = with self; [ + pytest + pretend + iso8601 + pytz + hypothesis + ]; # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't # use it. This boils down to them checking compatibility with `getentropy` in two different places, # so let's neuter the second test. - patchPhase = '' + postPatch = '' substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"' ''; @@ -4565,13 +4651,17 @@ in { cryptography_vectors = buildPythonPackage rec { # also bump cryptography - name = "cryptography_vectors-${version}"; - version = "1.7.2"; + pname = "cryptography_vectors"; + name = "${pname}${version}"; + version = "1.8.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "1p5cw3dzgcpzmp81qb9860hn9qlcvr4rnf0fy31fbvhxl7lfxr2b"; + src = fetchPypi { + inherit pname version; + sha256 = "2fd61facea08800ca98ac923f6d02f48a7ae6648025b29cdeb51987c1532add6"; }; + + # No tests included + doCheck = false; }; oslo-vmware = buildPythonPackage rec { @@ -4782,11 +4872,13 @@ in { idna = buildPythonPackage rec { - name = "idna-2.0"; + pname = "idna"; + version = "2.5"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/i/idna/${name}.tar.gz"; - sha256 = "0frxgmgi234lr9hylg62j69j4ik5zhg0wz05w5dhyacbjfnrl68n"; + src = fetchPypi { + inherit pname version; + sha256 = "3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab"; }; meta = { @@ -4922,6 +5014,9 @@ in { sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; }; + # No tests in archive + doCheck = false; + meta = { homepage = https://github.com/alex/pretend; license = licenses.bsd3; @@ -5160,6 +5255,8 @@ in { }; }; + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; + pytestcache = buildPythonPackage rec { name = "pytest-cache-1.0"; src = pkgs.fetchurl { @@ -5179,7 +5276,7 @@ in { meta = { license = licenses.mit; - website = "https://pypi.python.org/pypi/pytest-cache/"; + homepage = "https://pypi.python.org/pypi/pytest-cache/"; description = "pytest plugin with mechanisms for caching across test runs"; }; }; @@ -5197,7 +5294,7 @@ in { meta = { license = licenses.mit; - website = https://pypi.python.org/pypi/pytest-catchlog/; + homepage = https://pypi.python.org/pypi/pytest-catchlog/; description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; }; }; @@ -5273,7 +5370,7 @@ in { meta = { license = licenses.mit; - website = "https://pypi.python.org/pypi/pytest-flakes"; + homepage = "https://pypi.python.org/pypi/pytest-flakes"; description = "pytest plugin to check source code with pyflakes"; }; }; @@ -5319,7 +5416,7 @@ in { meta = { license = licenses.mit; - website = "https://pypi.python.org/pypi/pytest-pep8"; + homepage = "https://pypi.python.org/pypi/pytest-pep8"; description = "pytest plugin to check PEP8 requirements"; }; }; @@ -5384,7 +5481,7 @@ in { meta = { license = licenses.asl20; - website = "https://pypi.python.org/pypi/pytest-quickcheck"; + homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; description = "pytest plugin to generate random data inspired by QuickCheck"; }; }; @@ -5637,12 +5734,13 @@ in { }); dask = buildPythonPackage rec { - name = "dask-${version}"; - version = "0.13.0"; + pname = "dask"; + name = "${pname}-${version}"; + version = "0.14.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/dask/${name}.tar.gz"; - sha256 = "1f8r6jj9666cnvx3f8bilcx0017smmlw4i4v2p1nwxshs0k514hs"; + src = fetchPypi { + inherit pname version; + sha256 = "46c8ef9aa41a5755f2194b535bff7fdef1343d3993ab294b198caf95155ec94e"; }; buildInputs = with self; [ pytest ]; @@ -6120,11 +6218,11 @@ in { decorator = buildPythonPackage rec { name = "decorator-${version}"; - version = "4.0.10"; + version = "4.0.11"; src = pkgs.fetchurl { url = "mirror://pypi/d/decorator/${name}.tar.gz"; - sha256 = "9c6e98edcb33499881b86ede07d9968c81ab7c769e28e9af24075f0a5379f070"; + sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76"; }; meta = { @@ -6289,16 +6387,14 @@ in { dill = buildPythonPackage rec { name = "dill-${version}"; - version = "0.2.5"; + version = "0.2.6"; src = pkgs.fetchurl { - url = "mirror://pypi/d/dill/${name}.tgz"; - sha256 = "431c9d46e190dcdf1397234cf659d66e2e22e33b0474ed6ee2d0b16c9c0ea319"; + url = "mirror://pypi/d/dill/${name}.zip"; + sha256 = "6c1ccca68be483fa8c66e85a89ffc850206c26373aa77a97b83d8d0994e7f1fd"; }; - propagatedBuildInputs = with self; [objgraph]; - - # failing tests + # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0} doCheck = false; meta = { @@ -6966,6 +7062,8 @@ in { }; }; + ezdxf = callPackage ../development/python-modules/ezdxf {}; + facebook-sdk = buildPythonPackage rec { name = "facebook-sdk-0.4.0"; @@ -7749,6 +7847,9 @@ in { }; }); + + htmlmin = callPackage ../development/python-modules/htmlmin.nix {}; + httpauth = buildPythonPackage rec { version = "0.3"; name = "httpauth-${version}"; @@ -8131,7 +8232,7 @@ in { description = "Cross-platform Bluetooth API for Python"; maintainers = with maintainers; [ leenaars ]; license = licenses.gpl3; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -8766,7 +8867,7 @@ in { meta = { description = "A Python-based build/distribution/deployment scripting tool"; homepage = http://github.com/paver/paver; - matinainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; }; @@ -9056,7 +9157,7 @@ in { description = "Call graph visualizations for Python applications"; maintainers = with maintainers; [ auntie ]; license = licenses.gpl2; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9192,7 +9293,7 @@ in { description = "Python port of libaxolotl-android"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9210,7 +9311,7 @@ in { description = "Curve25519 with ed25519 signatures"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9235,7 +9336,7 @@ in { description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9440,7 +9541,7 @@ in { description = "Python API for Sendmail Milters (SPF)"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9604,6 +9705,23 @@ in { }; }; + safe = buildPythonPackage rec { + version = "0.4"; + name = "Safe-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/S/Safe/${name}.tar.gz"; + sha256 = "a2fdac9fe8a9dcf02b438201d6ce0b7be78f85dc6492d03edfb89be2adf489de"; + }; + + buildInputs = with self; [ nose ]; + meta = { + homepage = "https://github.com/lepture/safe"; + license = licenses.bsd3; + description = "Check password strength"; + }; + }; + samplerate = buildPythonPackage rec { name = "scikits.samplerate-${version}"; version = "0.3.3"; @@ -9641,7 +9759,7 @@ in { homepage = "http://sarge.readthedocs.org/"; description = "A wrapper for subprocess which provides command pipeline functionality"; license = licenses.bsd3; - platform = platforms.all; + platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; }; @@ -10200,6 +10318,8 @@ in { }; }; + vcrpy = callPackage ../development/python-modules/vcrpy { }; + venusian = buildPythonPackage rec { name = "venusian-1.0"; @@ -10387,31 +10507,6 @@ in { }; }; - - django_1_7 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.7.11"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz"; - sha256 = "18arf0zr98q2gxhimm2fgh0avwcdax1mcnps0cyn06wgrr7i8f90"; - }; - - # too complicated to setup - doCheck = false; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; - }; - django_1_6 = buildPythonPackage rec { name = "Django-${version}"; version = "1.6.11.5"; @@ -10603,7 +10698,7 @@ in { sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0"; }; - propagatedBuildInputs = with self; [ django_1_7 ]; + propagatedBuildInputs = with self; [ django ]; # tests appear to be broken on 0.6.1 at least doCheck = ( version != "0.6.1" ); @@ -11468,6 +11563,24 @@ in { }; }; + flask-compress = buildPythonPackage rec { + name = "Flask-Compress-${version}"; + version = "1.3.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/F/Flask-Compress/${name}.tar.gz"; + sha256 = "4fbb53e7f6ce8b1458a2c3d7a528564912f2641ab2f9f43819fc96ed7f770734"; + }; + + propagatedBuildInputs = with self; [ flask ]; + + meta = { + description = "Compress responses in your Flask app with gzip"; + homepage = "https://libwilliam.github.io/flask-compress/"; + license = licenses.mit; + }; + }; + flask-cors = buildPythonPackage rec { name = "Flask-Cors-${version}"; version = "2.1.2"; @@ -11558,6 +11671,53 @@ in { }; }; + flask-restful = buildPythonPackage rec { + name = "Flask-RESTful-${version}"; + version = "0.3.5"; + + src = pkgs.fetchurl { + url = "mirror://pypi/F/Flask-RESTful/${name}.tar.gz"; + sha256 = "cce4aeff959b571136b5af098bebe7d3deeca7eb1411c4e722ff2c5356ab4c42"; + }; + + # TypeError: Only byte strings can be passed to C code + patchPhase = if isPy3k then '' + rm tests/test_crypto.py tests/test_paging.py + '' else null; + buildInputs = with self; [ nose mock blinker ]; + propagatedBuildInputs = with self; [ flask six pytz aniso8601 pycrypto ]; + PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; + + meta = { + homepage = "http://flask-restful.readthedocs.io/"; + description = "REST API building blocks for Flask"; + license = licenses.bsd3; + }; + }; + + flask-restplus = buildPythonPackage rec { + name = "flask-restplus-${version}"; + # Exactly 0.8.6 is required by flexget + version = "0.8.6"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "mirror://pypi/f/flask-restplus/${name}.tar.gz"; + sha256 = "3bb76cc156b9a09da62396d82b29fa31e4f27cccf79528538fe7155cf2785593"; + }; + + # Requires additional packages. + doCheck = false; + buildInputs = with self; [ nose blinker tzlocal ]; + propagatedBuildInputs = with self; [ flask six jsonschema pytz aniso8601 flask-restful ]; + + meta = { + homepage = "https://github.com/noirbizarre/flask-restplus"; + description = "Fast, easy and documented API development with Flask"; + license = licenses.mit; + }; + }; + flask_script = buildPythonPackage rec { name = "Flask-Script-${version}"; version = "2.0.5"; @@ -12582,6 +12742,27 @@ in { }; }; + rebulk = buildPythonPackage rec { + version = "0.8.2"; + name = "rebulk-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/r/rebulk/${name}.tar.gz"; + sha256 = "8c09901bda7b79a21d46faf489d67d017aa54d38bdabdb53f824068a6640401a"; + }; + + # Some kind of trickery with imports that doesn't work. + doCheck = false; + buildInputs = with self; [ pytest pytestrunner ]; + propagatedBuildInputs = with self; [ six regex ]; + + meta = { + homepage = "https://github.com/Toilal/rebulk/"; + license = licenses.mit; + description = "Advanced string matching from simple patterns"; + }; + }; + gunicorn = callPackage ../development/python-modules/gunicorn.nix { }; hawkauthlib = buildPythonPackage rec { @@ -12713,23 +12894,7 @@ in { }; }); - httpbin = buildPythonPackage rec { - name = "httpbin-0.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/httpbin/${name}.tar.gz"; - sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054"; - }; - - propagatedBuildInputs = with self; [ flask markupsafe decorator itsdangerous six ]; - - meta = { - homepage = https://github.com/kennethreitz/httpbin; - description = "HTTP Request & Response Service"; - license = licenses.mit; - }; - - }; + httpbin = callPackage ../development/python-modules/httpbin { }; httplib2 = buildPythonPackage rec { name = "httplib2-0.9.2"; @@ -13079,96 +13244,11 @@ in { }; }; - ipykernel = buildPythonPackage rec { - version = "4.5.2"; - name = "ipykernel-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462"; - }; + ipykernel = callPackage ../development/python-modules/ipykernel { }; - buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; - propagatedBuildInputs = with self; [ - ipython - jupyter_client - pexpect - traitlets - tornado - ]; + ipyparallel = callPackage ../development/python-modules/ipyparallel { }; - # Tests require backends. - # I don't want to add all supported backends as propagatedBuildInputs - doCheck = false; - - meta = { - description = "IPython Kernel for Jupyter"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; - - ipyparallel = buildPythonPackage rec { - version = "6.0.0"; - name = "ipyparallel-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipyparallel/${name}.tar.gz"; - sha256 = "9bb5032e98a8c73ddb3da5fb8eecd93c676a5278b68799ab19257b348a0a27f6"; - }; - - buildInputs = with self; [ nose ]; - - propagatedBuildInputs = with self; [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado - ] ++ optionals (!isPy3k) [ futures ]; - - # Requires access to cluster - doCheck = false; - - meta = { - description = "Interactive Parallel Computing with IPython"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - - }; - - ipython = buildPythonPackage rec { - version = "5.3.0"; - name = "ipython-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipython/${name}.tar.gz"; - sha256 = "bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d"; - }; - - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace "'gnureadline'" " " - ''; - - buildInputs = with self; [ nose pkgs.glibcLocales pygments ] ++ optionals isPy27 [mock]; - - propagatedBuildInputs = with self; - [ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit - simplegeneric traitlets requests2 pathlib2 pexpect ] - ++ optionals stdenv.isDarwin [appnope]; - - LC_ALL="en_US.UTF-8"; - - doCheck = false; # Circular dependency with ipykernel - - checkPhase = '' - nosetests - ''; - meta = { - description = "IPython: Productive Interactive Computing"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor jgeerds fridh ]; - }; - }; + ipython = callPackage ../development/python-modules/ipython { }; ipython_genutils = buildPythonPackage rec { version = "0.2.0"; @@ -13195,28 +13275,7 @@ in { }; - ipywidgets = buildPythonPackage rec { - version = "5.2.2"; - name = "ipywidgets-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipywidgets/${name}.tar.gz"; - sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2"; - }; - - # Tests are not distributed - doCheck = false; - - buildInputs = with self; [ nose pytest ]; - propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ]; - - meta = { - description = "IPython HTML widgets for Jupyter"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + ipywidgets = callPackage ../development/python-modules/ipywidgets { }; ipaddr = buildPythonPackage rec { name = "ipaddr-2.1.10"; @@ -13301,6 +13360,10 @@ in { }; }; + iso-639 = callPackage ../development/python-modules/iso-639 {}; + + iso3166 = callPackage ../development/python-modules/iso3166 {}; + iso8601 = buildPythonPackage rec { name = "iso8601-${version}"; version = "0.1.11"; @@ -13343,30 +13406,7 @@ in { jabberbot = callPackage ../development/python-modules/jabberbot.nix {}; - jedi = buildPythonPackage (rec { - name = "jedi-0.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jedi/${name}.tar.gz"; - sha256 = "0c8x962ynpx001fdvp07m2q5jk4igkxbj3rmnydavphvlgxijk1v"; - }; - - buildInputs = [ self.pytest ]; - - checkPhase = '' - py.test test - ''; - - # 7 failed - doCheck = false; - - meta = { - homepage = https://github.com/davidhalter/jedi; - description = "An autocompletion tool for Python that can be used for text editors"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ garbas ]; - }; - }); + jedi = callPackage ../development/python-modules/jedi { }; jellyfish = buildPythonPackage rec { version = "0.5.2"; @@ -13505,32 +13545,7 @@ in { inherit (pkgs.jsonnet) name src; }; - jupyter_client = buildPythonPackage rec { - version = "5.0.0"; - name = "jupyter_client-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jupyter_client/${name}.tar.gz"; - sha256 = "2766f9c2deb9ae826e65d53a56a36d69b184f63d0dcb7710835273327126bc5b"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq dateutil] ++ optional isPyPy py; - - checkPhase = '' - nosetests -v - ''; - - # Circular dependency with ipykernel - doCheck = false; - - meta = { - description = "Jupyter protocol implementation and client libraries"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + jupyter_client = callPackage ../development/python-modules/jupyter_client { }; jupyter_core = buildPythonPackage rec { version = "4.3.0"; @@ -13735,17 +13750,7 @@ in { }; }; - kitchen = buildPythonPackage (rec { - name = "kitchen-1.1.1"; - disabled = isPy3k; - - meta.maintainers = with maintainers; [ mornfall ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/kitchen/kitchen-1.1.1.tar.gz"; - sha256 = "0ki840hjk1q19w6icv0dj2jxb00966nwy9b1jib0dgdspj00yrr5"; - }; - }); + kitchen = callPackage ../development/python-modules/kitchen/default.nix { }; pylast = buildPythonPackage rec { name = "pylast-${version}"; @@ -13946,26 +13951,7 @@ in { }; }; - line_profiler = buildPythonPackage rec{ - version = "1.0"; - name = "line_profiler-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/line_profiler/${name}.tar.gz"; - sha256 = "a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900"; - }; - - buildInputs = with self; [ cython ]; - - disabled = isPyPy; - - meta = { - description = "Line-by-line profiler"; - homepage = https://github.com/rkern/line_profiler; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + line_profiler = callPackage ../development/python-modules/line_profiler { }; linode = buildPythonPackage rec { name = "linode-${version}"; @@ -14077,7 +14063,7 @@ in { }; }; - llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_38;}; + llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_39;}; lockfile = buildPythonPackage rec { pname = "lockfile"; @@ -14227,17 +14213,19 @@ in { src = pkgs.file.src; patchPhase = '' - substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic.so'" + substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic.${if stdenv.isDarwin then "dylib" else "so"}'" ''; - buildInputs = with self; [ python pkgs.file ]; + buildInputs = with self; [ pkgs.file ]; preConfigure = "cd python"; + # No test suite + doCheck = false; + meta = { description = "A Python wrapper around libmagic"; homepage = http://www.darwinsys.com/file/; - broken = true; }; }; @@ -14289,11 +14277,11 @@ in { markupsafe = buildPythonPackage rec { name = "markupsafe-${version}"; - version = "0.23"; + version = "1.0"; src = pkgs.fetchurl { url = "mirror://pypi/M/MarkupSafe/MarkupSafe-${version}.tar.gz"; - sha256 = "a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3"; + sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6"; }; meta = { @@ -14773,7 +14761,7 @@ in { buildInputs = with self; [nose]; meta = { - decription = "The fastest markdown parser in pure Python"; + description = "The fastest markdown parser in pure Python"; homepage = https://github.com/lepture/mistune; license = licenses.bsd3; }; @@ -15172,6 +15160,9 @@ in { sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; }; + # No tests in archive + doCheck = false; + meta = { homepage = http://github.com/mrocklin/multipledispatch/; description = "A relatively sane approach to multiple dispatch in Python"; @@ -15745,23 +15736,35 @@ in { propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules]; meta = { - meta = "Elegant Python library for XMPP"; + description = "Elegant Python library for XMPP"; license = licenses.mit; homepage = https://dev.louiz.org/projects/slixmpp; }; }; netaddr = buildPythonPackage rec { - name = "netaddr-0.7.18"; - doCheck = !isPy35; # https://github.com/drkjam/netaddr/issues/117 + pname = "netaddr"; + version = "0.7.19"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/n/netaddr/${name}.tar.gz"; - sha256 = "06dxjlbcicq7q3vqy8agq11ra01kvvd47j4mk6dmghjsyzyckxd1"; + src = fetchPypi { + inherit pname version; + sha256 = "38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd"; }; LC_ALL = "en_US.UTF-8"; - buildInputs = [ pkgs.glibcLocales ]; + buildInputs = with self; [ pkgs.glibcLocales pytest ]; + + checkPhase = '' + py.test netaddr/tests + ''; + + patches = [ + (pkgs.fetchpatch { + url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch; + sha256 = "08rn1s3w9424jhandy4j9sksy852ny00088zh15nirw5ajqg1dn7"; + }) + ]; meta = { homepage = https://github.com/drkjam/netaddr/; @@ -16117,35 +16120,7 @@ in { buildInputs = with self; [ nose ]; }; - notebook = buildPythonPackage rec { - version = "4.4.1"; - name = "notebook-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/notebook/${name}.tar.gz"; - sha256 = "dfadef2babd7c04c6c257df7d07d7ba587e503dbb4e4c95305f9a95b8d3a9765"; - }; - - LC_ALL = "en_US.UTF-8"; - - buildInputs = with self; [nose pkgs.glibcLocales] ++ optionals isPy27 [mock]; - - propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect]; - - checkPhase = '' - nosetests -v - ''; - - # Certain tests fail due to being in a chroot. - # PermissionError - doCheck = false; - meta = { - description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + notebook = callPackage ../development/python-modules/notebook { }; notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1"; @@ -16299,13 +16274,13 @@ in { # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.5.21.3"; + version = "0.5.25"; name = "Nuitka-${version}"; # Latest version is not yet on PyPi src = pkgs.fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "1i2069hxb94q9kkwcbky59fin8hk1vlj90lwgmrdhn1srvig1cq3"; + sha256 = "11psz0pyj56adv4b3f47hl8jakvp2mc2c85s092a5rsv1la1a0aa"; }; buildInputs = with self; stdenv.lib.optionals doCheck [ vmprof pyqt4 ]; @@ -18224,6 +18199,9 @@ in { checkPhase = '' nosetests -v $out/${python.sitePackages} ''; + postPatch = '' + substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" + ''; }; paho-mqtt = buildPythonPackage rec { @@ -18996,8 +18974,6 @@ in { }; }; - proselint = callPackage ../tools/text/proselint { }; - pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; version = "0.2.4"; @@ -19391,10 +19367,10 @@ in { prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "1.0.13"; + version = "1.0.14"; src = pkgs.fetchurl { - sha256 = "33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776"; + sha256 = "cc66413b1b4b17021675d9f2d15d57e640b06ddfd99bb724c73484126d22622f"; url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; }; checkPhase = '' @@ -19486,11 +19462,11 @@ in { }); psycopg2 = buildPythonPackage rec { - name = "psycopg2-2.6.1"; + name = "psycopg2-2.7.1"; disabled = isPyPy; src = pkgs.fetchurl { url = "mirror://pypi/p/psycopg2/${name}.tar.gz"; - sha256 = "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"; + sha256 = "86c9355f5374b008c8479bc00023b295c07d508f7c3b91dbd2e74f8925b1d9c6"; }; buildInputs = optional stdenv.isDarwin pkgs.openssl; propagatedBuildInputs = with self; [ pkgs.postgresql ]; @@ -19814,11 +19790,11 @@ in { }; pygit2 = buildPythonPackage rec { - name = "pygit2-0.24.0"; + name = "pygit2-0.25.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pygit2/${name}.tar.gz"; - sha256 = "01c155ls0h5pvpdkrk8ld6fscshmz4fchcwxrg488dbij1zdjxms"; + sha256 = "0wf5rp0fvrw7j3j18dvwjq6xqlbm611wd55aphrfpps0v1gxh3ny"; }; preConfigure = ( if stdenv.isDarwin then '' @@ -20576,6 +20552,8 @@ in { }; }; + pyspread = callPackage ../development/python-modules/pyspread { }; + pyx = buildPythonPackage rec { name = "pyx-${version}"; version = "0.14.1"; @@ -20705,11 +20683,11 @@ in { }; PyICU = buildPythonPackage rec { - name = "PyICU-1.9.5"; + name = "PyICU-1.9.6"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyICU/${name}.tar.gz"; - sha256 = "16rmxy9y0qhqqna2v49i7nzwm09as699rbyvh4raw7w602w55c3k"; + sha256 = "0l151zhhyiazzdz8skpxgrw1x4nqa9pq2cwni6d97anmg97i7hn5"; }; buildInputs = [ pkgs.icu ]; @@ -21458,6 +21436,38 @@ in { }; }; + pyplatec = buildPythonPackage rec { + name = "PyPlatec-${version}"; + version = "1.4.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/P/PyPlatec/${name}.tar.gz"; + sha256 = "0kqx33flcrrlipccmqs78d14pj5749bp85b6k5fgaq2c7yzz02jg"; + }; + + meta = { + description = "Library to simulate plate tectonics with Python bindings"; + homepage = https://github.com/Mindwerks/plate-tectonics; + license = licenses.lgpl3; + }; + }; + + purepng = buildPythonPackage rec { + name = "purepng-${version}"; + version = "0.2.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/purepng/${name}.tar.gz"; + sha256 = "1kcl7a6d7d59360fbz2jwfk6ha6pmqgn396962p4s62j893d2r0d"; + }; + + meta = { + description = "Pure Python library for PNG image encoding/decoding"; + homepage = https://github.com/scondo/purepng; + license = licenses.mit; + }; + }; + pymaging = buildPythonPackage rec { name = "pymaging-unstable-2016-11-16"; @@ -22347,28 +22357,7 @@ in { }; }; - qtconsole = buildPythonPackage rec { - version = "4.2.1"; - name = "qtconsole-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/q/qtconsole/${name}.tar.gz"; - sha256 = "1vqqx9hdvrg2d336wjyw0vr5b5v97kflkqqvr7ryicr8als7vv15"; - }; - - buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; - propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4]; - - # : cannot connect to X server - doCheck = false; - - meta = { - description = "Jupyter Qt console"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + qtconsole = callPackage ../development/python-modules/qtconsole { }; quantities = buildPythonPackage rec { name = "quantities-0.10.1"; @@ -23035,7 +23024,7 @@ in { buildInputs = with self; [ appdirs ]; meta = with pkgs.stdenv.lib; { - descriptions = "A python Lex/Yacc that works with RPython"; + description = "A python Lex/Yacc that works with RPython"; homepage = https://github.com/alex/rply; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; @@ -23169,6 +23158,8 @@ in { }; }; + typeguard = callPackage ../development/python-modules/typeguard { }; + ruamel_yaml = buildPythonPackage rec { name = "ruamel.yaml-${version}"; version = "0.13.7"; @@ -23196,7 +23187,6 @@ in { runsnakerun = buildPythonPackage rec { name = "runsnakerun-2.0.4"; - src = pkgs.fetchurl { url = "mirror://pypi/R/RunSnakeRun/RunSnakeRun-2.0.4.tar.gz"; sha256 = "61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef"; @@ -25145,29 +25135,7 @@ in { }; }; - statsmodels = buildPythonPackage rec { - name = "statsmodels-${version}"; - version = "0.6.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/statsmodels/${name}.tar.gz"; - sha256 = "be4e44374aec9e848b73e5a230dee190ac0c4519e1d40f69a5813190b13ec676"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib]; - - meta = { - description = "Statistical computations and models for use with SciPy"; - homepage = "https://www.github.com/statsmodels/statsmodels"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - - # Many tests fail when using latest numpy and pandas. - # See also https://github.com/statsmodels/statsmodels/issues/2602 - doCheck = false; - }; + statsmodels = callPackage ../development/python-modules/statsmodels { }; python_statsd = buildPythonPackage rec { name = "python-statsd-${version}"; @@ -25596,6 +25564,22 @@ in { }; }; + terminaltables = buildPythonPackage rec { + name = "terminaltables-${version}"; + version = "3.1.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/t/terminaltables/${name}.tar.gz"; + sha256 = "f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81"; + }; + + meta = { + description = "Display simple tables in terminals"; + homepage = "https://github.com/Robpol86/terminaltables"; + license = licenses.mit; + }; + }; + keystoneclient = buildPythonPackage rec { name = "keystoneclient-${version}"; version = "1.8.1"; @@ -25902,7 +25886,7 @@ in { meta = { description = "Quick Response code generation for Python"; - home = "https://pypi.python.org/pypi/qrcode"; + homepage = "https://pypi.python.org/pypi/qrcode"; license = licenses.bsd3; }; }; @@ -27199,27 +27183,7 @@ EOF }; }; - widgetsnbextension = buildPythonPackage rec { - name = "widgetsnbextension-${version}"; - version = "1.2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/widgetsnbextension/${name}.tar.gz"; - sha256 = "c618cfb32978c9517caf0b4ef3aec312f8dd138577745e7b0d4abfcc7315ce51"; - }; - - propagatedBuildInputs = with self; [ notebook ]; - - # No tests in archive - doCheck = false; - - meta = { - description = "IPython HTML widgets for Jupyter"; - homepage = http://ipython.org/; - license = self.ipywidgets.meta.license; # Build from same repo - maintainers = with maintainers; [ fridh ]; - }; - }; + widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; willie = buildPythonPackage rec { name = "willie-${version}"; @@ -27361,29 +27325,7 @@ EOF }; }); - xarray = buildPythonPackage rec { - name = "xarray-${version}"; - version = "0.9.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/x/xarray/${name}.tar.gz"; - sha256 = "89772ed0e23f0e71c3fb8323746374999ecbe79c113e3fadc7ae6374e6dc0525"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [numpy pandas]; - - checkPhase = '' - py.test $out/${python.sitePackages} - ''; - - meta = { - description = "N-D labeled arrays and datasets in Python"; - homepage = https://github.com/pydata/xarray; - license = licenses.asl20; - maintainers = with maintainers; [ fridh ]; - }; - }; + xarray = callPackage ../development/python-modules/xarray { }; xlwt = callPackage ../development/python-modules/xlwt { }; @@ -28552,6 +28494,54 @@ EOF }; }; + worldengine = buildPythonPackage rec { + name = "worldengine-${version}"; + version = "0.19.0"; + + src = pkgs.fetchFromGitHub { + owner = "Mindwerks"; + repo = "worldengine"; + rev = "v${version}"; + sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry"; + }; + + src-data = pkgs.fetchFromGitHub { + owner = "Mindwerks"; + repo = "worldengine-data"; + rev = "029051e"; + sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm"; + }; + + postUnpack = '' + ln -s ${src-data} worldengine-data + ''; + + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ noise numpy pyplatec protobuf3_2 purepng argparse h5py gdal ]; + + prePatch = '' + substituteInPlace setup.py \ + --replace pypng>=0.0.18 purepng \ + --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \ + --replace 'argparse==1.2.1' 'argparse' \ + --replace 'protobuf==3.0.0a3' 'protobuf' \ + --replace 'noise==1.2.2' 'noise' \ + --replace 'PyPlatec==1.4.0' 'PyPlatec' \ + ''; + + doCheck = true; + postCheck = '' + nosetests tests + ''; + + meta = { + homepage = http://world-engine.org; + description = "World generator using simulation of plates, rain shadow, erosion, etc"; + platforms = platforms.all; + maintainers = with maintainers; [ rardiol ]; + }; + }; + carbon = buildPythonPackage rec { name = "carbon-${version}"; version = graphiteVersion; @@ -28936,8 +28926,7 @@ EOF }; propagatedBuildInputs = with self; [ cffi ]; - buildInputs = [ pkgs.libspotify ] - ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool; + buildInputs = [ pkgs.libspotify ]; # python zip complains about old timestamps preConfigure = '' @@ -29243,10 +29232,10 @@ EOF # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.18.0"; + version = "1.19.0"; src = pkgs.fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "0p92xsw7sh7965mb097lxy98va5xsrkxdqqaq11fhkpwqccy2l8p"; + sha256 = "105qykdd04mlyzwzyscw6mlc7ajl4wbwhq87ncy1jvw8jjh6jads"; }; preConfigure = '' @@ -29261,9 +29250,9 @@ EOF meta = { description = "Python bindings for EFL and Elementary"; homepage = http://enlightenment.org/; - maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = platforms.linux; license = licenses.gpl3; + maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; }; }; @@ -29957,11 +29946,6 @@ EOF export GEOS_DIR=${pkgs.geos} ''; - # The installer does not support the '--old-and-unmanageable' option - installPhase = '' - ${python.interpreter} setup.py install --prefix $out - ''; - # The 'check' target is not supported by the `setup.py` script. # TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`) doCheck = false; @@ -31319,6 +31303,9 @@ EOF lockfile clize ]; + # zerobin doesn't have any tests, but includes a copy of cherrypy which + # can wrongly fail the check phase. + doCheck = false; meta = { description = "A client side encrypted pastebin"; homepage = "http://0bin.net/"; @@ -31932,10 +31919,10 @@ EOF packet-python = buildPythonPackage rec { name = "${pname}-${version}"; pname = "packet-python"; - version = "1.31"; + version = "1.33"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/c3/1b/ea71ec9d6eeab92b783d23dd62e71e9296f9699bc7d457450859803929f0/${name}.tar.gz"; - sha256 = "1z1zmrajfw01jr3mafimq7dvsb1rs978zln9xfd6fbqkp3vm9hc0"; + url = "https://pypi.python.org/packages/eb/82/f0506bd964501f958ac6a37e843ccb7bd9e712732886258314d55f0ec710/packet-python-1.33.tar.gz"; + sha256 = "0bmvfmvjm8jx0y8sv0jf5mhv0h3v8idx0sc5myxs7ig200584dd3"; }; propagatedBuildInputs = with self; [ requests ]; @@ -32019,6 +32006,10 @@ EOF license = [ licenses.bsd2 licenses.asl20 ]; maintainers = with maintainers; [ bennofs ]; }; + + checkPhase = '' + py.test + ''; }; pypandoc = buildPythonPackage rec { @@ -32218,6 +32209,12 @@ EOF nitpick = callPackage ../applications/version-management/nitpick { }; + pluginbase = callPackage ../development/python-modules/pluginbase { }; + + node-semver = callPackage ../development/python-modules/node-semver { }; + + distro = callPackage ../development/python-modules/distro { }; + }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index f9382985fcd1..b22eff33dc07 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -1,4 +1,3 @@ - { # The platforms for which we build Nixpkgs. supportedSystems ? [ builtins.currentSystem ] , # Strip most of attributes when evaluating to spare memory usage @@ -8,8 +7,6 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; let - inherit (pkgs) lib; - nativePlatforms = linux; /* Basic list of packages to cross-build */ @@ -23,12 +20,27 @@ let /* Basic list of packages to be natively built, but need a crossSystem defined to get meaning */ basicNativeDrv = { + buildPackages.binutils = nativePlatforms; buildPackages.gccCrossStageFinal = nativePlatforms; buildPackages.gdbCross = nativePlatforms; }; basic = basicCrossDrv // basicNativeDrv; + windows = { + buildPackages.binutils = nativePlatforms; + buildPackages.gccCrossStageFinal = nativePlatforms; + + coreutils = nativePlatforms; + boehmgc = nativePlatforms; + gmp = nativePlatforms; + guile_1_8 = nativePlatforms; + libffi = nativePlatforms; + libtool = nativePlatforms; + libunistring = nativePlatforms; + windows.wxMSW = nativePlatforms; + }; + in { @@ -50,11 +62,11 @@ in # cause false negatives. testEqualOne = path: system: let f = path: attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs)); - in assert + in assertTrue ( f path { inherit system; } == - f (["buildPackages"] ++ path) { inherit system crossSystem; }; - true; + f (["buildPackages"] ++ path) { inherit system crossSystem; } + ); testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path); @@ -80,7 +92,7 @@ in arch = "arm"; float = "soft"; withTLS = true; - platform = pkgs.platforms.sheevaplug; + platform = lib.systems.platforms.sheevaplug; libc = "glibc"; openssl.system = "linux-generic32"; }; @@ -92,63 +104,36 @@ in /* Test some cross builds on 32 bit mingw-w64 */ crossMingw32 = let crossSystem = { - config = "i686-w64-mingw32"; + config = "i686-pc-mingw32"; arch = "x86"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; - in mapTestOnCross crossSystem { - coreutils = nativePlatforms; - boehmgc = nativePlatforms; - gmp = nativePlatforms; - guile_1_8 = nativePlatforms; - libffi = nativePlatforms; - libtool = nativePlatforms; - libunistring = nativePlatforms; - windows.wxMSW = nativePlatforms; - }; + in mapTestOnCross crossSystem windows; /* Test some cross builds on 64 bit mingw-w64 */ crossMingwW64 = let crossSystem = { # That's the triplet they use in the mingw-w64 docs. - config = "x86_64-w64-mingw32"; + config = "x86_64-pc-mingw32"; arch = "x86_64"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; - in mapTestOnCross crossSystem { - coreutils = nativePlatforms; - boehmgc = nativePlatforms; - gmp = nativePlatforms; - guile_1_8 = nativePlatforms; - libffi = nativePlatforms; - libtool = nativePlatforms; - libunistring = nativePlatforms; - windows.wxMSW = nativePlatforms; - }; + in mapTestOnCross crossSystem windows; /* Linux on the fuloong */ fuloongminipc = let crossSystem = { - config = "mips64el-unknown-linux"; + config = "mips64el-unknown-linux-gnu"; bigEndian = false; arch = "mips"; float = "hard"; withTLS = true; libc = "glibc"; - platform = { - name = "fuloong-minipc"; - kernelMajor = "2.6"; - kernelBaseConfig = "lemote2f_defconfig"; - kernelHeadersBaseConfig = "fuloong2e_defconfig"; - uboot = null; - kernelArch = "mips"; - kernelAutoModules = false; - kernelTarget = "vmlinux"; - }; + platform = lib.systems.platforms.fuloong2f_n32; openssl.system = "linux-generic32"; gcc = { arch = "loongson2f"; @@ -172,7 +157,7 @@ in fpu = "vfp"; withTLS = true; libc = "glibc"; - platform = pkgs.platforms.raspberrypi; + platform = lib.systems.platforms.raspberrypi; openssl.system = "linux-generic32"; gcc = { arch = "armv6"; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index a6e574a7d11a..ddc449ae59c1 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,19 +1,20 @@ { supportedSystems , packageSet ? (import ../..) , scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ../../lib; +let + lib = import ../../lib; +in with lib; rec { - # Ensure that we don't build packages marked as unfree. - allPackages = args: packageSet (args // { - config.allowUnfree = false; - config.inHydra = true; - }); + allPackages = args: packageSet (args // nixpkgsArgs); pkgs = pkgsFor "x86_64-linux"; + inherit lib; hydraJob' = if scrubJobs then hydraJob else id; @@ -43,6 +44,11 @@ rec { pkgs_x86_64_cygwin = allPackages { system = "x86_64-cygwin"; }; + assertTrue = bool: + if bool + then pkgs.runCommand "evaluated-to-true" {} "touch $out" + else pkgs.runCommand "evaluated-to-false" {} "false"; + /* The working or failing mails for cross builds will be sent only to the following maintainers, as most package maintainers will not be interested in the result of cross building a package. */ diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 0fbd5e50d12e..3bc252e440f7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -3,14 +3,14 @@ $ hydra-eval-jobs pkgs/top-level/release-python.nix */ -{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" ] }: -with import ../../lib; with import ./release-lib.nix {inherit supportedSystems; }; +with lib; let packagePython = mapAttrs (name: value: diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index b12eda6f150d..f329f2460d71 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -1,7 +1,7 @@ /* A small release file, with few packages to be built. The aim is to reduce the load on Hydra when testing the `stdenv-updates' branch. */ -{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] }: diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 7c6954564d0b..cf4d54fe0496 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -9,27 +9,26 @@ $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux */ -{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; +with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; let - - lib = pkgs.lib; - jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; manual = import ../../doc; - lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; + lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs supportedSystems scrubJobs; }; darwin-tested = pkgs.releaseTools.aggregate { name = "nixpkgs-darwin-${jobs.tarball.version}"; @@ -53,7 +52,6 @@ let [ jobs.tarball jobs.metrics jobs.manual - jobs.lib-tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin @@ -80,7 +78,8 @@ let jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin jobs.vim.x86_64-darwin - ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; + ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools + ++ lib.collect lib.isDerivation jobs.lib-tests; }; } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) { stdenvBootstrapTools.i686-linux = diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index ce8605a27e83..7f866f69660c 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-04-08"; - rev = "9876afbb35a2fe28748990f76d91eaae827e2aae"; - sha256 = "14wk74s0mqhxzmgaq07y75y8v4jkffzhs981y9cz806asdcxlrwh"; + version = "2017-04-13"; + rev = "5758a926a647716bd650978ad53aeb4a0c5f9b45"; + sha256 = "1fnwh62k8fbflciv1qg3r9fsqn1xy72flyv15ii3mpja2vqzkdi2"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index a22587d5b576..43951100de3d 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -64,7 +64,11 @@ let splicedPackages = if actuallySplice - then splicer defaultBuildScope defaultRunScope + then splicer defaultBuildScope defaultRunScope // { + # These should never be spliced under any circumstances + inherit (pkgs) pkgs buildPackages __targetPackages + buildPlatform targetPlatform hostPlatform; + } else pkgs // pkgs.xorg; in diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 6febedb79f3d..f6e7f41ed883 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -46,9 +46,18 @@ ## , # The package set used at build-time. If null, `buildPackages` will - # be defined internally as the produced package set as itself. + # be defined internally as the final produced package set itself. This allows + # us to avoid expensive splicing. buildPackages +, # The package set used in the next stage. If null, `__targetPackages` will be + # defined internally as the final produced package set itself, just like with + # `buildPackages` and for the same reasons. + # + # THIS IS A HACK for compilers that don't think critically about cross- + # compilation. Please do *not* use unless you really know what you are doing. + __targetPackages + , # The standard environment to use for building packages. stdenv @@ -87,6 +96,8 @@ let stdenvBootstappingAndPlatforms = self: super: { buildPackages = (if buildPackages == null then self else buildPackages) // { recurseForDerivations = false; }; + __targetPackages = (if __targetPackages == null then self else __targetPackages) + // { recurseForDerivations = false; }; inherit stdenv buildPlatform hostPlatform targetPlatform; }; @@ -99,8 +110,8 @@ let in { stdenv = super.stdenv // { inherit (buildPlatform) platform; - } // lib.optionalAttrs (targetPlatform != buildPlatform) { - cross = targetPlatform; + } // lib.optionalAttrs (hostPlatform != buildPlatform) { + cross = hostPlatform; }; inherit (buildPlatform) system platform; }; |