diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 221 | ||||
| -rw-r--r-- | pkgs/top-level/emscripten-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 456 | ||||
| -rw-r--r-- | pkgs/top-level/rust-packages.nix | 6 |
8 files changed, 412 insertions, 330 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 919e1892edb5..e8600419a707 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -203,12 +203,25 @@ in fetchFromGitHub = { owner, repo, rev, name ? "${repo}-${rev}-src", + fetchSubmodules ? false, ... # For hash agility - }@args: fetchzip ({ - inherit name; - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; - meta.homepage = "https://github.com/${owner}/${repo}/"; - } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; + }@args: + let + baseUrl = "https://github.com/${owner}/${repo}"; + passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" ]; + in if fetchSubmodules then + fetchgit ({ + inherit name rev fetchSubmodules; + url = "${baseUrl}.git"; + } // passthruAttrs) + else + # We prefer fetchzip in cases we don't need submodules as the hash + # is more stable in that case. + fetchzip ({ + inherit name; + url = "${baseUrl}/archive/${rev}.tar.gz"; + meta.homepage = "${baseUrl}/"; + } // passthruAttrs) // { inherit rev; }; fetchFromBitbucket = { owner, repo, rev, name ? "${repo}-${rev}-src", @@ -282,6 +295,8 @@ in pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; + singularity-tools = callPackage ../build-support/singularity-tools { }; + srcOnly = args: callPackage ../build-support/src-only args; substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; @@ -406,6 +421,8 @@ in apt-offline = callPackage ../tools/misc/apt-offline { }; + aptly = callPackage ../tools/misc/aptly { }; + apulse = callPackage ../misc/apulse { }; archivemount = callPackage ../tools/filesystems/archivemount { }; @@ -569,7 +586,9 @@ in awstats = callPackage ../tools/system/awstats { }; - axel = callPackage ../tools/networking/axel { }; + axel = callPackage ../tools/networking/axel { + libssl = openssl; + }; azureus = callPackage ../tools/networking/p2p/azureus { }; @@ -762,7 +781,9 @@ in cpulimit = callPackage ../tools/misc/cpulimit { }; - contacts = callPackage ../tools/misc/contacts { }; + contacts = callPackage ../tools/misc/contacts { + inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; + }; coturn = callPackage ../servers/coturn { }; @@ -770,6 +791,8 @@ in daemontools = callPackage ../tools/admin/daemontools { }; + dante = callPackage ../servers/dante { }; + datamash = callPackage ../tools/misc/datamash { }; datefudge = callPackage ../tools/system/datefudge { }; @@ -827,6 +850,8 @@ in dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; + ecasound = callPackage ../applications/audio/ecasound { }; + edac-utils = callPackage ../os-specific/linux/edac-utils { }; eggdrop = callPackage ../tools/networking/eggdrop { }; @@ -879,7 +904,7 @@ in goa = callPackage ../development/tools/goa { }; - clingo = callPackage ../tools/misc/clingo { }; + gringo = callPackage ../tools/misc/gringo { }; gti = callPackage ../tools/misc/gti { }; @@ -895,6 +920,7 @@ in long-shebang = callPackage ../misc/long-shebang {}; + magic-wormhole = callPackage ../tools/misc/magic-wormhole {}; mathics = pythonPackages.mathics; meson = callPackage ../development/tools/build-managers/meson { }; @@ -1289,6 +1315,10 @@ in cudatoolkit = cudatoolkit8; }; + cudnn51_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-5.1 { + cudatoolkit = cudatoolkit8; + }; + curlFull = curl.override { idnSupport = true; ldapSupport = true; @@ -2279,6 +2309,8 @@ in jscoverage = callPackage ../development/tools/misc/jscoverage { }; + jsduck = callPackage ../development/tools/jsduck { }; + jwhois = callPackage ../tools/networking/jwhois { }; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; @@ -2373,6 +2405,8 @@ in makebootfat = callPackage ../tools/misc/makebootfat { }; + libmarble-ssrf = qt55.callPackage ../development/libraries/libmarble-ssrf { }; + matrix-synapse = callPackage ../servers/matrix-synapse { }; memtester = callPackage ../tools/system/memtester { }; @@ -3721,6 +3755,11 @@ in sstp = callPackage ../tools/networking/sstp {}; + subsurface = + qt55.callPackage ../applications/misc/subsurface { + libgit2 = pkgs.libgit2_0_23; + }; + sudo = callPackage ../tools/security/sudo { }; suidChroot = callPackage ../tools/system/suid-chroot { }; @@ -4469,6 +4508,8 @@ in arachne-pnr = callPackage ../development/compilers/arachne-pnr { }; + asn1c = callPackage ../development/compilers/asn1c { }; + aspectj = callPackage ../development/compilers/aspectj { }; ats = callPackage ../development/compilers/ats { }; @@ -4844,7 +4885,7 @@ in # Haskell and GHC - haskell = callPackage ./haskell-packages.nix { }; + haskell = callPackage ./haskell-packages.nix { inherit crossSystem; }; haskellPackages = haskell.packages.ghc801.override { overrides = config.haskellPackageOverrides or (self: super: {}); @@ -5004,6 +5045,7 @@ in gmp = gmp6; openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + llvm = llvm_37; }; julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { @@ -5032,7 +5074,8 @@ in llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs llvmPackages_37; + llvmPackages = recurseIntoAttrs + (if stdenv.isDarwin then llvmPackages_37 else llvmPackages_39); llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; @@ -5178,6 +5221,7 @@ in rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; + rust-bindgen = callPackage ../development/tools/rust/bindgen { }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; @@ -5332,6 +5376,13 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; + erlang_basho_R16B03 = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + erlang_basho_R16B03_odbc = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -5481,7 +5532,7 @@ in mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools wrapPython; - pythonProtobuf = pythonPackages.protobuf2_5; + pythonProtobuf = pythonPackages.protobuf2_6; perf = linuxPackages.perf; }; @@ -5554,7 +5605,13 @@ in # These are for compatibility and should not be used inside Nixpkgs. pythonFull = python.override{x11Support=true;}; python2Full = python2.override{x11Support=true;}; + python26Full = python26.override{includeModules=true;self=python26Full;}; + python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; + python33Full = python33.override{x11Support=true;}; + python34Full = python34.override{x11Support=true;}; + python35Full = python35.override{x11Support=true;}; + python36Full = python36.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python2Packages; @@ -5653,12 +5710,12 @@ in spark = callPackage ../applications/networking/cluster/spark { }; - spidermonkey = callPackage ../development/interpreters/spidermonkey { }; - spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; - spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; - spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { }; - spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { }; - spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.5.nix { }; + spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; + spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; + spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.nix { }; + spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; + spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { }; + spidermonkey = spidermonkey_31; supercollider = callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; @@ -5838,6 +5895,8 @@ in bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; + bloaty = callPackage ../development/tools/bloaty { }; + bossa = callPackage ../development/tools/misc/bossa { wxGTK = wxGTK30; }; @@ -6474,7 +6533,11 @@ in xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; - xcbuild = callPackage ../development/tools/xcbuild { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; + xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; + inherit (darwin) cctools bootstrap_cmds binutils; + stdenv = clangStdenv; + }; xmlindent = callPackage ../development/web/xmlindent {}; @@ -6583,9 +6646,8 @@ in beecrypt = callPackage ../development/libraries/beecrypt { }; beignet = callPackage ../development/libraries/beignet { - inherit (llvmPackages) clang-unwrapped; - inherit (xlibs) libX11; - inherit (xorg) libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; + inherit (llvmPackages_37) llvm clang-unwrapped; + inherit (xorg) libX11 libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; inherit (python3Packages) python; inherit (purePackages) gl; }; @@ -7034,6 +7096,7 @@ in ); libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; + libgit2_0_23 = callPackage ../development/libraries/git2/0.23.nix { }; gle = callPackage ../development/libraries/gle { }; @@ -7390,6 +7453,9 @@ in iml = callPackage ../development/libraries/iml { }; imlib2 = callPackage ../development/libraries/imlib2 { }; + imlib2-nox = imlib2.override { + x11Support = false; + }; imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ; @@ -7661,7 +7727,7 @@ in libdevil-nox = libdevil.override { libX11 = null; - mesa = null; + mesa_noglu = null; }; libdigidoc = callPackage ../development/libraries/libdigidoc { }; @@ -7670,6 +7736,8 @@ in libdiscid = callPackage ../development/libraries/libdiscid { }; + libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; + libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; libdmtx = callPackage ../development/libraries/libdmtx { }; @@ -8788,9 +8856,7 @@ in polarssl = mbedtls; - polkit = callPackage ../development/libraries/polkit { - spidermonkey = spidermonkey_17; - }; + polkit = callPackage ../development/libraries/polkit { }; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; @@ -8826,6 +8892,7 @@ in protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { }); # 3.0.0-beta-2 is only introduced for tensorflow. remove this version when tensorflow is moved to 3.0. protobuf3_0_0b2 = lowPrio (callPackage ../development/libraries/protobuf/3.0.0-beta-2.nix { }); + protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; @@ -9372,27 +9439,27 @@ in }); v8_3_14 = callPackage ../development/libraries/v8/3.14.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_3_30_33 = callPackage ../development/libraries/v8/3.30.33.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_4_5 = callPackage ../development/libraries/v8/4.5.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8 = callPackage ../development/libraries/v8 { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_static = lowPrio (self.v8.override { static = true; }); @@ -9528,11 +9595,6 @@ in xapian = callPackage ../development/libraries/xapian { }; - xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python - php = php56; - sphinx = pythonPackages.sphinx; - }; - xapian-omega = callPackage ../development/libraries/xapian/tools/omega { libmagic = file; }; @@ -9719,10 +9781,6 @@ in saxonb = callPackage ../development/libraries/java/saxon/default8.nix { }; - sharedobjects = callPackage ../development/libraries/java/shared-objects { - stdenv = overrideInStdenv stdenv [gnumake380]; - }; - smack = callPackage ../development/libraries/java/smack { }; swt = callPackage ../development/libraries/java/swt { @@ -9951,7 +10009,7 @@ in charybdis = callPackage ../servers/irc/charybdis {}; couchdb = callPackage ../servers/http/couchdb { - spidermonkey = spidermonkey_185; + spidermonkey = spidermonkey_1_8_5; python = python27; sphinx = python27Packages.sphinx; erlang = erlangR16; @@ -10054,9 +10112,7 @@ in mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - mediatomb = callPackage ../servers/mediatomb { - spidermonkey = spidermonkey_185; - }; + mediatomb = callPackage ../servers/mediatomb { }; memcached = callPackage ../servers/memcached {}; @@ -10194,6 +10250,14 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; + riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { + erlang = erlang_basho_R16B03; + }; + + stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { + erlang = erlang_basho_R16B03; + }; + influxdb = callPackage ../servers/nosql/influxdb { }; mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { @@ -10264,7 +10328,8 @@ in postgresql92 postgresql93 postgresql94 - postgresql95; + postgresql95 + postgresql96; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; @@ -10608,6 +10673,10 @@ in swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation {}; + ios-cross = callPackage ../os-specific/darwin/ios-cross { + inherit (darwin) binutils; + }; + xcode = callPackage ../os-specific/darwin/xcode {}; osx_sdk = callPackage ../os-specific/darwin/osx-sdk {}; @@ -11119,7 +11188,7 @@ in ]; }; grsecPatch = self.kernelPatches.grsecurity_testing; - kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ]; + kernelPatches = with self.kernelPatches; [ grsecurity_nixos_kmod grsecurity_modinst ]; extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { }; }; @@ -11721,6 +11790,8 @@ in inherit (gnome3) gsettings_desktop_schemas; + go-font = callPackage ../data/fonts/go-font { }; + gyre-fonts = callPackage ../data/fonts/gyre {}; hack-font = callPackage ../data/fonts/hack { }; @@ -12000,6 +12071,12 @@ in abook = callPackage ../applications/misc/abook { }; + acd-cli = callPackage ../applications/networking/sync/acd_cli { + inherit (python35Packages) + buildPythonApplication appdirs colorama dateutil + requests2 requests_toolbelt sqlalchemy fusepy; + }; + adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; aeolus = callPackage ../applications/audio/aeolus { }; @@ -12637,8 +12714,6 @@ in notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); - notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; - ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; @@ -12882,6 +12957,8 @@ in puddletag = callPackage ../applications/audio/puddletag { }; + w_scan = callPackage ../applications/video/w_scan { }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; @@ -12889,6 +12966,7 @@ in wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { withQt = false; withGtk = false; + inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-qt = wireshark-cli.override { withQt = true; }; @@ -13253,8 +13331,14 @@ in hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; hyperterm = self.hyper; + jackline = callPackage ../applications/networking/instant-messengers/jackline { + ocamlPackages = ocaml-ng.ocamlPackages_4_02; + }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; + singularity = callPackage ../applications/virtualization/singularity { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; wlc = callPackage ../development/libraries/wlc { }; @@ -13961,16 +14045,12 @@ in qtbase = qt55; }; - notmuch = callPackage ../applications/networking/mailreaders/notmuch { - # No need to build Emacs - notmuch.el works just fine without - # byte-compilation. Use emacsPackages.notmuch if you want to - # byte-compiled files - emacs = null; - sphinx = pythonPackages.sphinx; - }; + notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; + notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; + # Open Stack nova = callPackage ../applications/virtualization/openstack/nova.nix { }; keystone = callPackage ../applications/virtualization/openstack/keystone.nix { }; @@ -14091,6 +14171,8 @@ in phototonic = qt5.callPackage ../applications/graphics/phototonic { }; + phrasendrescher = callPackage ../tools/security/phrasendrescher { }; + phwmon = callPackage ../applications/misc/phwmon { }; pianobar = callPackage ../applications/audio/pianobar { }; @@ -14157,6 +14239,8 @@ in gtksharp = gtk-sharp-2_0; }; + plover = callPackage ../applications/misc/plover { }; + plugin-torture = callPackage ../applications/audio/plugin-torture { }; pmenu = callPackage ../applications/misc/pmenu { }; @@ -14610,6 +14694,8 @@ in git = gitMinimal; }; + ssr = callPackage ../applications/audio/soundscape-renderer {}; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; @@ -14708,7 +14794,9 @@ in taskserver = callPackage ../servers/misc/taskserver { }; - tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; + tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + inherit (pythonPackages) gyp; + }; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; @@ -14756,7 +14844,7 @@ in tig = gitAndTools.tig; tilda = callPackage ../applications/misc/tilda { - vte = gnome3.vte_290; + vte = gnome3.vte; gtk = gtk3; }; @@ -15017,13 +15105,15 @@ in # Version without X11 w3m-nox = w3m.override { x11Support = false; + imlib2 = imlib2-nox; }; # Version for batch text processing, not a good browser w3m-batch = w3m.override { graphicsSupport = false; - x11Support = false; mouseSupport = false; + x11Support = false; + imlib2 = imlib2-nox; }; weechat = callPackage ../applications/networking/irc/weechat { @@ -15323,8 +15413,7 @@ in roxterm = callPackage ../applications/misc/roxterm { inherit (pythonPackages) lockfile; - inherit (gnome3) gsettings_desktop_schemas; - vte = gnome3.vte_290; + inherit (gnome3) gsettings_desktop_schemas vte; }; xtrace = callPackage ../tools/X11/xtrace { }; @@ -15500,7 +15589,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam5 = kde5.callPackage ../applications/graphics/digikam/5.1.nix {}; + digikam5 = kde5.callPackage ../applications/graphics/digikam/5.nix {}; drumkv1 = callPackage ../applications/audio/drumkv1 { }; @@ -15591,6 +15680,8 @@ in gnugo = callPackage ../games/gnugo { }; + gogui = callPackage ../games/gogui {}; + gtypist = callPackage ../games/gtypist { }; gzdoom = callPackage ../games/gzdoom { }; @@ -16353,6 +16444,8 @@ in plink = callPackage ../applications/science/biology/plink/default.nix { }; + plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { }; + samtools = callPackage ../applications/science/biology/samtools/default.nix { }; bwa = callPackage ../applications/science/biology/bwa/default.nix { }; @@ -16967,6 +17060,8 @@ in faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { }; + faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { }; + faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; fceux = callPackage ../misc/emulators/fceux { }; @@ -17067,7 +17162,7 @@ in nixops = callPackage ../tools/package-management/nixops { }; - nixopsUnstable = nixops;# callPackage ../tools/package-management/nixops/unstable.nix { }; + nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; @@ -17517,4 +17612,6 @@ in nitrokey-app = callPackage ../tools/security/nitrokey-app { }; fpm2 = callPackage ../tools/security/fpm2 { }; + + simplenote = callPackage ../applications/misc/simplenote { }; } diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 633b4f8a211b..ed9e09802b7d 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -10,7 +10,7 @@ with pkgs; rec { libxml2 = (pkgs.libxml2.override { stdenv = emscriptenStdenv; - supportPython = false; + pythonSupport = false; }).overrideDerivation (old: { buildInputs = old.buildInputs ++ [ autoreconfHook pkgconfig zlib nodejs ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f305c55dbfa5..a3cb0a8ca1c6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, callPackage, stdenv }: +{ pkgs, callPackage, stdenv, crossSystem }: rec { @@ -49,6 +49,8 @@ rec { ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) alex happy; + inherit crossSystem; + selfPkgs = packages.ghcHEAD; }; ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec { bootPkgs = packages.ghc784; @@ -121,6 +123,11 @@ rec { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; + # TODO Support for multiple variants here + ghcCross = callPackage ../development/haskell-modules { + ghc = compiler.ghcHEAD.crossCompiler; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; + }; ghcNokinds = callPackage ../development/haskell-modules { ghc = compiler.ghcNokinds; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5e694f188e9c..391e2c80a57f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -158,6 +158,8 @@ let erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; + erm_xmpp_0_3 = callPackage ../development/ocaml-modules/erm_xmpp/0.3.nix { }; + estring = callPackage ../development/ocaml-modules/estring { }; ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { @@ -259,7 +261,13 @@ let mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; - nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { + lwt = ocaml_lwt; + }; + + notty = callPackage ../development/ocaml-modules/notty { + lwt = ocaml_lwt; + }; ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; @@ -331,12 +339,16 @@ let ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; + ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; ojquery = callPackage ../development/ocaml-modules/ojquery { }; otfm = callPackage ../development/ocaml-modules/otfm { }; + otr = callPackage ../development/ocaml-modules/otr { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; piqi = callPackage ../development/ocaml-modules/piqi { }; @@ -364,6 +376,10 @@ let textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; + tls = callPackage ../development/ocaml-modules/tls { + lwt = ocaml_lwt; + }; + type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; @@ -639,7 +655,7 @@ let then { tools = pkgs.pkgsi686Linux.stdenv.cc; } else {} ); - + glsurf = callPackage ../applications/science/math/glsurf { libpng = pkgs.libpng12; giflib = pkgs.giflib_4_1; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4ef49116bee5..5ae95864232b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7413,10 +7413,10 @@ let self = _self // overrides; _self = with self; { }; LogAny = buildPerlPackage rec { - name = "Log-Any-1.042"; + name = "Log-Any-1.045"; src = fetchurl { url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz"; - sha256 = "b2cadb25a147bd49afdab1092a4a37268f307fcb6524a679623647a22501de84"; + sha256 = "d95180c0c2d50d7d3a541e0c79d83ee6b4ad5787e1785b361fed450c2dec8400"; }; meta = { homepage = https://github.com/preaction/Log-Any; @@ -7494,10 +7494,10 @@ let self = _self // overrides; _self = with self; { }; LogLog4perl = buildPerlPackage rec { - name = "Log-Log4perl-1.47"; + name = "Log-Log4perl-1.48"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSCHILLI/${name}.tar.gz"; - sha256 = "9001dded011226538b9a50c7856815bb0dba72a1e6218fdcaba56f651356b96f"; + sha256 = "cf6e9fc1f9183fabbe540d84f603c6541458034092b7c53e41008093db62dc98"; }; meta = { homepage = https://mschilli.github.io/log4perl/; @@ -7778,10 +7778,10 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999727"; + name = "Math-BigInt-1.999800"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "4539b8e55f828a9f370b46cd6ef6618c95cb15302384a8f84c2a1fec66d4e33e"; + sha256 = "216096d1f937252bfc449b1de01b760ffaab46e753e150cc2a685f4935bd030d"; }; meta = { description = "Arbitrary size integer/float math package"; @@ -7803,10 +7803,10 @@ let self = _self // overrides; _self = with self; { }; MathBigRat = buildPerlPackage rec { - name = "Math-BigRat-0.260804"; + name = "Math-BigRat-0.260805"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "f9bf5c007c0f141df7c7887d3482d47033cf7deab094a01e2863f31bacd7ef8a"; + sha256 = "9e41be24272e262fadc1921c7f51ff218384c92e5628cb53bf62b3026710fd41"; }; propagatedBuildInputs = [ MathBigInt ]; meta = { @@ -10066,10 +10066,10 @@ let self = _self // overrides; _self = with self; { }; pcscperl = buildPerlPackage { - name = "pcsc-perl-1.4.13"; + name = "pcsc-perl-1.4.14"; src = fetchurl { - url = mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.13.tar.bz2; - sha256 = "a5f7dfb30be0346cfe80d47749994dab861592929d80786104693987b36e3684"; + url = "mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.14.tar.bz2"; + sha256 = "17f6i16jv6ci6459vh6y3sz94vgcvykjjszcl4xsykryakjvf8i7"; }; buildInputs = [ pkgs.pcsclite ]; nativeBuildInputs = [ pkgs.pkgconfig ]; @@ -10077,7 +10077,7 @@ let self = _self // overrides; _self = with self; { # tests fail; look unfinished doCheck = false; meta = { - homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-perl/; + homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; description = "Communicate with a smart card using PC/SC"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6313ff5372cd..1808d65b75c4 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -79,10 +79,10 @@ let sha256 = "1ywrsp90w6rlgq3v2vmvp2zvvykkgqqasab7h9bf3vgvgv3qasbg"; configureFlags = [ - "--with-spidermonkey=${pkgs.spidermonkey_185}" + "--with-spidermonkey=${pkgs.spidermonkey_1_8_5}" ]; - buildInputs = [ pkgs.spidermonkey_185 ]; + buildInputs = [ pkgs.spidermonkey_1_8_5 ]; }; xdebug = if isPhp7 then xdebug24 else xdebug23; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4537e1222a8..40b1b9adedfb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29,7 +29,7 @@ let in { - inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; + inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; # helpers @@ -336,34 +336,6 @@ in { }; }; - acd_cli = buildPythonPackage rec { - name = pname + "-" + version; - pname = "acd_cli"; - version = "0.3.1"; - - disabled = !isPy33; - doCheck = !isPy33; - - src = pkgs.fetchFromGitHub { - owner = "yadayada"; - repo = pname; - rev = version; - sha256 = "1ywimbisgb5g7xl9nrfwcm7dv3j8fsrjfp7bxb3l58zbsrzj6z2s"; - }; - - propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy ]; - - makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${pkgs.fuse}/lib/libfuse.so" ]; - - meta = { - description = "A command line interface and FUSE filesystem for Amazon Cloud Drive"; - homepage = https://github.com/yadayada/acd_cli; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ edwtjo ]; - }; - }; - altair = buildPythonPackage rec { name = "altair-1.0.0"; @@ -522,13 +494,13 @@ in { }; afew = buildPythonPackage rec { - rev = "3f1e5e93119788984c2193292c988ac81ecb0a45"; - name = "afew-git-2016-01-04"; + rev = "b19a88fa1c06cc03ed6c636475cf4361b616d128"; + name = "afew-git-2016-02-29"; src = pkgs.fetchurl { url = "https://github.com/teythoon/afew/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "1fi19g2j1qilh7ikp7pzn6sagkn76g740zdxgnsqmmvl2zk2yhrw"; + sha256 = "0idlyrk29bmjw3w74vn0c1a6s59phx9zhzghf2cpyqf9qdhxib8k"; }; buildInputs = with self; [ pkgs.dbacl ]; @@ -645,11 +617,11 @@ in { asgiref = buildPythonPackage rec { name = "asgiref-${version}"; - version = "0.14.0"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "1ww4z14pd7g2mwz5nyvxm4rif0rsm9h8i0lwk78v58b2j45r43lc"; + sha256 = "1jg4nxjsn7nc4vd3170xd60m6syn57m6xwyyna6r68vniq8nhg7i"; }; propagatedBuildInputs = with self ; [ six ]; @@ -663,11 +635,11 @@ in { asgi_ipc = buildPythonPackage rec { name = "asgi_ipc-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; - sha256 = "16q5x2cvx3rpnikmqv8l4clkfib8baqy7diy18rsmzj6hqqli3xy"; + sha256 = "03phyfj30s4sgaqfbmv38nfvx3kdmjwsh3558d2lxrf2gdrimmf9"; }; propagatedBuildInputs = with self ; [ asgiref msgpack posix_ipc ]; @@ -681,11 +653,11 @@ in { asgi_redis = buildPythonPackage rec { name = "asgi_redis-${version}"; - version = "0.14.1"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; - sha256 = "13ixh1nwgla7wm2xa42inwrd3g5lri89gd31xl62zhs8m6jmg122"; + sha256 = "1pdzxannmgb0as2x6xy0rk4xi8ygnsggpsa0z31pzpwbk6jsgwxd"; }; # Requires a redis server available @@ -795,6 +767,8 @@ in { rev = "0.3.7"; name = "alot-${rev}"; + disabled = isPy3k; + src = pkgs.fetchFromGitHub { owner = "pazz"; repo = "alot"; @@ -1067,7 +1041,7 @@ in { license = licenses.free; }; } else null; - + funcsigs = buildPythonPackage rec { name = "funcsigs-1.0.2"; @@ -1484,7 +1458,7 @@ in { propagatedBuildInputs = with self; [ unidecode regex ]; meta = with stdenv.lib; { - homepage = https://github.com/dimka665/awesome-slugify; + homepage = "https://github.com/dimka665/awesome-slugify"; description = "Python flexible slugify function"; license = licenses.gpl3; platforms = platforms.all; @@ -2200,6 +2174,10 @@ in { }; }; + # Build boost for this specific Python version + # TODO: use separate output for libboost_python.so + boost = pkgs.boost.override {inherit python;}; + buttersink = buildPythonPackage rec { name = "buttersink-0.6.8"; @@ -4303,11 +4281,11 @@ in { cryptography = buildPythonPackage rec { # also bump cryptography_vectors name = "cryptography-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography/${name}.tar.gz"; - sha256 = "1d8da8xbx51m4dqpy51crvcmjakmfcxpx14hh2izppifrh1fs35d"; + sha256 = "cf82ddac919b587f5e44247579b433224cc2e03332d2ea4d89aa70d7e6b64ae5"; }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors @@ -4324,11 +4302,11 @@ in { cryptography_vectors = buildPythonPackage rec { # also bump cryptography name = "cryptography_vectors-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "1z74mqwlvxlxz6b1xlflphqhgby1k77shl94zw5ncw3x3cqwbccl"; + sha256 = "e513fecd146a844da19022abd1b4dfbf3335c1941464988f501d7a16f30acdae"; }; }; @@ -8694,17 +8672,17 @@ in { python-axolotl = buildPythonPackage rec { name = "python-axolotl-${version}"; - version = "0.1.7"; + version = "0.1.35"; src = pkgs.fetchurl { url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; - sha256 = "1i3id1mjl67n4sca31s5zwq96kswgsi6lga6np83ayb45rxggvhx"; + sha256 = "0ch2d5wqfgxy22dkbxwzilq91wkqy9ficrjy39qhal8g8rdc4jr0"; }; - propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf pycrypto ]; + propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ]; meta = { - homepage = https://github.com/tgalal/python-axolotl; + homepage = "https://github.com/tgalal/python-axolotl"; description = "Python port of libaxolotl-android"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; @@ -8722,7 +8700,7 @@ in { }; meta = { - homepage = https://github.com/tgalal/python-axolotl; + homepage = "https://github.com/tgalal/python-axolotl"; description = "Curve25519 with ed25519 signatures"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; @@ -8747,7 +8725,7 @@ in { ''; meta = { - homepage = https://launchpad.net/pypolicyd-spf/; + homepage = "https://launchpad.net/pypolicyd-spf/"; description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; @@ -8950,7 +8928,7 @@ in { }; meta = { - homepage = http://bmsi.com/python/milter.html; + homepage = "http://bmsi.com/python/milter.html"; description = "Python API for Sendmail Milters (SPF)"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; @@ -8969,15 +8947,18 @@ in { sha256 = "0g5w1cira1bl9f2ji11cbr9daj947nrfydydymjp4bbxbpl2jnaq"; }; - doCheck = pythonOlder "3.5"; - buildInputs = with self; [ decorator appdirs six numpy + pytest ]; + checkPhase = '' + py.test -k 'not test_persistent_dict' + ''; + meta = { homepage = https://github.com/inducer/pytools/; description = "Miscellaneous Python lifesavers."; @@ -9102,7 +9083,7 @@ in { }; meta = { - homepage = http://sarge.readthedocs.org/; + homepage = "http://sarge.readthedocs.org/"; description = "A wrapper for subprocess which provides command pipeline functionality"; license = licenses.bsd3; platform = platforms.all; @@ -9467,16 +9448,16 @@ in { regex = buildPythonPackage rec { name = "regex-${version}"; - version = "2016.01.10"; + version = "2016.11.18"; src = pkgs.fetchurl { url = "mirror://pypi/r/regex/${name}.tar.gz"; - sha256 = "1q3rbmnijjzn7y3cm3qy49b5lqw1fq38zv974xma387lwc37d9q2"; + sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6"; }; meta = { description = "Alternative regular expression module, to replace re"; - homepage = https://bitbucket.org/mrabarnett/mrab-regex; + homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; license = licenses.psfl; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; @@ -9910,29 +9891,6 @@ in { }; }; - django_1_5 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.5.12"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz"; - sha256 = "1vbcvn6ncg7hq5i1w95h746vkq9lmp120vx63h3p56z5nsz7gpmk"; - }; - - # 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_appconf = buildPythonPackage rec { name = "django-appconf-${version}"; version = "1.0.1"; @@ -10082,21 +10040,21 @@ in { }; django_tagging = buildPythonPackage rec { - name = "django-tagging-0.3.1"; + name = "django-tagging-0.4.5"; src = pkgs.fetchurl { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; - sha256 = "e5fbeb7ca6e0c22a9a96239095dff508040ec95171e51c69e6f8ada72ea4bce2"; + sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q"; }; # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ django_1_5 ]; + propagatedBuildInputs = with self; [ django ]; meta = { description = "A generic tagging application for Django projects"; - homepage = http://code.google.com/p/django-tagging/; + homepage = https://github.com/Fantomas42/django-tagging; }; }; @@ -11023,17 +10981,17 @@ in { flask_assets = buildPythonPackage rec { name = "Flask-Assets-${version}"; - version = "0.11"; + version = "0.12"; src = pkgs.fetchurl { url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; - sha256 = "1vs59gygwhwqj37if8hiw6vd2rns09xkblaz4qkmpp6hpy3shrvf"; + sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; }; propagatedBuildInputs = with self; [ flask webassets flask_script nose ]; meta = { - homepage = http://github.com/miracle2k/flask-assets; + homepage = "http://github.com/miracle2k/flask-assets"; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; @@ -11078,11 +11036,11 @@ in { flask_login = buildPythonPackage rec { name = "Flask-Login-${version}"; - version = "0.2.2"; + version = "0.4.0"; src = pkgs.fetchurl { url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; - sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; + sha256 = "19w2f33lglkyvxqnj3qghhxa4pr8mp13235k1bd557x52imkapnj"; }; propagatedBuildInputs = with self; [ flask ]; @@ -11091,7 +11049,7 @@ in { doCheck = false; meta = { - homepage = http://github.com/miracle2k/flask-assets; + homepage = "https://github.com/maxcountryman/flask-login"; description = "User session management for Flask"; license = licenses.mit; platforms = platforms.all; @@ -11136,7 +11094,7 @@ in { propagatedBuildInputs = with self; [ flask blinker nose ]; meta = { - homepage = http://packages.python.org/Flask-Principal/; + homepage = "http://packages.python.org/Flask-Principal/"; description = "Identity management for flask"; license = licenses.bsd2; platforms = platforms.all; @@ -11175,7 +11133,7 @@ in { propagatedBuildInputs = with self; [ flask ]; meta = { - homepage = http://github.com/smurfix/flask-script; + homepage = "http://github.com/smurfix/flask-script"; description = "Scripting support for Flask"; license = licenses.bsd3; platforms = platforms.all; @@ -11954,7 +11912,7 @@ in { meta = { homepage = "http://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; - license = licenses.lgpl2; + license = licenses.lgpl3; maintainers = with maintainers; [ koral ]; }; }; @@ -12493,6 +12451,28 @@ in { }; }; + hkdf = buildPythonPackage rec { + name = "hkdf-${version}"; + version = "0.0.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/h/hkdf/${name}.tar.gz"; + sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2"; + }; + + buildInputs = with self; [ nose ]; + + checkPhase = '' + nosetests + ''; + + meta = { + description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; + homepage = "https://github.com/casebeer/python-hkdf"; + license = licenses.bsd2; + }; + }; + httpretty = buildPythonPackage rec { name = "httpretty-${version}"; version = "0.8.10"; @@ -12724,12 +12704,12 @@ in { }; ipykernel = buildPythonPackage rec { - version = "4.5.0"; + version = "4.5.1"; name = "ipykernel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "245a798edb8fd751b95750d8645d736dd739a020e7fc7d5627dac4d1c35d8295"; + sha256 = "520c855c6652651c6796a3dd8bc89d533023ac65c5ccf812908187d6f0e461da"; }; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; @@ -13391,7 +13371,7 @@ in { }; meta = { - homepage = https://github.com/jlhutch/pylru; + homepage = "https://github.com/jlhutch/pylru"; description = "A least recently used (LRU) cache implementation"; license = licenses.gpl2; platforms = platforms.all; @@ -13523,6 +13503,12 @@ in { clblas = pkgs.clblas-cuda; }; + libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else + (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py; + + libxslt = if isPy3k then throw "libxslt not supported for interpreter ${python.executable}" else + (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;}).py; + limnoria = buildPythonPackage rec { name = "limnoria-${version}"; version = "2016.05.06"; @@ -13657,45 +13643,7 @@ in { }; }; - llvmlite = let - llvm = pkgs.llvm_38; - in buildPythonPackage rec { - name = "llvmlite-${version}"; - version = "0.13.0"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/llvmlite/${name}.tar.gz"; - sha256 = "f852be3391acb2e77ef484c5d0ff90e7cf2821dcf9575e358a1f08c274c582eb"; - }; - - propagatedBuildInputs = with self; [ llvm ] ++ optional (pythonOlder "3.4") enum34; - - # Disable static linking - # https://github.com/numba/llvmlite/issues/93 - patchPhase = '' - substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" - - substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" - ''; - # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${llvm}/bin/llvm-config - ''; - checkPhase = '' - ${self.python.executable} runtests.py - ''; - - __impureHostDeps = optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - - meta = { - description = "A lightweight LLVM python binding for writing JIT compilers"; - homepage = "http://llvmlite.pydata.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; - }; + llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_38;}; lockfile = buildPythonPackage rec { name = "lockfile-${version}"; @@ -13837,7 +13785,6 @@ in { }; }; - m2crypto = buildPythonPackage rec { version = "0.24.0"; name = "m2crypto-${version}"; @@ -14410,7 +14357,7 @@ in { broken = true; }; }; - + mock = buildPythonPackage (rec { name = "mock-2.0.0"; @@ -14909,31 +14856,20 @@ in { }; }; - - plover = buildPythonPackage rec { - name = "plover-${version}"; - version = "3.0.0"; - disabled = !isPy27; + pint = buildPythonPackage rec { + name = "pint-${version}"; + version = "0.7.2"; meta = { - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; + description = "Physical quantities module"; + license = licenses.bsd3; + homepage = "https://github.com/hgrecco/pint/"; }; src = pkgs.fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1jja37nhiypdx1z6cazp8ffsf0z3yqmpdbprpdzf668lcb422rl0"; + url = "mirror://pypi/p/pint/Pint-${version}.tar.gz"; + sha256 = "1bbp5s34gcb9il2wyz4spznshahwbjvwi5bhjm7bnxk358spvf9q"; }; - - # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 - postPatch = '' - substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" - ''; - - buildInputs = with self; [ pytest mock ]; - propagatedBuildInputs = with self; [ six setuptools pyserial appdirs hidapi - wxPython xlib pkgs.wmctrl ]; }; pygal = buildPythonPackage rec { @@ -15239,15 +15175,20 @@ in { slixmpp = buildPythonPackage rec { name = "slixmpp-${version}"; - version = "1.1"; + version = "1.2.1"; disabled = pythonOlder "3.4"; src = pkgs.fetchurl { url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "030ca7e71cbb7e17fb48f83db97779fdbac0b4424cef01245f3276a110b30a6c"; + sha256 = "0fwngxf2pnmpk8vhv4pfxvl1ya3nxr4kc2z6jrh2imynbry3xfj9"; }; + patchPhase = '' + substituteInPlace slixmpp/thirdparty/gnupg.py \ + --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'" + ''; + propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules]; meta = { @@ -15768,54 +15709,17 @@ in { }; }; - numba = buildPythonPackage rec { - version = "0.27.0"; - name = "numba-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "5fc8069cdc839b8b44ac6c54260902f60cbd77bd027b20999970a81cce7008ba"; - }; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; - - propagatedBuildInputs = with self; [numpy llvmlite argparse] ++ optional (!isPy3k) funcsigs ++ optional (isPy27 || isPy33) singledispatch; - # Future work: add Cuda support. - #propagatedBuildInputs = with self; [numpy llvmlite argparse pkgs.cudatoolkit6]; - #buildPhase = '' - # export NUMBAPRO_CUDA_DRIVER= - # export NUMBAPRO_NVVM=${pkgs.cudatoolkit6} - # export NUMBAPRO_LIBDEVICE= - #''; - - # Copy test script into $out and run the test suite. - checkPhase = '' - cp runtests.py $out/${python.sitePackages}/numba/runtests.py - ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py - ''; - # ImportError: cannot import name '_typeconv' - doCheck = false; - - meta = { - homepage = http://numba.pydata.org/; - license = licenses.bsd2; - description = "Compiling Python code using LLVM"; - maintainers = with maintainers; [ fridh ]; - }; - }; + numba = callPackage ../development/python-modules/numba { }; numexpr = buildPythonPackage rec { - version = "2.5.2"; + version = "2.6.1"; name = "numexpr-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/numexpr/${name}.tar.gz"; - sha256 = "0kb6549fwfxpc4qy3l5liad2mx99dys77c6w1y2rm32wyrf5k1by"; + sha256 = "db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06"; }; - # Tests fail with python 3. https://github.com/pydata/numexpr/issues/177 - # doCheck = !isPy3k; - propagatedBuildInputs = with self; [ numpy ]; # Run the test suite. @@ -18510,12 +18414,13 @@ in { }; pip = buildPythonPackage rec { - version = "8.1.2"; - name = "pip-${version}"; + pname = "pip"; + version = "9.0.1"; + name = "${pname}-${version}"; src = pkgs.fetchurl { - url = "mirror://pypi/p/pip/pip-${version}.tar.gz"; - sha256 = "0cmpsy9lr9diskkypswm9s8glgr7w3crzh1im4zqlqv7z8zv092d"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d"; }; # pip detects that we already have bootstrapped_pip "installed", so we need @@ -18839,12 +18744,12 @@ in { }; powerline = buildPythonPackage rec { - rev = "2.1.4"; + rev = "2.4"; name = "powerline-${rev}"; src = pkgs.fetchurl { url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "0gnh5yyackmqcphiympan48dm5lc834yzspss1lp4g1wq3vpyraf"; + sha256 = "12fp3cpwgpkxcj4mfjdpsmf1h0b8pqy1icb07jdivz9kw18h0184"; }; propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ]; @@ -19990,7 +19895,7 @@ in { sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; - buildInputs = with self; [ pkgs.boost pkgs.freetype pkgs.ftgl pkgs.mesa ]; + buildInputs = with self; [ boost pkgs.freetype pkgs.ftgl pkgs.mesa ]; meta = { description = "Python bindings for FTGL (FreeType for OpenGL)"; @@ -20124,6 +20029,8 @@ in { }; }; + pyopencl = callPackage ../development/python-modules/pyopencl { }; + pyrr = buildPythonPackage rec { name = "pyrr-${version}"; version = "0.7.2"; @@ -20290,23 +20197,15 @@ in { }; PyICU = buildPythonPackage rec { - name = "PyICU-1.9.3"; + name = "PyICU-1.9.5"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyICU/${name}.tar.gz"; - sha256 = "0hps2314w7ddiwhqgw249m3hgqnny7qn542vz26jxr5k5hhrcyhs"; + sha256 = "16rmxy9y0qhqqna2v49i7nzwm09as699rbyvh4raw7w602w55c3k"; }; buildInputs = [ pkgs.icu ]; - patches = [ - # Fixes a bug in the test suite. - (pkgs.fetchpatch { - url = "https://github.com/ovalhub/pyicu/commit/6ab20d48d85638acb3a811c8676f713bd26f0df9.patch"; - sha256 = "0z4585r6bi0xxvrr93n450ka43vixx9zd063qna078vck0i3bkjg"; - }) - ]; - meta = { homepage = https://pypi.python.org/pypi/PyICU/; description = "Python extension wrapping the ICU C++ API"; @@ -20953,6 +20852,44 @@ in { }; }; + pymaging = buildPythonPackage rec { + name = "pymaging-unstable-2016-11-16"; + + src = pkgs.fetchFromGitHub { + owner = "ojii"; + repo = "pymaging"; + rev = "596a08fce5664e58d6e8c96847393fbe987783f2"; + sha256 = "18g3n7kfrark30l4vzykh0gdbnfv5wb1zvvjbs17sj6yampypn38"; + }; + + meta = { + description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; + homepage = http://pymaging.rtfd.org; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; + }; + + pymaging_png = buildPythonPackage rec { + name = "pymaging-png-unstable-2016-11-16"; + + src = pkgs.fetchFromGitHub { + owner = "ojii"; + repo = "pymaging-png"; + rev = "83d85c44e4b2342818e6c068065e031a9f81bb9f"; + sha256 = "1mknxvsq0lr1ffm8amzm3w2prn043c6ghqgpxlkw83r988p5fn57"; + }; + + propagatedBuildInputs = with self; [ pymaging ]; + + meta = { + description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; + homepage = https://github.com/ojii/pymaging-png/; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; + }; + pyPdf = buildPythonPackage rec { name = "pyPdf-1.13"; @@ -21915,6 +21852,8 @@ in { }; }; + reikna = callPackage ../development/python-modules/reikna { }; + repocheck = buildPythonPackage rec { name = "repocheck-2015-08-05"; disabled = isPy26 || isPy27; @@ -23190,6 +23129,30 @@ in { }; }; + spake2 = buildPythonPackage rec { + name = "spake2-${version}"; + version = "0.7"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/spake2/${name}.tar.gz"; + sha256 = "0rmplicbbid41qrvwc1ckyp211ban01ardms5yqqq16ixrc18a6j"; + }; + + buildInputs = with self; [ pytest ]; + + propagatedBuildInputs = with self; [ hkdf ]; + + checkPhase = '' + py.test $out + ''; + + meta = { + description = "SPAKE2 password-authenticated key exchange library"; + homepage = "http://github.com/warner/python-spake2"; + license = licenses.mit; + }; + }; + sqlite3dbm = buildPythonPackage rec { name = "sqlite3dbm-0.1.4"; disabled = isPy3k; @@ -25010,19 +24973,21 @@ in { }; traitlets = buildPythonPackage rec { - version = "4.2.2"; + version = "4.3.1"; name = "traitlets-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/traitlets/${name}.tar.gz"; - sha256 = "7d7e3070484b2fe490fa55e0acf7023afc5ed9ddabec57405f25c355158e152a"; + sha256 = "ba8c94323ccbe8fd792e45d8efe8c95d3e0744cc8c085295b607552ab573724c"; }; - buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = with self; [ipython_genutils decorator]; + LC_ALL = "en_US.UTF-8"; + + buildInputs = with self; [ pkgs.glibcLocales pytest mock ]; + propagatedBuildInputs = with self; [ipython_genutils decorator enum34]; checkPhase = '' - nosetests -v + py.test $out ''; meta = { @@ -25126,18 +25091,14 @@ in { qrcode = buildPythonPackage rec { name = "qrcode-${version}"; - version = "5.1"; + version = "5.3"; src = pkgs.fetchurl { url = "mirror://pypi/q/qrcode/${name}.tar.gz"; - sha256 = "0skzrvhjnnacrz52jml4i050vdx5lfcd3np172srxjaghdgfxg9k"; + sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"; }; - # Errors in several tests: - # TypeError: must be str, not bytes - disabled = isPy3k; - - propagatedBuildInputs = with self; [ six pillow ]; + propagatedBuildInputs = with self; [ six pillow pymaging_png ]; meta = { description = "Quick Response code generation for Python"; @@ -26023,18 +25984,18 @@ in { webassets = buildPythonPackage rec { name = "webassets-${version}"; - version = "0.11.1"; + version = "0.12.0"; src = pkgs.fetchurl { url = "mirror://pypi/w/webassets/${name}.tar.gz"; - sha256 = "0p1qypcbq9b88ipcylxh3bbnby5n6dr421wb4bwmrlcrgvj4r5lz"; + sha256 = "14m13xa5sc7iqq2j1wsd2klcwaihqlhz2l9lmn92dks2yc8hplcr"; }; propagatedBuildInputs = with self; [ pyyaml ]; meta = { description = "Media asset management for Python, with glue code for various web frameworks"; - homepage = http://github.com/miracle2k/webassets/; + homepage = "http://github.com/miracle2k/webassets/"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; @@ -27856,14 +27817,15 @@ in { graphite_web = buildPythonPackage rec { name = "graphite-web-${version}"; - version = "0.9.12"; + disabled = isPy3k; + version = "0.9.15"; src = pkgs.fetchurl rec { url = "mirror://pypi/g/graphite-web/${name}.tar.gz"; - sha256 = "472a4403fd5b5364939aee10e78f171b1489e5f6bfe6f150ed9cae8476410114"; + sha256 = "1c0kclbv8shv9nvjx19wqm4asia58s3qmd9fapchc6y9fjpjax6q"; }; - propagatedBuildInputs = with self; [ django_1_5 django_tagging whisper pycairo ldap memcached ]; + propagatedBuildInputs = with self; [ django django_tagging whisper pycairo ldap memcached ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ @@ -29441,29 +29403,29 @@ in { }; }; - poezio = buildPythonPackage rec { + poezio = buildPythonApplication rec { name = "poezio-${version}"; - version = "0.9"; + version = "0.10"; - namePrefix = ""; disabled = pythonOlder "3.4"; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr ]; - - checkPhase = '' - PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}/poezio" make test - ''; - - patches = - let patch_base = ../development/python-modules/poezio; - in [ "${patch_base}/make_default_config_writable.patch" ]; + propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ]; src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/91/${name}.tar.xz"; - sha256 = "1vc7zn4rp0ds0cdh1xcmbwx6w2qh4pnpzi5mdnj3rpl7xdr6jqzi"; + url = "http://dev.louiz.org/attachments/download/102/${name}.tar.gz"; + sha256 = "1mm0c3250p0kh7lmmjlp05hbc7byn9lknafgb906xmp4vx1p4kjn"; }; + patches = [ + ../development/python-modules/poezio/fix_gnupg_import.patch + ../development/python-modules/poezio/fix_plugins_imports.patch + ]; + + checkPhase = '' + py.test + ''; + meta = { description = "Free console XMPP client"; homepage = http://poez.io; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 332fe71f64fa..bea2cb41a69f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-10-29"; - rev = "623cc0d9328bfb949b54209443f2b4f06c41961e"; - sha256 = "1jyb0ixnrxb7m0c18p6yfi6x8rsy3yz5yc3nyz9f462fr4g6azcs"; + version = "2016-11-15"; + rev = "4ed749b5a45d596e59c454e6ffc27177bd93a221"; + sha256 = "09vw8lbwm34qp9amxzb4a2nvxzz0aaw4sas0qkay7gh4ryy5wflk"; src = fetchFromGitHub { inherit rev; |