diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 52 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 88 |
2 files changed, 114 insertions, 26 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0cec16ca049..8147f26f457b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1215,8 +1215,6 @@ let fatsort = callPackage ../tools/filesystems/fatsort { }; - fatrace = callPackage ../os-specific/linux/fatrace { }; - fcitx = callPackage ../tools/inputmethods/fcitx { }; fcitx-anthy = callPackage ../tools/inputmethods/fcitx/fcitx-anthy.nix { }; @@ -1818,6 +1816,8 @@ let man_db = callPackage ../tools/misc/man-db { }; + mawk = callPackage ../tools/text/mawk { }; + mbox = callPackage ../tools/security/mbox { }; memtest86 = callPackage ../tools/misc/memtest86 { }; @@ -2414,8 +2414,6 @@ let remmina = callPackage ../applications/networking/remote/remmina {}; - remotebox = callPackage ../applications/virtualization/remotebox {}; - renameutils = callPackage ../tools/misc/renameutils { }; replace = callPackage ../tools/text/replace { }; @@ -2426,6 +2424,8 @@ let rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; + rdfind = callPackage ../tools/filesystems/rdfind { }; + rdmd = callPackage ../development/compilers/rdmd { }; rhash = callPackage ../tools/security/rhash { }; @@ -2479,7 +2479,7 @@ let rzip = callPackage ../tools/compression/rzip { }; s3backer = callPackage ../tools/filesystems/s3backer { }; - + s3fs = callPackage ../tools/filesystems/s3fs { }; s3cmd = callPackage ../tools/networking/s3cmd { }; @@ -2749,6 +2749,8 @@ let ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; + ttfautohint = callPackage ../tools/misc/ttfautohint { }; + tty-clock = callPackage ../tools/misc/tty-clock { }; ttysnoop = callPackage ../os-specific/linux/ttysnoop {}; @@ -3200,8 +3202,6 @@ let cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; - coan = callPackage ../development/tools/analysis/coan { }; - compcert = callPackage ../development/compilers/compcert {}; cryptol = haskell-ng.packages.ghc763.cryptol; @@ -3716,6 +3716,8 @@ let mercury = callPackage ../development/compilers/mercury { }; + microscheme = callPackage ../development/compilers/microscheme { }; + mitscheme = callPackage ../development/compilers/mit-scheme { }; mlton = callPackage ../development/compilers/mlton { }; @@ -4073,6 +4075,8 @@ let ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; + ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; + opa = callPackage ../development/compilers/opa { ocamlPackages = ocamlPackages_4_00_1; }; @@ -4273,6 +4277,8 @@ let kona = callPackage ../development/interpreters/kona {}; + lolcode = callPackage ../development/interpreters/lolcode { }; + love = callPackage ../development/interpreters/love {lua=lua5_1;}; love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; @@ -4714,6 +4720,8 @@ let "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; + coan = callPackage ../development/tools/analysis/coan { }; + complexity = callPackage ../development/tools/misc/complexity { }; ctags = callPackage ../development/tools/misc/ctags { }; @@ -7381,6 +7389,8 @@ let vcdimager = callPackage ../development/libraries/vcdimager { }; + vid-stab = callPackage ../development/libraries/vid-stab { }; + vigra = callPackage ../development/libraries/vigra { inherit (pkgs.pythonPackages) numpy; }; @@ -7399,6 +7409,8 @@ let libpng = libpng12; }; + wavpack = callPackage ../development/libraries/wavpack { }; + wayland = callPackage ../development/libraries/wayland { }; webkit = webkitgtk; @@ -8116,7 +8128,11 @@ let oracleXE = callPackage ../servers/sql/oracle-xe { }; - OVMF = callPackage ../applications/virtualization/OVMF { }; + OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; }; + OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; }; + #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; }; + + seabios = callPackage ../applications/virtualization/seabios { }; pgpool92 = callPackage ../servers/sql/pgpool/default.nix { postgresql = postgresql92; @@ -8292,7 +8308,7 @@ let zookeeper = callPackage ../servers/zookeeper { }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; - + xquartz = callPackage ../servers/x11/xquartz { }; quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; }; @@ -8513,6 +8529,8 @@ let eject = utillinux; + fatrace = callPackage ../os-specific/linux/fatrace { }; + ffado = callPackage ../os-specific/linux/ffado { }; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -8574,8 +8592,6 @@ let iw = callPackage ../os-specific/linux/iw { }; - iwlegacy = callPackage ../os-specific/linux/firmware/iwlegacy { }; - jfbview = callPackage ../os-specific/linux/jfbview { }; jujuutils = callPackage ../os-specific/linux/jujuutils { }; @@ -8647,7 +8663,7 @@ let linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.crc_regression ] + kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -8667,7 +8683,7 @@ let linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.crc_regression ] + kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -10574,7 +10590,7 @@ let kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; - lame = callPackage ../applications/audio/lame { }; + lame = callPackage ../development/libraries/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -10895,6 +10911,12 @@ let fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; }; + librep = callPackage ../development/libraries/librep { }; + + rep-gtk = callPackage ../development/libraries/rep-gtk { }; + + sawfish = callPackage ../applications/window-managers/sawfish { }; + sxhkd = callPackage ../applications/window-managers/sxhkd { }; msmtp = callPackage ../applications/networking/msmtp { }; @@ -11170,6 +11192,8 @@ let recode = callPackage ../tools/text/recode { }; + remotebox = callPackage ../applications/virtualization/remotebox { }; + retroshare = callPackage ../applications/networking/p2p/retroshare { qt = qt4; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 466e934cb45f..f3db78a4fd65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -539,11 +539,11 @@ let }); astroid = buildPythonPackage (rec { - name = "astroid-1.3.2"; + name = "astroid-1.3.4"; propagatedBuildInputs = with self; [ logilab_common six ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/astroid/${name}.tar.gz"; - md5 = "2ab96129a977b6eba27765a15d1a9bf2"; + sha256 = "1fz9x21pziy9dmivvlsgl7a86ka2m9jp3pky01da5aj89ym3wi8b"; }; }); @@ -4247,13 +4247,13 @@ let }; flexget = buildPythonPackage rec { - version = "1.2.234"; + version = "1.2.278"; name = "FlexGet-${version}"; disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz"; - md5 = "0897b6db25e8a28e809d131a8ad017e4"; + md5 = "9c8e41d9e59d53cf2c720661b2880719"; }; doCheck = false; @@ -5537,14 +5537,14 @@ let }; logilab_common = buildPythonPackage rec { - name = "logilab-common-0.61.0"; + name = "logilab-common-0.63.2"; src = pkgs.fetchurl { - url = "http://download.logilab.org/pub/common/${name}.tar.gz"; - sha256 = "09apsrcvjliawbxmfrmi1l8hlbaj87mb7n4lrlivy5maxs6yg4hd"; + url = "https://pypi.python.org/packages/source/l/logilab-common/${name}.tar.gz"; + sha256 = "1rr81zlmlgdma3s75i5c1l8q2m25v4ac41i9pniik4mhkc6a0fv0"; }; - propagatedBuildInputs = with self; [ unittest2 ]; + propagatedBuildInputs = with self; [ unittest2 six ]; }; loxodo = buildPythonPackage { @@ -6657,7 +6657,7 @@ let ''; preBuild = '' - export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} + export BLAS=${pkgs.openblas} LAPACK=${pkgs.openblas} ''; setupPyBuildFlags = ["--fcompiler='gnu95'"]; @@ -6666,7 +6666,7 @@ let doCheck = false; buildInputs = with self; [ pkgs.gfortran ]; - propagatedBuildInputs = with self; [ pkgs.liblapack pkgs.blas ]; + propagatedBuildInputs = with self; [ pkgs.openblas ]; meta = { description = "Scientific tools for Python"; @@ -9698,6 +9698,23 @@ let }; }); + simpleparse = buildPythonPackage rec { + version = "2.1.1"; + name = "simpleparse-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/S/SimpleParse/SimpleParse-${version}.tar.gz"; + sha256 = "1n8msk71lpl3kv086xr2sv68ppgz6228575xfnbszc6p1mwr64rg"; + }; + + meta = with stdenv.lib; { + description = "A Parser Generator for Python"; + homepage = https://pypi.python.org/pypi/SimpleParse; + platforms = platforms.all; + maintainers = [ maintainers.DamienCassou ]; + }; + }; + sigal = buildPythonPackage rec { name = "sigal-0.7.0"; @@ -10001,11 +10018,11 @@ let six = buildPythonPackage rec { - name = "six-1.8.0"; + name = "six-1.9.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/six/${name}.tar.gz"; - md5 = "1626eb24cc889110c38f7e786ec69885"; + sha256 = "1mci5i8mjqmljmv33h0q3d4djc13zk1kfmb3fbvd3yy43x0m4h72"; }; # error: invalid command 'test' @@ -13107,7 +13124,22 @@ let }; }; + moreItertools = buildPythonPackage rec { + name = "more-itertools-2.2"; + + src = pkgs.fetchurl { + url = "https://github.com/erikrose/more-itertools/archive/2.2.tar.gz"; + sha256 = "4606417182e0a1289e23fb7f964a64ca9fdaafb7c1999034dc4fa0cc5850c478"; + }; + + propagatedBuildInputs = with self; [ nose ]; + meta = { + homepage = "https://more-itertools.readthedocs.org"; + description = "Expansion of the itertools module."; + license = licenses.mit; + }; + }; # python2.7 specific packages } // optionalAttrs isPy27 ( @@ -13394,4 +13426,36 @@ let }; }; + parsimonious = buildPythonPackage rec { + name = "parsimonious-0.6.0"; + src = pkgs.fetchurl { + url = "https://github.com/erikrose/parsimonious/archive/0.6.tar.gz"; + sha256 = "7ad992448b69a3f3d943bac0be132bced3f13937c8ca150ba2fd1d7b6534f846"; + }; + + propagatedBuildInputs = with self; [ nose ]; + + meta = { + homepage = "https://github.com/erikrose/parsimonious"; + description = "Fast arbitrary-lookahead packrat parser written in pure Python."; + license = licenses.mit; + }; + }; + + funcy = buildPythonPackage rec { + name = "funcy-1.4"; + + src = pkgs.fetchurl { + url = "https://github.com/Suor/funcy/archive/1.4.tar.gz"; + sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; + }; + + meta = with stdenv.lib; { + description = "Collection of fancy functional tools focused on practicality."; + homepage = "http://funcy.readthedocs.org/"; + license = stdenv.lib.licenses.bsd3; + }; + }; + + }); in pythonPackages |