diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 191 | ||||
| -rw-r--r-- | pkgs/top-level/haxe-packages.nix | 120 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 76 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 249 | ||||
| -rw-r--r-- | pkgs/top-level/rust-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/stage.nix | 43 |
7 files changed, 484 insertions, 224 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3c1be513ba4..deaaf4b2f2c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -185,8 +185,10 @@ with pkgs; fetchzip = callPackage ../build-support/fetchzip { }; + gitRepoToName = callPackage ../build-support/fetchgit/gitrepotoname.nix { }; + fetchFromGitHub = { - owner, repo, rev, name ? "${repo}-${rev}-src", + owner, repo, rev, name ? gitRepoToName repo rev, fetchSubmodules ? false, private ? false, githubBase ? "github.com", varPrefix ? null, ... # For hash agility @@ -223,7 +225,7 @@ with pkgs; } // passthruAttrs) // { inherit rev; }; fetchFromBitbucket = { - owner, repo, rev, name ? "${repo}-${rev}-src", + owner, repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -234,7 +236,7 @@ with pkgs; # cgit example, snapshot support is optional in cgit fetchFromSavannah = { - repo, rev, name ? "${repo}-${rev}-src", + repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -244,7 +246,7 @@ with pkgs; # gitlab example fetchFromGitLab = { - owner, repo, rev, name ? "${repo}-${rev}-src", + owner, repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -254,7 +256,7 @@ with pkgs; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { - repo, rev, name ? "${repo}-${rev}-src", + repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -579,6 +581,10 @@ with pkgs; pkgs_i686 = pkgsi686Linux; }; + adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { + adb = androidenv.platformTools; + }; + adb-sync = callPackage ../development/mobile/adb-sync { }; androidenv = callPackage ../development/mobile/androidenv { @@ -771,6 +777,14 @@ with pkgs; ''; }); + stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: { + executableToolDepends = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/stack2nix \ + --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin" + ''; + }); + caddy = callPackage ../servers/caddy { }; capstone = callPackage ../development/libraries/capstone { }; @@ -945,6 +959,8 @@ with pkgs; elementary-icon-theme = callPackage ../data/icons/elementary-icon-theme { }; + elm-github-install = callPackage ../tools/package-management/elm-github-install { }; + emby = callPackage ../servers/emby { }; enca = callPackage ../tools/text/enca { }; @@ -1388,6 +1404,8 @@ with pkgs; c14 = callPackage ../applications/networking/c14 { }; + certstrap = callPackage ../tools/security/certstrap { }; + cfssl = callPackage ../tools/security/cfssl { }; checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; @@ -1695,6 +1713,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; + ### DEVELOPMENT / EMSCRIPTEN buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; @@ -2023,6 +2043,8 @@ with pkgs; gdmap = callPackage ../tools/system/gdmap { }; + gen-oath-safe = callPackage ../tools/security/gen-oath-safe { }; + genext2fs = callPackage ../tools/filesystems/genext2fs { }; gengetopt = callPackage ../development/tools/misc/gengetopt { }; @@ -2047,6 +2069,8 @@ with pkgs; git-lfs = callPackage ../applications/version-management/git-lfs { }; + git-ftp = callPackage ../development/tools/git-ftp { }; + git-series = callPackage ../development/tools/git-series { }; git-up = callPackage ../applications/version-management/git-up { }; @@ -2080,6 +2104,8 @@ with pkgs; gmvault = callPackage ../tools/networking/gmvault { }; + gnash = callPackage ../misc/gnash { }; + gnaural = callPackage ../applications/audio/gnaural { stdenv = overrideCC stdenv gcc49; }; @@ -2237,6 +2263,12 @@ with pkgs; zfsSupport = false; }; + grub2_xen = callPackage ../tools/misc/grub/2.0x.nix { + xenSupport = true; + }; + + grub2_pvgrub_image = callPackage ../tools/misc/grub/pvgrub_image { }; + grub4dos = callPackage ../tools/misc/grub4dos { stdenv = stdenv_32bit; }; @@ -2342,6 +2374,10 @@ with pkgs; hddtemp = callPackage ../tools/misc/hddtemp { }; + hdf4 = callPackage ../tools/misc/hdf4 { + szip = null; + }; + hdf5 = callPackage ../tools/misc/hdf5 { gfortran = null; szip = null; @@ -2548,6 +2584,8 @@ with pkgs; jade = callPackage ../tools/text/sgml/jade { }; + jd = callPackage ../development/tools/jd { }; + jd-gui = callPackage_i686 ../tools/security/jd-gui { }; jdiskreport = callPackage ../tools/misc/jdiskreport { }; @@ -2707,6 +2745,8 @@ with pkgs; kzipmix = callPackage_i686 ../tools/compression/kzipmix { }; + mailcatcher = callPackage ../development/web/mailcatcher { }; + makebootfat = callPackage ../tools/misc/makebootfat { }; matrix-synapse = callPackage ../servers/matrix-synapse { }; @@ -3296,6 +3336,8 @@ with pkgs; ngrok = callPackage ../tools/networking/ngrok { }; + noice = callPackage ../applications/misc/noice { }; + noip = callPackage ../tools/networking/noip { }; nomad = callPackage ../applications/networking/cluster/nomad { }; @@ -4503,6 +4545,8 @@ with pkgs; uriparser = callPackage ../development/libraries/uriparser {}; + urlscan = callPackage ../applications/misc/urlscan { }; + urlview = callPackage ../applications/misc/urlview {}; usbmuxd = callPackage ../tools/misc/usbmuxd {}; @@ -5446,9 +5490,10 @@ with pkgs; psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); - inherit (ocamlPackages) haxe; - - hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; + inherit (ocamlPackages.haxe) haxe_3_2 haxe_3_4; + haxe = haxe_3_4; + haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); + inherit (haxePackages) hxcpp; hhvm = callPackage ../development/compilers/hhvm { boost = boost160; @@ -5718,6 +5763,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }); + mono50 = lowPrio (callPackage ../development/compilers/mono/5.0.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation; + }); + monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; @@ -6077,7 +6127,8 @@ with pkgs; luaPackages = lua52Packages; - luajit = callPackage ../development/interpreters/luajit {}; + inherit (callPackages ../development/interpreters/luajit {}) + luajit luajit_2_0 luajit_2_1; luarocks = luaPackages.luarocks; @@ -6506,6 +6557,8 @@ with pkgs; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; + bloaty = callPackage ../development/tools/bloaty { }; bossa = callPackage ../development/tools/misc/bossa { @@ -6524,7 +6577,7 @@ with pkgs; pythonPackages = python2Packages; }; buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view ]); + buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view ]); buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; @@ -6643,6 +6696,13 @@ with pkgs; cscope = callPackage ../development/tools/misc/cscope { }; + csmith = callPackage ../development/tools/misc/csmith { + inherit (perlPackages) perl SysCPU; + # Workaround optional dependency on libbsd that's + # currently broken on Darwin. + libbsd = if stdenv.isDarwin then null else libbsd; + }; + csslint = callPackage ../development/web/csslint { }; libcxx = llvmPackages.libcxx; @@ -6959,6 +7019,8 @@ with pkgs; noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + obuild = callPackage ../development/tools/ocaml/obuild { }; + omake = callPackage ../development/tools/ocaml/omake { inherit (ocamlPackages_4_02) ocaml; }; @@ -7505,6 +7567,7 @@ with pkgs; db53 = callPackage ../development/libraries/db/db-5.3.nix { }; db6 = db60; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; + db62 = callPackage ../development/libraries/db/db-6.2.nix { }; dbus = callPackage ../development/libraries/dbus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; @@ -9512,6 +9575,8 @@ with pkgs; openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; openjpeg = openjpeg_2_1; + openpa = callPackage ../development/libraries/openpa { }; + opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { }; @@ -9686,6 +9751,8 @@ with pkgs; re2 = callPackage ../development/libraries/re2 { }; + qbs = callPackage ../development/tools/build-managers/qbs { }; + qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; }; @@ -10302,6 +10369,7 @@ with pkgs; v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (python2Packages) python gyp; + cctools = darwin.cctools; }; v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix { @@ -10389,7 +10457,7 @@ with pkgs; webkitgtk = webkitgtk216x; - webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix { + webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; inherit (darwin) libobjc; @@ -10400,7 +10468,7 @@ with pkgs; gst-plugins-base = gst_all_1.gst-plugins-base; }; - webkitgtk2 = webkitgtk24x.override { + webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { withGtk2 = true; enableIntrospection = false; }; @@ -11045,6 +11113,8 @@ with pkgs; myserver = callPackage ../servers/http/myserver { }; + nas = callPackage ../servers/nas { }; + neard = callPackage ../servers/neard { }; nginx = nginxStable; @@ -11260,6 +11330,7 @@ with pkgs; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; + prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; @@ -11425,6 +11496,8 @@ with pkgs; shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; + piwik = callPackage ../servers/web-apps/piwik { }; + axis2 = callPackage ../servers/http/tomcat/axis2 { }; unifi = callPackage ../servers/unifi { }; @@ -11777,6 +11850,8 @@ with pkgs; flex = flex_2_5_35; }; + iptstate = callPackage ../os-specific/linux/iptstate { } ; + ipset = callPackage ../os-specific/linux/ipset { }; irqbalance = callPackage ../os-specific/linux/irqbalance { }; @@ -11867,6 +11942,8 @@ with pkgs; kernelPatches = with kernelPatches; [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes + kernelPatches.modinst_arg_list_too_long + kernelPatches.cpu-cgroup-v2."4.11" ]; extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; @@ -11951,6 +12028,22 @@ with pkgs; ]; }; + linux_4_12 = callPackage ../os-specific/linux/kernel/linux-4.12.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12121,7 +12214,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_11; + linuxPackages_latest = linuxPackages_4_12; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -12132,6 +12225,7 @@ with pkgs; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_11); + linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -12147,7 +12241,7 @@ with pkgs; linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); # Hardened linux - linux_hardened = let linux = pkgs.linux_4_11; in linux.override { + linux_hardened = let linux = pkgs.linuxPackages_latest.kernel; in linux.override { extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; inherit (linux) version; @@ -12360,6 +12454,8 @@ with pkgs; # Building with `xen` instead of `xen-slim` is possible, but makes no sense. qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-slim; }); qemu_xen-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-light; }); + qemu_xen_4_8 = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen_4_8-slim; }); + qemu_xen_4_8-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen_4_8-light; }); qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; }); @@ -12859,6 +12955,8 @@ with pkgs; mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; + monoid = callPackage ../data/fonts/monoid { }; + mononoki = callPackage ../data/fonts/mononoki { }; moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; @@ -12904,6 +13002,8 @@ with pkgs; paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; + papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; + pecita = callPackage ../data/fonts/pecita {}; paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {}; @@ -13010,6 +13110,8 @@ with pkgs; ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; + ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {}; + tzdata = callPackage ../data/misc/tzdata { }; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; @@ -13182,6 +13284,8 @@ with pkgs; audio-recorder = callPackage ../applications/audio/audio-recorder { }; + autotrace = callPackage ../applications/graphics/autotrace {}; + milkytracker = callPackage ../applications/audio/milkytracker { }; schismtracker = callPackage ../applications/audio/schismtracker { }; @@ -13561,6 +13665,10 @@ with pkgs; dmenu2 = callPackage ../applications/misc/dmenu2 { }; + dmensamenu = callPackage ../applications/misc/dmensamenu { + inherit (python3Packages) buildPythonApplication requests; + }; + dmtx = dmtx-utils; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { @@ -13584,6 +13692,10 @@ with pkgs; doodle = callPackage ../applications/search/doodle { }; + dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; + + draftsight = callPackage ../applications/graphics/draftsight { }; + droopy = callPackage ../applications/networking/droopy { inherit (python3Packages) wrapPython; }; @@ -13621,7 +13733,7 @@ with pkgs; eaglemode = callPackage ../applications/misc/eaglemode { }; - eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk2 = null; }); + eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk24x-gtk2 = null; }); ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; @@ -14241,7 +14353,7 @@ with pkgs; inherit (gnome3) dconf; gconf = gnome2.GConf; goffice = goffice_0_8; - webkit = webkitgtk2; + webkit = webkitgtk24x-gtk2; guile = guile_1_8; slibGuile = slibGuile.override { scheme = guile_1_8; }; glib = glib; @@ -14624,7 +14736,7 @@ with pkgs; jbrout = callPackage ../applications/graphics/jbrout { }; jumanji = callPackage ../applications/networking/browsers/jumanji { - webkitgtk = webkitgtk24x; + webkitgtk = webkitgtk24x-gtk3; gtk = gtk3; }; @@ -14959,9 +15071,7 @@ with pkgs; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { - ocaml = ocamlPackages_4_01_0.ocaml; - }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; MMA = callPackage ../applications/audio/MMA { }; @@ -14999,6 +15109,8 @@ with pkgs; mopidy-local-images = callPackage ../applications/audio/mopidy-local-images { }; + mopidy-local-sqlite = callPackage ../applications/audio/mopidy-local-sqlite { }; + mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; @@ -15620,7 +15732,7 @@ with pkgs; }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils; + inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; @@ -16096,6 +16208,8 @@ with pkgs; thinkingRock = callPackage ../applications/misc/thinking-rock { }; + nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; libpng = libpng_apng; @@ -16212,7 +16326,7 @@ with pkgs; uwimap = callPackage ../tools/networking/uwimap { }; uzbl = callPackage ../applications/networking/browsers/uzbl { - webkit = webkitgtk2; + webkit = webkitgtk24x-gtk2; }; utox = callPackage ../applications/networking/instant-messengers/utox { }; @@ -16641,6 +16755,9 @@ with pkgs; xen = xenPackages.xen_4_5-vanilla; xen-slim = xenPackages.xen_4_5-slim; xen-light = xenPackages.xen_4_5-light; + xen_4_8 = xenPackages.xen_4_8-vanilla; + xen_4_8-slim = xenPackages.xen_4_8-slim; + xen_4_8-light = xenPackages.xen_4_8-light; xkbset = callPackage ../tools/X11/xkbset { }; @@ -16676,7 +16793,7 @@ with pkgs; gconf = gnome2.GConf; inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper; python = python27; - webkitgtk = webkitgtk2; + webkitgtk = webkitgtk24x-gtk2; }; xournal = callPackage ../applications/graphics/xournal { @@ -16876,6 +16993,8 @@ with pkgs; bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; + bench = haskell.lib.justStaticExecutables haskellPackages.bench; + beret = callPackage ../games/beret { }; bitsnbots = callPackage ../games/bitsnbots { @@ -17513,7 +17632,9 @@ with pkgs; gnome3 = gnome3_22; gnomeExtensions = { + caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; + topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; }; hsetroot = callPackage ../tools/X11/hsetroot { }; @@ -17644,6 +17765,10 @@ with pkgs; igv = callPackage ../applications/science/biology/igv { }; + iv = callPackage ../applications/science/biology/iv { + neuron-version = neuron.version; + }; + neuron = callPackage ../applications/science/biology/neuron { python = null; }; @@ -17652,6 +17777,8 @@ with pkgs; mpi = pkgs.openmpi; }); + neuron-full = neuron-mpi.override { inherit python; }; + mrbayes = callPackage ../applications/science/biology/mrbayes { }; minc_tools = callPackage ../applications/science/biology/minc-tools { }; @@ -17808,6 +17935,10 @@ with pkgs; abella = callPackage ../applications/science/logic/abella {}; + acgtk = callPackage ../applications/science/logic/acgtk { + ocamlPackages = ocamlPackages_4_03; + }; + alt-ergo = callPackage ../applications/science/logic/alt-ergo { ocamlPackages = ocamlPackages_4_02; }; @@ -17976,6 +18107,8 @@ with pkgs; picosat = callPackage ../applications/science/logic/picosat {}; + libpoly = callPackage ../applications/science/logic/poly/default.nix {}; + prooftree = (with ocamlPackages_4_01_0; callPackage ../applications/science/logic/prooftree { camlp5 = camlp5_transitional; @@ -18384,6 +18517,8 @@ with pkgs; greybird = callPackage ../misc/themes/greybird { }; + guetzli = callPackage ../applications/graphics/guetzli { }; + gxemul = callPackage ../misc/emulators/gxemul { }; hatari = callPackage ../misc/emulators/hatari { }; @@ -18640,10 +18775,10 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_6; + terraform_0_9_11; terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_6; + terraform_0_9 = terraform_0_9_11; terraform = terraform_0_9; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; @@ -18717,12 +18852,12 @@ with pkgs; }); vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { - webkit = webkitgtk2; + webkit = webkitgtk24x-gtk2; }; vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { - webkit = webkitgtk2; + webkit = webkitgtk24x-gtk2; }; vimb = wrapFirefox vimb-unwrapped { }; @@ -18819,6 +18954,8 @@ with pkgs; wxGTK = wxGTK30; }; + x11idle = callPackage ../tools/misc/x11idle {}; + x2x = callPackage ../tools/X11/x2x { }; xboxdrv = callPackage ../misc/drivers/xboxdrv { }; diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix new file mode 100644 index 000000000000..5a85dc3433ba --- /dev/null +++ b/pkgs/top-level/haxe-packages.nix @@ -0,0 +1,120 @@ +{ stdenv, fetchzip, fetchFromGitHub, newScope, haxe, neko, nodejs, wine, php, python3, jdk, mono, haskellPackages, fetchpatch }: + +let + self = haxePackages; + callPackage = newScope self; + haxePackages = with self; { + + withCommas = stdenv.lib.replaceChars ["."] [","]; + + # simulate "haxelib dev $libname ." + simulateHaxelibDev = libname: '' + devrepo=$(mktemp -d) + mkdir -p "$devrepo/${withCommas libname}" + echo $(pwd) > "$devrepo/${withCommas libname}/.dev" + export HAXELIB_PATH="$HAXELIB_PATH:$devrepo" + ''; + + installLibHaxe = { libname, version, files ? "*" }: '' + mkdir -p "$out/lib/haxe/${withCommas libname}/${withCommas version}" + echo -n "${version}" > $out/lib/haxe/${withCommas libname}/.current + cp -dpR ${files} "$out/lib/haxe/${withCommas libname}/${withCommas version}/" + ''; + + buildHaxeLib = { + libname, + version, + sha256, + meta, + ... + } @ attrs: + stdenv.mkDerivation (attrs // { + name = "${libname}-${version}"; + + buildInputs = (attrs.buildInputs or []) ++ [ haxe neko ]; # for setup-hook.sh to work + src = fetchzip rec { + name = "${libname}-${version}"; + url = "http://lib.haxe.org/files/3.0/${withCommas name}.zip"; + inherit sha256; + stripRoot = false; + }; + + installPhase = attrs.installPhase or '' + runHook preInstall + ( + if [ $(ls $src | wc -l) == 1 ]; then + cd $src/* || cd $src + else + cd $src + fi + ${installLibHaxe { inherit libname version; }} + ) + runHook postInstall + ''; + + meta = { + homepage = "http://lib.haxe.org/p/${libname}"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.all; + description = throw "please write meta.description"; + } // attrs.meta; + }); + + hxcpp = buildHaxeLib rec { + libname = "hxcpp"; + version = "3.4.64"; + sha256 = "04gyjm6wqmsm0ifcfkxmq1yv8xrfzys3z5ajqnvvjrnks807mw8q"; + postFixup = '' + for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do + chmod +w "$f" + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true + done + ''; + meta.description = "Runtime support library for the Haxe C++ backend"; + }; + + hxjava = buildHaxeLib { + libname = "hxjava"; + version = "3.2.0"; + sha256 = "1vgd7qvsdxlscl3wmrrfi5ipldmr4xlsiwnj46jz7n6izff5261z"; + meta.description = "Support library for the Java backend of the Haxe compiler"; + propagatedBuildInputs = [ jdk ]; + }; + + hxcs = buildHaxeLib { + libname = "hxcs"; + version = "3.4.0"; + sha256 = "0f5vgp2kqnpsbbkn2wdxmjf7xkl0qhk9lgl9kb8d5wdy89nac6q6"; + meta.description = "Support library for the C# backend of the Haxe compiler"; + propagatedBuildInputs = [ mono ]; + }; + + hxnodejs_4 = buildHaxeLib { + libname = "hxnodejs"; + version = "4.0.9"; + sha256 = "0b7ck48nsxs88sy4fhhr0x1bc8h2ja732zzgdaqzxnh3nir0bajm"; + meta.description = "Extern definitions for node.js 4.x"; + }; + + hxnodejs_6 = let + libname = "hxnodejs"; + version = "6.9.0"; + in stdenv.mkDerivation rec { + name = "${libname}-${version}"; + src = fetchFromGitHub { + owner = "HaxeFoundation"; + repo = "hxnodejs"; + rev = "cf80c6a"; + sha256 = "0mdiacr5b2m8jrlgyd2d3vp1fha69lcfb67x4ix7l7zfi8g460gs"; + }; + installPhase = installLibHaxe { inherit libname version; }; + meta = { + homepage = "http://lib.haxe.org/p/${libname}"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.all; + description = "Extern definitions for node.js 6.9"; + }; + }; + }; +in self diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1038e13dbcd3..d7a6c6cb63d8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -15,8 +15,6 @@ let buildOcaml = callPackage ../build-support/ocaml { }; - acgtk = callPackage ../applications/science/logic/acgtk { }; - alcotest = callPackage ../development/ocaml-modules/alcotest {}; angstrom = callPackage ../development/ocaml-modules/angstrom { }; @@ -114,9 +112,7 @@ let }; camlimages = camlimages_4_1; - conduit = callPackage ../development/ocaml-modules/conduit { - lwt = ocaml_lwt; - }; + benchmark = callPackage ../development/ocaml-modules/benchmark { }; biniou = callPackage ../development/ocaml-modules/biniou { }; @@ -132,10 +128,24 @@ let cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { }; - cohttp = callPackage ../development/ocaml-modules/cohttp { - lwt = ocaml_lwt; + cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix { + lwt = lwt2; + }; + + cohttp = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/ocaml-modules/cohttp { } + else cohttp_p4; + + conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix { + lwt = lwt2; }; + conduit = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/ocaml-modules/conduit { } + else conduit_p4; + config-file = callPackage ../development/ocaml-modules/config-file { }; containers = callPackage ../development/ocaml-modules/containers { }; @@ -162,6 +172,8 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; + decompress = callPackage ../development/ocaml-modules/decompress { }; + dolmen = callPackage ../development/ocaml-modules/dolmen { }; dolog = callPackage ../development/ocaml-modules/dolog { }; @@ -170,7 +182,7 @@ let eff = callPackage ../development/interpreters/eff { }; - eliom = callPackage ../development/ocaml-modules/eliom { }; + eliom = callPackage ../development/ocaml-modules/eliom { lwt = lwt2; }; enumerate = callPackage ../development/ocaml-modules/enumerate { }; @@ -214,6 +226,8 @@ let higlo = callPackage ../development/ocaml-modules/higlo { }; + inotify = callPackage ../development/ocaml-modules/inotify { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { }; @@ -235,6 +249,12 @@ let gg = callPackage ../development/ocaml-modules/gg { }; + git = callPackage ../development/ocaml-modules/git { }; + + git-http = callPackage ../development/ocaml-modules/git-http { }; + + git-unix = callPackage ../development/ocaml-modules/git-unix { }; + gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; gtktop = callPackage ../development/ocaml-modules/gtktop { }; @@ -248,7 +268,7 @@ let pcre = ocaml_pcre; }; - js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; }; jsonm = callPackage ../development/ocaml-modules/jsonm { }; @@ -270,9 +290,9 @@ let gtkmathview = callPackage ../development/libraries/gtkmathview { }; }; - lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { }; + lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; }; lambdaTerm = - if lib.versionOlder "4.01" ocaml.version + if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/lambda-term { } else lambdaTerm-1_6; @@ -284,13 +304,27 @@ let lwt = ocaml_lwt; }; + lwt2 = callPackage ../development/ocaml-modules/lwt { }; + + lwt3 = if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/lwt { + version = "3.0.0"; + } + else throw "lwt3 is not available for OCaml ${ocaml.version}"; + + ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; + + lwt_react = callPackage ../development/ocaml-modules/lwt_react { + lwt = lwt3; + }; + macaque = callPackage ../development/ocaml-modules/macaque { }; magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; magick = callPackage ../development/ocaml-modules/magick { }; - markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; + markup = callPackage ../development/ocaml-modules/markup { lwt = lwt2; }; menhir = callPackage ../development/ocaml-modules/menhir { }; @@ -306,6 +340,8 @@ let mparser = callPackage ../development/ocaml-modules/mparser { }; + mstruct = callPackage ../development/ocaml-modules/mstruct { }; + mtime = callPackage ../development/ocaml-modules/mtime { }; nocrypto = callPackage ../development/ocaml-modules/nocrypto { @@ -352,8 +388,6 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; - ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; - ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; @@ -393,11 +427,15 @@ let ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; }; + ocp-ocamlres = callPackage ../development/ocaml-modules/ocp-ocamlres { }; + ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; + ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { }; + ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; @@ -513,11 +551,11 @@ let ppx_tools_versioned = callPackage ../development/ocaml-modules/ppx_tools_versioned { }; + ptmap = callPackage ../development/ocaml-modules/ptmap { }; + pycaml = callPackage ../development/ocaml-modules/pycaml { }; - qcheck = callPackage ../development/ocaml-modules/qcheck { - oasis = ocaml_oasis; - }; + qcheck = callPackage ../development/ocaml-modules/qcheck { }; qtest = callPackage ../development/ocaml-modules/qtest { }; @@ -525,6 +563,8 @@ let reason = callPackage ../development/compilers/reason { }; + rope = callPackage ../development/ocaml-modules/rope { }; + rresult = callPackage ../development/ocaml-modules/rresult { }; safepass = callPackage ../development/ocaml-modules/safepass { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fe6e513dec9d..0bd8b0c5b0d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5772,6 +5772,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Extensions and convenience methods to manage background processes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -7208,11 +7209,11 @@ let self = _self // overrides; _self = with self; { ImageExifTool = buildPerlPackage rec { name = "Image-ExifTool-${version}"; - version = "10.48"; + version = "10.55"; src = fetchurl { url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; - sha256 = "1wbwapwhv4imh1lj4dw4a8z2mhw983wk5pzdbp7pkijfji0vjj0p"; + sha256 = "0z8zwjjfvyllnhsafhddbybywpgqv0pl1dbn1g034cs27yj836q2"; }; meta = with stdenv.lib; { @@ -7753,6 +7754,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; }; + LANG="C"; }; LocaleMaketext = buildPerlPackage { @@ -10717,16 +10719,16 @@ let self = _self // overrides; _self = with self; { }; PDFAPI2 = buildPerlPackage rec { - name = "PDF-API2-2.030"; + name = "PDF-API2-2.033"; src = fetchurl { url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz"; - sha256 = "a802c25c1f00b093778223fc7aea94ebd87a9abdb915151746b8ee5d4a358769"; + sha256 = "9c0866ec1a3053f73afaca5f5cdbe6925903b4ce606f4bf4ac317731a69d27a0"; }; + buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; meta = { description = "Facilitates the creation and modification of PDF files"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ maintainers.rycee ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -12621,6 +12623,15 @@ let self = _self // overrides; _self = with self; { }; }; + SysCPU = buildPerlPackage rec { + name = "Sys-CPU-0.61"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MZ/MZSANFORD/${name}.tar.gz"; + sha256 = "1r6976bs86j7zp51m5vh42xlyah951jgdlkimv202413kjvqc2i5"; + }; + buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; + }; + SysHostnameLong = buildPerlPackage rec { name = "Sys-Hostname-Long-1.4"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 906f9b6b3919..1ad11bbd4cf3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -986,10 +986,11 @@ in { }; ansible = self.ansible2; - ansible2 = self.ansible_2_2; + ansible2 = self.ansible_2_3; ansible_2_1 = callPackage ../development/python-modules/ansible/2.1.nix {}; ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {}; + ansible_2_3 = callPackage ../development/python-modules/ansible/2.3.nix {}; apipkg = buildPythonPackage rec { name = "apipkg-1.4"; @@ -3808,6 +3809,8 @@ in { }; }; + codecov = callPackage ../development/python-modules/codecov {}; + cogapp = buildPythonPackage rec { version = "2.3"; name = "cogapp-${version}"; @@ -4824,7 +4827,7 @@ in { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd"; }; - buildInputs = with self; [ pyramid_mako nose django_1_9 jinja2 tornado pyramid Mako ]; + buildInputs = with self; [ pyramid_mako nose django jinja2 tornado pyramid Mako ]; propagatedBuildInputs = with self; [ six ]; patchPhase = '' sed -i 's/1.4.99/1.99/' setup.py @@ -7059,6 +7062,18 @@ in { }; }; + google-compute-engine = buildPythonPackage rec { + version = "2.3.0"; + name = "google-compute-engine-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/g/google-compute-engine/google-compute-engine-${version}.tar.gz"; + sha256 = "1pjj95b3l61h8xz5kjfcgnql066cr8bq5wl480a6dxd2inw8mynf"; + }; + + propagatedBuildInputs = with self; [ boto ]; + }; + googlecl = buildPythonPackage rec { version = "0.9.14"; name = "googlecl-${version}"; @@ -9819,34 +9834,13 @@ in { gdal = self.gdal; }; + # TODO: Django 1.10 will be maintained until the end of the year. Therefore, + # it will be dropped before 17.09. + # https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597 django_1_10 = callPackage ../development/python-modules/django/1_10.nix { gdal = self.gdal; }; - django_1_9 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.9.13"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "079zspfsvfnv9wf6qvg8xmz1m23d0723p2nqyk8gfqb012jxn1y0"; - }; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - # too complicated to setup - doCheck = false; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; - }; - django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18"; @@ -9871,32 +9865,6 @@ in { }; }; - django_1_6 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.6.11.5"; - - # Support to python-3.4 and higher was introduced in django_1_7 - disabled = !(isPy26 || isPy27 || isPy33); - - src = pkgs.fetchurl { - url = "https://downloads.reviewboard.org/releases/Django/1.6/Django-${version}.tar.gz"; - sha256 = "0yj0fw3iql031z8l5ik1fb25sk3l5bw2vc63bbyg5rz2k3znl4il"; - }; - - # 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"; @@ -9994,7 +9962,7 @@ in { sha256 = "1qbcx54hq8iy3n2n6cki3bka1m9rp39np4hqddrm9knc954fb7nv"; }; - propagatedBuildInputs = with self; [ django_1_6 ]; + propagatedBuildInputs = with self; [ django ]; meta = { description = "A database schema evolution tool for the Django web framework"; @@ -10004,6 +9972,8 @@ in { django_guardian = callPackage ../development/python-modules/django_guardian.nix { }; + django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; + django_tagging = buildPythonPackage rec { name = "django-tagging-0.4.5"; @@ -10030,7 +10000,7 @@ in { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; sha256 = "03zlbq13rydfh28wh0jk3x3cjk9x6jjmqnx1i3ngjmfwbxf8x6j1"; }; - propagatedBuildInputs = with self; [ django_1_6 ]; + propagatedBuildInputs = with self; [ django ]; }); django_classytags = buildPythonPackage rec { @@ -10232,7 +10202,7 @@ in { sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha"; }; - propagatedBuildInputs = with self; [ django_1_6 futures ]; + propagatedBuildInputs = with self; [ django futures ]; meta = with stdenv.lib; { description = "Pipeline is an asset packaging library for Django"; @@ -10250,7 +10220,10 @@ in { }); - djblets = buildPythonPackage rec { + djblets = if (versionOlder self.django.version "1.6.11") || + (versionAtLeast self.django.version "1.9") + then throw "djblets only suported for Django<1.8.999,>=1.6.11" + else buildPythonPackage rec { name = "Djblets-0.9"; src = pkgs.fetchurl { @@ -10259,7 +10232,7 @@ in { }; propagatedBuildInputs = with self; [ - django_1_6 feedparser django_pipeline_1_3 pillowfight pytz ]; + django feedparser django_pipeline_1_3 pillowfight pytz ]; meta = { description = "A collection of useful extensions for Django"; @@ -11606,19 +11579,7 @@ in { }; - gflags = buildPythonPackage rec { - name = "gflags-2.0"; - - src = pkgs.fetchurl { - url = "http://python-gflags.googlecode.com/files/python-${name}.tar.gz"; - sha256 = "1mkc7315bpmh39vbn0jq237jpw34zsrjr1sck98xi36bg8hnc41i"; - }; - - meta = { - homepage = http://code.google.com/p/python-gflags/; - description = "A module for command line handling, similar to Google's gflags for C++"; - }; - }; + gflags = callPackage ../development/python-modules/gflags { }; ghdiff = callPackage ../development/python-modules/ghdiff.nix { }; @@ -11915,6 +11876,7 @@ in { patches = optionals pkgs.stdenv.isDarwin [ ../development/python-modules/gyp/no-darwin-cflags.patch + ../development/python-modules/gyp/no-xcode.patch ]; disabled = isPy3k; @@ -13459,6 +13421,8 @@ in { }; }; + markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; + markdown-macros = buildPythonPackage rec { name = "markdown-macros-${version}"; version = "0.1.2"; @@ -13492,7 +13456,10 @@ in { }; }; - mathics = buildPythonPackage rec { + mathics = if (versionOlder self.django.version "1.8") || + (versionAtLeast self.django.version "1.9") + then throw "mathics only supports django-1.8.x" + else buildPythonPackage rec { name = "mathics-${version}"; version = "0.9"; src = pkgs.fetchFromGitHub { @@ -13518,7 +13485,7 @@ in { propagatedBuildInputs = with self; [ cython sympy - django_1_8 + django ply mpmath dateutil @@ -13545,15 +13512,15 @@ in { mccabe = callPackage ../development/python-modules/mccabe { }; mechanize = buildPythonPackage (rec { - name = "mechanize-0.2.5"; + name = "mechanize-0.3.5"; disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/m/mechanize/${name}.tar.gz"; - sha256 = "0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf"; + sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl"; }; - propagatedBuildInputs = with self; [ clientform ]; + propagatedBuildInputs = with self; [ clientform html5lib ]; doCheck = false; @@ -13656,7 +13623,7 @@ in { buildInputs = with self; [ pyflakes pep8 ]; propagatedBuildInputs = with self; [ - django_1_6 filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 + django filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow ]; @@ -20695,7 +20662,7 @@ in { buildInputs = [ pkgs.pkgconfig pkgs.gtk2 self.pygtk pkgs.libxml2 - pkgs.libxslt pkgs.libsoup pkgs.webkitgtk2 pkgs.icu + pkgs.libxslt pkgs.libsoup pkgs.webkitgtk24x-gtk2 pkgs.icu ]; meta = { @@ -21290,7 +21257,7 @@ in { buildInputs = with self; [ coverage mock nose geopy ]; propagatedBuildInputs = with self; [ - django_1_6 dateutil_1_5 whoosh pysolr elasticsearch + django dateutil_1_5 whoosh pysolr elasticsearch ]; patchPhase = '' @@ -21375,7 +21342,7 @@ in { ''; propagatedBuildInputs = with self; - [ django_1_6 recaptcha_client pytz memcached dateutil_1_5 paramiko flup + [ django recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments djblets django_evolution pycrypto pysvn pillow psycopg2 django-haystack python_mimeparse markdown django-multiselectfield ]; @@ -25202,30 +25169,7 @@ in { }; }; - virtualenv = buildPythonPackage rec { - name = "virtualenv-15.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/virtualenv/${name}.tar.gz"; - sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d"; - }; - - pythonPath = [ self.recursivePthLoader ]; - - patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; - - propagatedBuildInputs = with self; [ ]; - - # Tarball doesn't contain tests - doCheck = false; - - meta = { - description = "A tool to create isolated Python environments"; - homepage = http://www.virtualenv.org; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; - }; - }; + virtualenv = callPackage ../development/python-modules/virtualenv { }; virtualenv-clone = buildPythonPackage rec { name = "virtualenv-clone-0.2.5"; @@ -27181,7 +27125,7 @@ EOF sha256 = "1c0kclbv8shv9nvjx19wqm4asia58s3qmd9fapchc6y9fjpjax6q"; }; - propagatedBuildInputs = with self; [ django_1_6 django_tagging_0_3 whisper pycairo ldap memcached pytz ]; + propagatedBuildInputs = with self; [ django django_tagging_0_3 whisper pycairo ldap memcached pytz ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ @@ -28565,7 +28509,7 @@ EOF disabled = isPyPy; # Wants to set up Django doCheck = false; - propagatedBuildInputs = with self; [ django_1_9 smartypants jinja2 ]; + propagatedBuildInputs = with self; [ django smartypants jinja2 ]; meta = { description = "Filters to enhance web typography, including support for Django & Jinja templates"; homepage = "https://github.com/mintchaos/typogrify"; @@ -30141,13 +30085,13 @@ EOF pwntools = buildPythonPackage rec { name = "pwntools-${version}"; - version = "3.1.0"; + version = "3.7.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pwntools/${name}.tar.gz"; - sha256 = "1siyky6iq2b155sfjhx10yg2ihvjp2s3kr6i0n5z9v5pi0r7gc6d"; + sha256 = "1d2q42cmgh7l2k6l2gy4zllgj9a5qc59af3skp2b80hmv88h6vij"; }; - propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pkgs.pandoc ]; + propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pkgs.pandoc unicorn intervaltree ]; disabled = isPy3k; @@ -30159,28 +30103,6 @@ EOF }; }; - pytoml = buildPythonPackage rec { - name = "pytoml-${version}"; - version = "0.1.11"; - - checkPhase = "${python.interpreter} test/test.py"; - - # fetchgit used to ensure test submodule is available - src = pkgs.fetchgit { - url = "${meta.homepage}.git"; - rev = "refs/tags/v${version}"; - sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j"; - }; - - meta = { - description = "A TOML parser/writer for Python"; - homepage = https://github.com/avakar/pytoml; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - }; - - }; - ROPGadget = buildPythonPackage rec { name = "ROPGadget-5.4"; src = pkgs.fetchurl { @@ -30196,6 +30118,47 @@ EOF }; }; + unicorn = buildPythonPackage rec { + name = "unicorn-${version}"; + version = "1.0.1"; + src = pkgs.fetchurl { + url = "mirror://pypi/u/unicorn/${name}.tar.gz"; + sha256 = "0a5b4vh734b3wfkgapzzf8x18rimpmzvwwkly56da84n27wfw9bg"; + }; + setupPyBuildFlags = [ "--plat-name" "linux" ]; + meta = with pkgs.stdenv.lib; { + description = "Unicorn CPU emulator engine"; + homepage = "http://www.unicorn-engine.org/"; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.bennofs ]; + }; + }; + + intervaltree = buildPythonPackage rec { + name = "intervaltree-${version}"; + version = "2.1.0"; + src = pkgs.fetchurl { + url = "mirror://pypi/i/intervaltree/${name}.tar.gz"; + sha256 = "02w191m9zxkcjqr1kv2slxvhymwhj3jnsyy3a28b837pi15q19dc"; + }; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ sortedcontainers ]; + checkPhase = '' + runHook preCheck + # pytest will try to run tests for nix_run_setup.py / files in build/lib which fails + mv nix_run_setup.py run_setup + rm build -rf + ${python.interpreter} run_setup test + runHook postCheck + ''; + meta = with pkgs.stdenv.lib; { + description = "Editable interval tree data structure for Python 2 and 3"; + homepage = https://github.com/chaimleib/intervaltree; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.bennofs ]; + }; + }; + packaging = buildPythonPackage rec { name = "packaging-16.8"; src = pkgs.fetchurl { @@ -30204,16 +30167,34 @@ EOF }; propagatedBuildInputs = with self; [ pyparsing six ]; buildInputs = with self; [ pytest pretend ]; + meta = with pkgs.stdenv.lib; { description = "Core utilities for Python packages"; homepage = "https://github.com/pypa/packaging"; license = [ licenses.bsd2 licenses.asl20 ]; maintainers = with maintainers; [ bennofs ]; }; + }; - checkPhase = '' - py.test - ''; + pytoml = buildPythonPackage rec { + name = "pytoml-${version}"; + version = "0.1.11"; + + checkPhase = "${python.interpreter} test/test.py"; + + # fetchgit used to ensure test submodule is available + src = pkgs.fetchgit { + url = "${meta.homepage}.git"; + rev = "refs/tags/v${version}"; + sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j"; + }; + + meta = { + description = "A TOML parser/writer for Python"; + homepage = https://github.com/avakar/pytoml; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; }; pypandoc = buildPythonPackage rec { @@ -30316,8 +30297,6 @@ EOF uranium = callPackage ../development/python-modules/uranium { }; - urlscan = callPackage ../applications/misc/urlscan { }; - vine = buildPythonPackage rec { name = "vine-${version}"; version = "1.1.3"; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index aed51a448739..eb15da9dfdc7 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,13 +7,13 @@ { stdenv, fetchFromGitHub, git }: stdenv.mkDerivation { - name = "rustRegistry-2017-06-25"; + name = "rustRegistry-2017-06-27"; src = fetchFromGitHub { owner = "rust-lang"; repo = "crates.io-index"; - rev = "9714616bf3b7836cb827d8d1eabef017d730fb5e"; - sha256 = "02lpmjsqwa16j14y3jzgw4dpzfy001nfyi78x9b8rgp1w3qdjbkr"; + rev = "de7301b4aa5a933658ab14dba972cc2cab77da1c"; + sha256 = "0dyx5n789pkmvk7x876v8rnagzp7xc8r2iysj2b70vcsqdvidnax"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index f6e7f41ed883..617fa0c30ce8 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -18,30 +18,6 @@ , # Use to reevaluate Nixpkgs; a dirty hack that should be removed nixpkgsFun - ## Platform parameters - ## - ## The "build" "host" "target" terminology below comes from GNU Autotools. See - ## its documentation for more information on what those words mean. Note that - ## each should always be defined, even when not cross compiling. - ## - ## For purposes of bootstrapping, think of each stage as a "sliding window" - ## over a list of platforms. Specifically, the host platform of the previous - ## stage becomes the build platform of the current one, and likewise the - ## target platform of the previous stage becomes the host platform of the - ## current one. - ## - -, # The platform on which packages are built. Consists of `system`, a - # string (e.g.,`i686-linux') identifying the most import attributes of the - # build platform, and `platform` a set of other details. - buildPlatform - -, # The platform on which packages run. - hostPlatform - -, # The platform which build tools (especially compilers) build for in this stage, - targetPlatform - ## Other parameters ## @@ -69,10 +45,10 @@ , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc # outside of the store. Thus, GCC, GFortran, & co. must always look for files # in standard system directories (/usr/include, etc.) - noSysDirs ? buildPlatform.system != "x86_64-freebsd" - && buildPlatform.system != "i686-freebsd" - && buildPlatform.system != "x86_64-solaris" - && buildPlatform.system != "x86_64-kfreebsd-gnu" + noSysDirs ? stdenv.buildPlatform.system != "x86_64-freebsd" + && stdenv.buildPlatform.system != "i686-freebsd" + && stdenv.buildPlatform.system != "x86_64-solaris" + && stdenv.buildPlatform.system != "x86_64-kfreebsd-gnu" , # The configuration attribute set config @@ -98,21 +74,18 @@ let // { recurseForDerivations = false; }; __targetPackages = (if __targetPackages == null then self else __targetPackages) // { recurseForDerivations = false; }; - inherit stdenv - buildPlatform hostPlatform targetPlatform; + inherit stdenv; }; # The old identifiers for cross-compiling. These should eventually be removed, # and the packages that rely on them refactored accordingly. platformCompat = self: super: let - # TODO(@Ericson2314) this causes infinite recursion - #inherit (self) buildPlatform hostPlatform targetPlatform; + inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; in { stdenv = super.stdenv // { - inherit (buildPlatform) platform; - } // lib.optionalAttrs (hostPlatform != buildPlatform) { - cross = hostPlatform; + inherit (super.stdenv.buildPlatform) platform; }; + inherit buildPlatform hostPlatform targetPlatform; inherit (buildPlatform) system platform; }; |