diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 602 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 762 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-ng.nix | 38 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/platforms.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 126 |
7 files changed, 1312 insertions, 265 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7a58bcc9293..629824b8205c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15,8 +15,7 @@ , # 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 ? (system != "x86_64-darwin" - && system != "x86_64-freebsd" && system != "i686-freebsd" + noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" && system != "x86_64-kfreebsd-gnu") # More flags for the bootstrapping of stdenv. @@ -73,6 +72,7 @@ let platforms = (import ./platforms.nix); in if system == "armv6l-linux" then platforms.raspberrypi + else if system == "armv7l-linux" then platforms.beaglebone else if system == "armv5tel-linux" then platforms.sheevaplug else if system == "mips64el-linux" then platforms.fuloong2f_n32 else if system == "x86_64-linux" then platforms.pc64 @@ -239,7 +239,7 @@ let # just the plain stdenv. stdenv_32bit = lowPrio ( if system == "x86_64-linux" then - overrideGCC stdenv gcc48_multi + overrideCC stdenv gcc48_multi else stdenv); @@ -261,17 +261,25 @@ let inherit (pkgs) runCommand perl; }; - buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv { - inherit buildEnv system; - inherit stdenv glibc glibc_multi glibcLocales; - inherit bashInteractive coreutils less shadow su; - inherit gawk gcc gcc_multi diffutils findutils gnused gnugrep; - inherit gnutar gzip bzip2 xz; - + buildFHSEnv = callPackage ../build-support/build-fhs-chrootenv/env.nix { nixpkgs = pkgs; nixpkgs_i686 = pkgsi686Linux; }; + chrootFHSEnv = callPackage ../build-support/build-fhs-chrootenv { }; + userFHSEnv = callPackage ../build-support/build-fhs-userenv { + ruby = ruby_2_1_3; + }; + + buildFHSChrootEnv = args: chrootFHSEnv { + env = buildFHSEnv args; + }; + + buildFHSUserEnv = args: userFHSEnv { + env = buildFHSEnv (removeAttrs args [ "runScript" ]); + runScript = args.runScript; + }; + dotnetenv = import ../build-support/dotnetenv { inherit stdenv; dotnetfx = dotnetfx40; @@ -366,6 +374,12 @@ let inherit sha256; }; + fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name; + url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz"; + inherit sha256; + }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; @@ -382,7 +396,7 @@ let inherit lib; }; - makeInitrd = {contents, compressor ? "gzip -9"}: + makeInitrd = {contents, compressor ? "gzip -9n"}: import ../build-support/kernel/make-initrd.nix { inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor; }; @@ -500,9 +514,12 @@ let arcanist = callPackage ../development/tools/misc/arcanist {}; - arduino_core = callPackage ../development/arduino/arduino-core { + arduino = arduino-core.override { withGui = true; }; + + arduino-core = callPackage ../development/arduino/arduino-core { jdk = jdk; jre = jdk; + withGui = false; }; apitrace = callPackage ../applications/graphics/apitrace {}; @@ -513,10 +530,7 @@ let ascii = callPackage ../tools/text/ascii { }; - asymptote = builderDefsPackage ../tools/graphics/asymptote { - inherit freeglut ghostscriptX imagemagick fftw boehmgc - mesa ncurses readline gsl libsigsegv python zlib perl - texinfo xz; + asymptote = callPackage ../tools/graphics/asymptote { texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra texLiveCMSuper ]; }; @@ -679,6 +693,14 @@ let catdoc = callPackage ../tools/text/catdoc { }; + cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; + + cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + + gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + + image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; + ccnet = callPackage ../tools/networking/ccnet { }; cloud-init = callPackage ../tools/virtualization/cloud-init { }; @@ -689,6 +711,8 @@ let consul_ui = consul.ui; + consul-alerts = callPackage ../servers/consul/alerts.nix { }; + corosync = callPackage ../servers/corosync { }; cherrytree = callPackage ../applications/misc/cherrytree { }; @@ -707,6 +731,8 @@ let cv = callPackage ../tools/misc/cv { }; + contacts = callPackage ../tools/misc/contacts { }; + datamash = callPackage ../tools/misc/datamash { }; ddate = callPackage ../tools/misc/ddate { }; @@ -855,9 +881,7 @@ let cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; - ceph = callPackage ../tools/filesystems/ceph { - zfs = linuxPackages.zfs; - }; + ceph = callPackage ../tools/filesystems/ceph { }; cfdg = builderDefsPackage ../tools/graphics/cfdg { inherit libpng bison flex ffmpeg; @@ -1442,11 +1466,17 @@ let buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; - grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; + grub2 = grub2_full; - grub2_efi = grub2.override { efiSupport = true; }; + grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_zfs = grub2.override { zfsSupport = true; }; + grub2_efi = grub2_full.override { + efiSupport = true; + }; + + grub2_light = grub2_full.override { + zfsSupport = false; + }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { inherit (gnome) libglademm; @@ -1566,6 +1596,12 @@ let inherit (haskellPackages) ihaskell ghc; }; + ihaskell-with-packages = callPackage ../development/tools/haskell/ihaskell/ng-wrapper.nix { + inherit (pythonPackages) ipython; + inherit (haskellngPackages) ihaskell ghcWithPackages; + packages = self: []; + }; + imapproxy = callPackage ../tools/networking/imapproxy { }; imapsync = callPackage ../tools/networking/imapsync { @@ -1728,6 +1764,8 @@ let librdmacm = callPackage ../development/libraries/librdmacm { }; + limesurvey = callPackage ../servers/limesurvey { }; + logcheck = callPackage ../tools/system/logcheck { inherit (perlPackages) mimeConstruct; }; @@ -1804,6 +1842,8 @@ let inherit (gnome) scrollkeeper; }; + mdp = callPackage ../applications/misc/mdp { }; + mednafen = callPackage ../misc/emulators/mednafen { }; mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; @@ -2030,10 +2070,14 @@ let obexd = callPackage ../tools/bluetooth/obexd { }; + openfortivpn = callPackage ../tools/networking/openfortivpn { }; + obexfs = callPackage ../tools/bluetooth/obexfs { }; obexftp = callPackage ../tools/bluetooth/obexftp { }; + objconv = callPackage ../development/tools/misc/objconv {}; + obnam = callPackage ../tools/backup/obnam { }; ocz-toolbox = callPackage ../os-specific/linux/ocz-toolbox { }; @@ -2066,6 +2110,11 @@ let openntpd = callPackage ../tools/networking/openntpd { }; + openntpd_nixos = openntpd.override { + privsepUser = "ntp"; + privsepPath = "/var/empty"; + }; + openobex = callPackage ../tools/bluetooth/openobex { }; openopc = callPackage ../tools/misc/openopc { @@ -2092,11 +2141,7 @@ let openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }); - opensp = callPackage ../tools/text/sgml/opensp { - stdenv = if stdenv.isDarwin - then allStdenvs.stdenvDarwinNaked - else stdenv; - }; + opensp = callPackage ../tools/text/sgml/opensp { }; spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { }; @@ -2287,6 +2332,8 @@ let pastebinit = callPackage ../tools/misc/pastebinit { }; + polygraph = callPackage ../tools/networking/polygraph { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pstoedit = callPackage ../tools/graphics/pstoedit { }; @@ -2379,6 +2426,8 @@ let rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; + rdfind = callPackage ../tools/filesystems/rdfind { }; + rdmd = callPackage ../development/compilers/rdmd { }; rhash = callPackage ../tools/security/rhash { }; @@ -2433,6 +2482,8 @@ let s3backer = callPackage ../tools/filesystems/s3backer { }; + s3fs = callPackage ../tools/filesystems/s3fs { }; + s3cmd = callPackage ../tools/networking/s3cmd { }; s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { }); @@ -2679,9 +2730,11 @@ let torbutton = callPackage ../tools/security/torbutton { }; torbrowser = callPackage ../tools/security/tor/torbrowser.nix { - stdenv = overrideGCC stdenv gcc49; + stdenv = overrideCC stdenv gcc49; }; + touchegg = callPackage ../tools/inputmethods/touchegg { }; + torsocks = callPackage ../tools/security/tor/torsocks.nix { }; tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { }; @@ -2698,6 +2751,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 {}; @@ -2730,6 +2785,10 @@ let usbmuxd = callPackage ../tools/misc/usbmuxd {}; + uwsgi = callPackage ../servers/uwsgi { + plugins = []; + }; + vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; volatility = callPackage ../tools/security/volatility { }; @@ -2825,6 +2884,8 @@ let tm = callPackage ../tools/system/tm { }; + tradcpp = callPackage ../development/tools/tradcpp { }; + trang = callPackage ../tools/text/xml/trang { }; tre = callPackage ../development/libraries/tre { }; @@ -2881,8 +2942,6 @@ let varnish = callPackage ../servers/varnish { }; - varnish2 = callPackage ../servers/varnish/2.1.nix { }; - venus = callPackage ../tools/misc/venus { python = python27; }; @@ -2929,6 +2988,8 @@ let wml = callPackage ../development/web/wml { }; + wrk = callPackage ../tools/networking/wrk { }; + wv = callPackage ../tools/misc/wv { }; wv2 = callPackage ../tools/misc/wv2 { }; @@ -3026,9 +3087,7 @@ let zdelta = callPackage ../tools/compression/zdelta { }; - zfstools = callPackage ../tools/filesystems/zfstools { - zfs = linuxPackages.zfs; - }; + zfstools = callPackage ../tools/filesystems/zfstools { }; zile = callPackage ../applications/editors/zile { }; @@ -3107,10 +3166,11 @@ let ccl = callPackage ../development/compilers/ccl { }; - clang = wrapGCC llvmPackages.clang; + clang = wrapCC llvmPackages.clang; - clang_34 = wrapGCC llvmPackages_34.clang; - clang_33 = wrapGCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); + clang_35 = wrapCC llvmPackages_35.clang; + clang_34 = wrapCC llvmPackages_34.clang; + clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer { clang = clang_34; @@ -3123,8 +3183,8 @@ let clangSelf = clangWrapSelf llvmPackagesSelf.clang; - clangWrapSelf = build: (import ../build-support/gcc-wrapper) { - gcc = build; + clangWrapSelf = build: (import ../build-support/cc-wrapper) { + cc = build; stdenv = clangStdenv; libc = glibc; binutils = binutils; @@ -3135,8 +3195,8 @@ let }; #Use this instead of stdenv to build with clang - clangStdenv = if stdenv.isDarwin then stdenv else lowPrio (stdenvAdapters.overrideGCC stdenv clang); - libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf llvmPackages.clang); + clangStdenv = if stdenv.isDarwin then stdenv else lowPrio (stdenvAdapters.overrideCC stdenv clang); + libcxxStdenv = stdenvAdapters.overrideCC stdenv (clangWrapSelf llvmPackages.clang); clean = callPackage ../development/compilers/clean { }; @@ -3168,7 +3228,7 @@ let gccApple = throw "gccApple is no longer supported"; - gcc34 = wrapGCC (import ../development/compilers/gcc/3.4 { + gcc34 = wrapCC (import ../development/compilers/gcc/3.4 { inherit fetchurl stdenv noSysDirs; }); @@ -3230,15 +3290,15 @@ let cross = assert crossSystem != null; crossSystem; }; - gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) { + gcc44 = lowPrio (wrapCC (makeOverridable (import ../development/compilers/gcc/4.4) { inherit fetchurl stdenv gmp mpfr /* ppl cloogppl */ gettext which noSysDirs; texinfo = texinfo4; profiledCompiler = true; })); - gcc45 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 { - inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl + gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 { + inherit fetchurl stdenv gmp mpfr libmpc libelf zlib perl gettext which noSysDirs; texinfo = texinfo4; @@ -3260,7 +3320,7 @@ let else null; })); - gcc46 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { + gcc46 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.6 { inherit noSysDirs; ppl = null; @@ -3282,7 +3342,7 @@ let texinfo = texinfo413; })); - gcc48 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 { + gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion @@ -3301,14 +3361,14 @@ let gcc48_multi = if system == "x86_64-linux" then lowPrio ( - wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc48.gcc.override { - stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); + wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc48.cc.override { + stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.cc); profiledCompiler = false; enableMultilib = true; })) else throw "Multilib gcc not supported on ‘${system}’"; - gcc48_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 { + gcc48_debug = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { stripped = false; inherit noSysDirs; @@ -3317,7 +3377,7 @@ let binutilsCross = null; })); - gcc49 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.9 { + gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 { inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion @@ -3336,7 +3396,7 @@ let gfortran = gfortran48; - gfortran48 = wrapGCC (gcc48.gcc.override { + gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; langFortran = true; langCC = false; @@ -3346,7 +3406,7 @@ let gcj = gcj48; - gcj48 = wrapGCC (gcc48.gcc.override { + gcj48 = wrapCC (gcc48.cc.override { name = "gcj"; langJava = true; langFortran = false; @@ -3362,7 +3422,7 @@ let gnat = gnat45; # failed to make 4.6 or 4.8 build - gnat45 = wrapGCC (gcc45.gcc.override { + gnat45 = wrapCC (gcc45.cc.override { name = "gnat"; langCC = false; langC = true; @@ -3381,14 +3441,14 @@ let gccgo = gccgo48; - gccgo48 = wrapGCC (gcc48.gcc.override { + gccgo48 = wrapCC (gcc48.cc.override { name = "gccgo"; langCC = true; #required for go. langC = true; langGo = true; }); - ghdl = wrapGCC (import ../development/compilers/gcc/4.3 { + ghdl = wrapCC (import ../development/compilers/gcc/4.3 { inherit stdenv fetchurl gmp mpfr noSysDirs gnat; texinfo = texinfo4; name = "ghdl"; @@ -3506,8 +3566,6 @@ let go-repo-root = callPackage ../development/tools/misc/go-repo-root { }; - go-bindata = callPackage ../tools/misc/go-bindata { }; - gox = callPackage ../development/compilers/go/gox.nix { }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -3642,7 +3700,7 @@ let llvm_v = path: callPackage path { }; - llvmPackages = llvmPackages_34; + llvmPackages = llvmPackages_35; llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit stdenv newScope fetchurl; @@ -3650,6 +3708,10 @@ let }); llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; }; + llvmPackages_35 = import ../development/compilers/llvm/3.5 { + inherit pkgs stdenv newScope fetchurl isl; + }; + manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( @@ -3671,6 +3733,8 @@ let mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; mozart = mozart-binary; + nim = callPackage ../development/compilers/nim { }; + neko = callPackage ../development/compilers/neko { }; nasm = callPackage ../development/compilers/nasm { }; @@ -4013,6 +4077,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; }; @@ -4096,18 +4162,25 @@ let win32hello = callPackage ../development/compilers/visual-c++/test { }; - wrapGCCWith = gccWrapper: glibc: baseGCC: gccWrapper { + wrapCCWith = ccWrapper: libc: baseCC: ccWrapper { nativeTools = stdenv.cc.nativeTools or false; nativeLibc = stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; - gcc = baseGCC; - libc = glibc; + cc = baseCC; + libc = libc; inherit stdenv binutils coreutils zlib; }; - wrapGCC = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper)) glibc; + wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) glibc; # legacy version, used for gnat bootstrapping - wrapGCC-old = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper-old)) glibc; + wrapGCC-old = baseGCC: (makeOverridable (import ../build-support/gcc-wrapper-old)) { + nativeTools = stdenv.cc.nativeTools or false; + nativeLibc = stdenv.cc.nativeLibc or false; + nativePrefix = stdenv.cc.nativePrefix or ""; + gcc = baseGCC; + libc = glibc; + inherit stdenv binutils coreutils zlib; + }; wrapGCCCross = {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: @@ -4128,17 +4201,17 @@ let * build system so that the Qt 4 components find the Qt 4 headers and the Qt 5 * components find the Qt 5 headers. */ - wrapGCCStdInc = glibc: baseGCC: (import ../build-support/gcc-wrapper) { + wrapGCCStdInc = glibc: baseGCC: (import ../build-support/cc-wrapper) { nativeTools = stdenv.cc.nativeTools or false; nativeLibc = stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; - gcc = baseGCC; + cc = baseGCC; libc = glibc; inherit stdenv binutils coreutils zlib; - setupHook = ../build-support/gcc-wrapper/setup-hook-stdinc.sh; + setupHook = ../build-support/cc-wrapper/setup-hook-stdinc.sh; }; - gccStdInc = wrapGCCStdInc glibc gcc.gcc; + gccStdInc = wrapGCCStdInc glibc gcc.cc; # prolog yap = callPackage ../development/compilers/yap { }; @@ -4206,6 +4279,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 { }; @@ -4293,8 +4368,17 @@ let inherit php pkgs; }); + php55Packages = recurseIntoAttrs (import ./php-packages.nix { + inherit pkgs; + php = php55; + }); + php54 = callPackage ../development/interpreters/php/5.4.nix { }; + php55 = callPackage ../development/interpreters/php/5.5.nix { }; + + php56 = callPackage ../development/interpreters/php/5.6.nix { }; + picolisp = callPackage ../development/interpreters/picolisp {}; pltScheme = racket; # just to be sure @@ -4329,7 +4413,7 @@ let python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { self = python34; }); - pypy = callPackage ../development/interpreters/pypy/2.4 { + pypy = callPackage ../development/interpreters/pypy { self = pypy; }; @@ -4465,7 +4549,7 @@ let avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc { gcc = gcc46; - stdenv = overrideGCC stdenv gcc46; + stdenv = overrideCC stdenv gcc46; }; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; @@ -4623,8 +4707,8 @@ let # }; # ccacheWrapper = makeOverridable ({ extraConfig ? "" }: - wrapGCC (ccache.links extraConfig)) {}; - ccacheStdenv = lowPrio (overrideGCC stdenv ccacheWrapper); + wrapCC (ccache.links extraConfig)) {}; + ccacheStdenv = lowPrio (overrideCC stdenv ccacheWrapper); cccc = callPackage ../development/tools/analysis/cccc { }; @@ -4648,7 +4732,10 @@ let ctodo = callPackage ../applications/misc/ctodo { }; - cmake = callPackage ../development/tools/build-managers/cmake { }; + cmake = callPackage ../development/tools/build-managers/cmake { + wantPS = stdenv.isDarwin; + ps = if stdenv.isDarwin then darwin.ps else null; + }; cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { }; cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { }; @@ -4675,8 +4762,8 @@ let csslint = callPackage ../development/web/csslint { }; - libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; }; - libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; }; + libcxx = llvmPackages_35.libcxx; + libcxxabi = llvmPackages_35.libcxxabi; libsigrok = callPackage ../development/tools/libsigrok { }; @@ -4708,13 +4795,13 @@ let # }; # distccWrapper = makeOverridable ({ extraConfig ? "" }: - wrapGCC (distcc.links extraConfig)) {}; - distccStdenv = lowPrio (overrideGCC stdenv distccWrapper); + wrapCC (distcc.links extraConfig)) {}; + distccStdenv = lowPrio (overrideCC stdenv distccWrapper); distccMasquerade = if stdenv.isDarwin then null else callPackage ../development/tools/misc/distcc/masq.nix { - gccRaw = gcc.gcc; + gccRaw = gcc.cc; binutils = binutils; }; @@ -4746,6 +4833,8 @@ let fswatch = callPackage ../development/tools/misc/fswatch { }; + frame = callPackage ../development/libraries/frame { }; + pmd = callPackage ../development/tools/analysis/pmd { }; jdepend = callPackage ../development/tools/analysis/jdepend { }; @@ -4758,6 +4847,8 @@ let m4 = gnum4; + geis = callPackage ../development/libraries/geis { }; + global = callPackage ../development/tools/misc/global { }; gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; @@ -4777,6 +4868,8 @@ let gperf = callPackage ../development/tools/misc/gperf { }; + grail = callPackage ../development/libraries/grail { }; + gtk_doc = callPackage ../development/tools/documentation/gtk-doc { }; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; @@ -4799,6 +4892,8 @@ let inherit (perlPackages) XMLSimple; }; + include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { }; + indent = callPackage ../development/tools/misc/indent { }; ino = callPackage ../development/arduino/ino { }; @@ -4884,11 +4979,7 @@ let peg = callPackage ../development/tools/parsing/peg { }; - phantomjs = callPackage ../development/tools/phantomjs { - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + phantomjs = callPackage ../development/tools/phantomjs { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -4944,6 +5035,8 @@ let saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; + sauce-connect = callPackage ../development/tools/sauce-connect { }; + # couldn't find the source yet seleniumRCBin = callPackage ../development/tools/selenium/remote-control { jre = jdk; @@ -5039,14 +5132,7 @@ let target = crossSystem; }); - valgrind = callPackage ../development/tools/analysis/valgrind { - stdenv = - # On Darwin, Valgrind 3.7.0 expects Apple's GCC (for - # `__private_extern'.) - if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + valgrind = callPackage ../development/tools/analysis/valgrind { }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; @@ -5252,7 +5338,7 @@ let coredumper = callPackage ../development/libraries/coredumper { }; - ctl = dropCxx (callPackage ../development/libraries/ctl { }); + ctl = callPackage ../development/libraries/ctl { }; cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; @@ -5364,10 +5450,6 @@ let ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { vpxSupport = !stdenv.isMips; - - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; }; ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix { @@ -5678,12 +5760,7 @@ let pangox_compat = callPackage ../development/libraries/pangox-compat { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { - # workaround signal 10 in gdk_pixbuf tests - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; gnome-sharp = callPackage ../development/libraries/gnome-sharp {}; @@ -5783,7 +5860,7 @@ let ilixi = callPackage ../development/libraries/ilixi { }; - ilmbase = dropCxx (callPackage ../development/libraries/ilmbase { }); + ilmbase = callPackage ../development/libraries/ilmbase { }; imlib = callPackage ../development/libraries/imlib { libpng = libpng12; @@ -5846,7 +5923,7 @@ let }; kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 { - stdenv = overrideGCC stdenv gccStdInc; + stdenv = overrideCC stdenv gccStdInc; }); kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {}); kf5_latest = kf56; @@ -5898,6 +5975,8 @@ let libarchive = callPackage ../development/libraries/libarchive { }; + libasr = callPackage ../development/libraries/libasr { }; + libass = callPackage ../development/libraries/libass { }; libassuan1 = callPackage ../development/libraries/libassuan1 { }; @@ -5987,7 +6066,7 @@ let libdc1394avt = callPackage ../development/libraries/libdc1394avt { }; - libdevil = dropCxx (callPackage ../development/libraries/libdevil { }); + libdevil = callPackage ../development/libraries/libdevil { }; libdiscid = callPackage ../development/libraries/libdiscid { }; @@ -6269,12 +6348,7 @@ let libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; - libmikmod = callPackage ../development/libraries/libmikmod { - # resolve the "stray '@' in program" errors - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + libmikmod = callPackage ../development/libraries/libmikmod { }; libmilter = callPackage ../development/libraries/libmilter { }; @@ -6383,7 +6457,7 @@ let libproxy = callPackage ../development/libraries/libproxy { stdenv = if stdenv.isDarwin - then overrideGCC stdenv gcc + then overrideCC stdenv gcc else stdenv; }; @@ -6446,12 +6520,7 @@ let libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { - # fix "unrecognized option -arch" error - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; libtorrentRasterbar_0_16 = callPackage ../development/libraries/libtorrent-rasterbar/0.16.nix { # fix "unrecognized option -arch" error @@ -6494,13 +6563,13 @@ let libusb = callPackage ../development/libraries/libusb {}; - libusb1 = callPackage ../development/libraries/libusb1 { - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + libusb1 = callPackage ../development/libraries/libusb1 { }; + + libunwind = if stdenv.isDarwin + then callPackage ../development/libraries/libunwind/native.nix {} + else callPackage ../development/libraries/libunwind { }; - libunwind = callPackage ../development/libraries/libunwind { }; + libunwindNative = callPackage ../development/libraries/libunwind/native.nix {}; libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { }); @@ -6525,6 +6594,7 @@ let libviper = callPackage ../development/libraries/libviper { }; libvpx = callPackage ../development/libraries/libvpx { }; + libvpx-git = callPackage ../development/libraries/libvpx/git.nix { }; libvterm = callPackage ../development/libraries/libvterm { }; @@ -6642,6 +6712,7 @@ let # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity grsecEnabled = true; + llvm = llvm_34; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( @@ -6712,7 +6783,7 @@ let mp4v2 = callPackage ../development/libraries/mp4v2 { }; - mpc = callPackage ../development/libraries/mpc { }; + libmpc = callPackage ../development/libraries/libmpc { }; mpich2 = callPackage ../development/libraries/mpich2 { }; @@ -6814,13 +6885,9 @@ let # this ctl version is needed by openexr_viewers openexr_ctl = callPackage ../development/libraries/openexr_ctl { }; - openexr = dropCxx (callPackage ../development/libraries/openexr { }); + openexr = callPackage ../development/libraries/openexr { }; - openldap = callPackage ../development/libraries/openldap { - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + openldap = callPackage ../development/libraries/openldap { }; openlierox = callPackage ../games/openlierox { }; @@ -6853,6 +6920,15 @@ let }; }; + # bitcoin 0.9.3 requires openssl 1.0.1j + openssl_1_0_1j = callPackage ../development/libraries/openssl/1.0.1j.nix { + fetchurl = fetchurlBoot; + cryptodevHeaders = linuxPackages.cryptodev.override { + fetchurl = fetchurlBoot; + onlyHeaders = true; + }; + }; + ortp = callPackage ../development/libraries/ortp { srtp = srtp_linphone; }; @@ -6919,12 +6995,7 @@ let popt = callPackage ../development/libraries/popt { }; - portaudio = callPackage ../development/libraries/portaudio { - # resolves a variety of compile-time errors - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + portaudio = callPackage ../development/libraries/portaudio { }; portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { }; @@ -6936,9 +7007,13 @@ let postgis = callPackage ../development/libraries/postgis { }; - protobuf = callPackage ../development/libraries/protobuf { }; + protobuf = protobuf2_6; + protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { }; + protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; - protobufc = callPackage ../development/libraries/protobufc { }; + protobufc = protobufc1_1; + protobufc1_1 = callPackage ../development/libraries/protobufc/1.1.nix { }; + protobufc1_0 = callPackage ../development/libraries/protobufc/1.0.nix { }; pth = callPackage ../development/libraries/pth { }; @@ -6974,11 +7049,6 @@ let mesa = mesa_noglu; inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; cups = if stdenv.isLinux then cups else null; - - # resolve unrecognised flag '-fconstant-cfstrings' errors - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; }; qt48Full = appendToName "full" (qt48.override { @@ -6993,7 +7063,7 @@ let qtLib = qt48Full; }; - qt5 = callPackage ../development/libraries/qt-5 { + qt5 = callPackage ../development/libraries/qt-5/5.3 { mesa = mesa_noglu; cups = if stdenv.isLinux then cups else null; # GNOME dependencies are not used unless gtkStyle == true @@ -7001,6 +7071,8 @@ let bison = bison2; # error: too few arguments to function 'int yylex(... }; + qt5split = callPackage ../development/libraries/qt-5/5.3-submodules {}; + qt5Full = appendToName "full" (qt5.override { buildDocs = true; buildExamples = true; @@ -7097,12 +7169,7 @@ let SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; - SDL_image = callPackage ../development/libraries/SDL_image { - # provide an Objective-C compiler - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + SDL_image = callPackage ../development/libraries/SDL_image { }; SDL_mixer = callPackage ../development/libraries/SDL_mixer { }; @@ -7116,8 +7183,8 @@ let SDL2 = callPackage ../development/libraries/SDL2 { openglSupport = mesaSupported; - alsaSupport = true; - x11Support = true; + alsaSupport = (!stdenv.isDarwin); + x11Support = (!stdenv.isDarwin); pulseaudioSupport = false; # better go through ALSA }; @@ -7210,11 +7277,7 @@ let ncurses = null; }); - stfl = callPackage ../development/libraries/stfl { - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + stfl = callPackage ../development/libraries/stfl { }; stlink = callPackage ../development/tools/misc/stlink { }; @@ -7389,21 +7452,11 @@ let wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { inherit (gnome) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; - - # use for Objective-C++ compiler - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; }; wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { inherit (gnome) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; - - # use for Objective-C++ compiler - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; }; wtk = callPackage ../development/libraries/wtk { }; @@ -7430,6 +7483,8 @@ let xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { }; + xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { }; + xdo = callPackage ../tools/misc/xdo { }; xineLib = callPackage ../development/libraries/xine-lib { @@ -7602,6 +7657,26 @@ let yuicompressor = callPackage ../development/tools/yuicompressor { }; + ### DEVELOPMENT / GO MODULES + + go13Packages = recurseIntoAttrs (callPackage ./go-packages.nix { + go = go_1_3; + buildGoPackage = import ../development/go-modules/generic { + go = go_1_3; + }; + overrides = (config.goPackageOverrides or (p: {})) pkgs; + }); + + go14Packages = recurseIntoAttrs (callPackage ./go-packages.nix { + go = go_1_4; + buildGoPackage = import ../development/go-modules/generic { + go = go_1_4; + }; + overrides = (config.goPackageOverrides or (p: {})) pkgs; + }); + + goPackages = go14Packages; + ### DEVELOPMENT / LISP MODULES asdf = callPackage ../development/lisp-modules/asdf { @@ -7719,11 +7794,7 @@ let rhpl = callPackage ../development/python-modules/rhpl { }; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { }; pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; @@ -7916,6 +7987,10 @@ let joseki = callPackage ../servers/http/joseki {}; + kafka = callPackage ../servers/kafka { }; + + rdkafka = callPackage ../development/libraries/rdkafka { }; + leafnode = callPackage ../servers/news/leafnode { }; lighttpd = callPackage ../servers/http/lighttpd { }; @@ -8107,6 +8182,7 @@ let radius = callPackage ../servers/radius { }; redis = callPackage ../servers/nosql/redis { }; + redis3 = callPackage ../servers/nosql/redis/3.0.nix { }; redstore = callPackage ../servers/http/redstore { }; @@ -8181,7 +8257,7 @@ let libcap = null; }); - samba_light = samba3_light; + samba_light = samba4_light; serfdom = callPackage ../servers/serfdom { }; @@ -8200,6 +8276,8 @@ let }); squid = squids.squid31; # has ipv6 support + sslh = callPackage ../servers/sslh { }; + thttpd = callPackage ../servers/http/thttpd { }; storm = callPackage ../servers/computing/storm { }; @@ -8234,14 +8312,17 @@ 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; }; xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice_protocol - dbus libuuid openssl gperf m4 libevdev + dbus libuuid openssl gperf m4 libevdev tradcpp autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; + bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; mesa = mesa_noglu; udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; @@ -8362,13 +8443,17 @@ let cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; darwin = let - cmdline = (callPackage ../os-specific/darwin/command-line-tools {}).pure { inherit xpwn; }; - in rec { - cctools = forceNativeDrv (callPackage ../os-specific/darwin/cctools-port { + cmdline = callPackage ../os-specific/darwin/command-line-tools {}; + apple-source-releases = import ../os-specific/darwin/apple-source-releases { inherit stdenv fetchurl pkgs; }; + in apple-source-releases // rec { + + cctools = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { cross = assert crossSystem != null; crossSystem; inherit maloader; xctoolchain = xcode.toolchain; - }); + }; + + cctools_native = (callPackage ../os-specific/darwin/cctools/port.nix {}).native; maloader = callPackage ../os-specific/darwin/maloader { inherit opencflite; @@ -8381,10 +8466,14 @@ let osx_sdk = callPackage ../os-specific/darwin/osx-sdk {}; osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { inherit osx_sdk; }; + ps = callPackage ../os-specific/darwin/adv_cmds/ps.nix {}; + security_tool = callPackage ../os-specific/darwin/security-tool { inherit osx_private_sdk; }; cmdline_sdk = cmdline.sdk; cmdline_tools = cmdline.tools; + + libobjc = apple-source-releases.objc4; }; devicemapper = lvm2; @@ -8506,10 +8595,6 @@ let iw = callPackage ../os-specific/linux/iw { }; - iwlwifi = callPackage ../os-specific/linux/firmware/iwlwifi { }; - - iwlegacy = callPackage ../os-specific/linux/firmware/iwlegacy { }; - jfbview = callPackage ../os-specific/linux/jfbview { }; jujuutils = callPackage ../os-specific/linux/jujuutils { }; @@ -8541,7 +8626,7 @@ let cross = assert crossSystem != null; crossSystem; }); - linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { + linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/3.12.nix { inherit stdenv fetchurl perl; cross = assert crossSystem != null; crossSystem; }); @@ -8591,7 +8676,7 @@ let linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = [ kernelPatches.bridge_stp_helper ] + kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.crc_regression ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -8609,7 +8694,7 @@ let ]; }; - linux_3_17 = makeOverridable (import ../os-specific/linux/kernel/linux-3.17.nix) { + linux_3_18 = makeOverridable (import ../os-specific/linux/kernel/linux-3.18.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -8619,7 +8704,7 @@ let ]; }; - linux_3_18 = makeOverridable (import ../os-specific/linux/kernel/linux-3.18.nix) { + linux_3_19 = makeOverridable (import ../os-specific/linux/kernel/linux-3.19.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -8743,8 +8828,14 @@ let seturgent = callPackage ../os-specific/linux/seturgent { }; - spl = callPackage ../os-specific/linux/spl { }; - spl_git = callPackage ../os-specific/linux/spl/git.nix { }; + spl = callPackage ../os-specific/linux/spl { + configFile = "kernel"; + inherit kernel; + }; + spl_git = callPackage ../os-specific/linux/spl/git.nix { + configFile = "kernel"; + inherit kernel; + }; sysdig = callPackage ../os-specific/linux/sysdig {}; @@ -8752,6 +8843,8 @@ let v86d = callPackage ../os-specific/linux/v86d { }; + vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; + virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome) libIDL; @@ -8765,17 +8858,23 @@ let virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; - zfs = callPackage ../os-specific/linux/zfs { }; - zfs_git = callPackage ../os-specific/linux/zfs/git.nix { }; + zfs = callPackage ../os-specific/linux/zfs { + configFile = "kernel"; + inherit kernel spl; + }; + zfs_git = callPackage ../os-specific/linux/zfs/git.nix { + configFile = "kernel"; + inherit kernel spl_git; + }; }; # The current default kernel / kernel modules. - linux = linuxPackages.kernel; linuxPackages = linuxPackages_3_14; + linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linux_latest = pkgs.linux_3_18; - linuxPackages_latest = pkgs.linuxPackages_3_18; + linuxPackages_latest = pkgs.linuxPackages_3_19; + linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); @@ -8785,9 +8884,14 @@ let linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); - linuxPackages_3_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_17 linuxPackages_3_17); linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); + linuxPackages_3_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_19 linuxPackages_3_19); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); + linuxPackages_custom = {version, src, configfile}: + let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; + allowImportFromDerivation=true;}) + linuxPackages_self); + in recurseIntoAttrs linuxPackages_self; # grsecurity flavors # Stable kernels @@ -8883,7 +8987,7 @@ let gotags = callPackage ../development/tools/gotags { }; - golint = callPackage ../development/tools/golint { }; + golint = callPackage ../development/tools/golint { goPackages = go13Packages; }; godep = callPackage ../development/tools/godep { }; @@ -8983,6 +9087,13 @@ let statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; + spl = callPackage ../os-specific/linux/spl { + configFile = "user"; + }; + spl_git = callPackage ../os-specific/linux/spl/git.nix { + configFile = "user"; + }; + sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor @@ -9187,12 +9298,20 @@ let zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; + zfs = callPackage ../os-specific/linux/zfs { + configFile = "user"; + }; + zfs_git = callPackage ../os-specific/linux/zfs/git.nix { + configFile = "user"; + }; ### DATA - andagii = callPackage ../data/fonts/andagii {}; + andagii = callPackage ../data/fonts/andagii { }; + + android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; - anonymousPro = callPackage ../data/fonts/anonymous-pro {}; + anonymousPro = callPackage ../data/fonts/anonymous-pro { }; arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { }; @@ -9488,7 +9607,9 @@ let avrdudess = callPackage ../applications/misc/avrdudess { }; - avxsynth = callPackage ../applications/video/avxsynth { }; + avxsynth = callPackage ../applications/video/avxsynth { + libjpeg = libjpeg_original; # error: 'JCOPYRIGHT_SHORT' was not declared in this scope + }; awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix { cairo = cairo.override { xcbSupport = true; }; @@ -9531,8 +9652,8 @@ let bibletime = callPackage ../applications/misc/bibletime { }; - bitcoin = callPackage ../applications/misc/bitcoin {}; - bitcoind = callPackage ../applications/misc/bitcoin { gui = false; }; + bitcoin = callPackage ../applications/misc/bitcoin { openssl = openssl_1_0_1j; }; + bitcoind = callPackage ../applications/misc/bitcoin { openssl = openssl_1_0_1j; gui = false; }; altcoins = recurseIntoAttrs ( (callPackage ../applications/misc/bitcoin/altcoins.nix {}) // @@ -9566,6 +9687,10 @@ let camlistore = callPackage ../applications/misc/camlistore { }; + canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; + + canto-daemon = callPackage ../applications/networking/feedreaders/canto-daemon { }; + carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python @@ -9622,7 +9747,8 @@ let clipit = callPackage ../applications/misc/clipit { }; - cmplayer = callPackage ../applications/video/cmplayer { + bomi = callPackage ../applications/video/bomi { + stdenv = overrideCC stdenv gcc49; pulseSupport = config.pulseaudio or false; }; @@ -10334,7 +10460,9 @@ let hydrogen = callPackage ../applications/audio/hydrogen { }; - i3 = callPackage ../applications/window-managers/i3 { }; + i3 = callPackage ../applications/window-managers/i3 { + xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; + }; i3lock = callPackage ../applications/window-managers/i3/lock.nix { inherit (xorg) libxkbfile; @@ -10392,12 +10520,7 @@ let iptraf = callPackage ../applications/networking/iptraf { }; - irssi = callPackage ../applications/networking/irc/irssi { - # compile with gccApple on darwin to support the -no-cpp-precompile flag - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; - }; + irssi = callPackage ../applications/networking/irc/irssi { }; irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; @@ -10441,7 +10564,7 @@ let kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { kf5 = kf55; - stdenv = overrideGCC stdenv gccStdInc; + stdenv = overrideCC stdenv gccStdInc; }); kdeApps_latest = kdeApps_14_12; kdeApps_stable = kdeApps_14_12; @@ -10470,7 +10593,7 @@ let kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; - lame = callPackage ../applications/audio/lame { }; + lame = callPackage ../development/libraries/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -10559,6 +10682,13 @@ let lrzsz = callPackage ../tools/misc/lrzsz { }; + luakit = callPackage ../applications/networking/browsers/luakit { + inherit (lua51Packages) luafilesystem luasqlite3; + lua5 = lua5_1; + gtk = gtk3; + webkit = webkitgtk2; + }; + luminanceHDR = callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -10761,6 +10891,13 @@ let namecoin = callPackage ../applications/misc/namecoin { }; namecoinqt = callPackage ../applications/misc/namecoin/qt.nix { }; + panamax_api = callPackage ../applications/networking/cluster/panamax/api.nix { + ruby = ruby_2_1; + }; + panamax_ui = callPackage ../applications/networking/cluster/panamax/ui.nix { + ruby = ruby_2_1; + }; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; }; @@ -10777,6 +10914,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 { }; @@ -10942,7 +11085,7 @@ let inherit (xorg) libXpm; }; - pond = callPackage ../applications/networking/pond { }; + pond = callPackage ../applications/networking/pond { goPackages = go13Packages; }; potrace = callPackage ../applications/graphics/potrace {}; @@ -11038,6 +11181,8 @@ let rapidsvn = callPackage ../applications/version-management/rapidsvn { }; + ratox = callPackage ../applications/networking/instant-messengers/ratox { }; + ratpoison = callPackage ../applications/window-managers/ratpoison { }; rawtherapee = callPackage ../applications/graphics/rawtherapee { @@ -11085,7 +11230,7 @@ let }; sakura = callPackage ../applications/misc/sakura { - inherit (gnome) vte; + inherit (gnome3) vte; }; sbagen = callPackage ../applications/misc/sbagen { }; @@ -11425,6 +11570,10 @@ let vcprompt = callPackage ../applications/version-management/vcprompt { }; + vdirsyncer = callPackage ../tools/misc/vdirsyncer { + pythonPackages = python3Packages; + }; + vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; veracity = callPackage ../applications/version-management/veracity {}; @@ -11454,9 +11603,6 @@ let # optional features by flags flags = [ "python" "X11" ]; # only flag "X11" by now - - # so that we can use gccApple if we're building on darwin - inherit stdenvAdapters gccApple; }); vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); @@ -11469,7 +11615,7 @@ let inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE; - inherit (pkgs) stdenvAdapters gccApple; + inherit (pkgs) stdenvAdapters; features = "huge"; # one of tiny, small, normal, big or huge lua = pkgs.lua5; @@ -11713,6 +11859,10 @@ let xbindkeys = callPackage ../tools/X11/xbindkeys { }; + xbindkeys-config = callPackage ../tools/X11/xbindkeys-config/default.nix { + gtk = gtk2; + }; + xbmcPlain = callPackage ../applications/video/xbmc { ffmpeg = ffmpeg_1; }; @@ -11770,7 +11920,7 @@ let xdotool = callPackage ../tools/X11/xdotool { }; xen = callPackage ../applications/virtualization/xen { - stdenv = overrideGCC stdenv gcc45; + stdenv = overrideCC stdenv gcc45; }; xfe = callPackage ../applications/misc/xfe { @@ -11809,6 +11959,11 @@ let xkb_switch = callPackage ../tools/X11/xkb-switch { }; + xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { + ghcWithPackages = haskellngPackages.ghcWithPackages; + packages = self: []; + }; + xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad-log-applet { desktopSupport = "gnome2"; inherit (xfce) libxfce4util xfce4panel; @@ -11891,7 +12046,7 @@ let (let callPackage = newScope pkgs.zathuraCollection; in import ../applications/misc/zathura { inherit callPackage pkgs fetchurl; - stdenv = overrideGCC stdenv gcc49; + stdenv = overrideCC stdenv gcc49; useMupdf = config.zathura.useMupdf or false; }); @@ -11903,7 +12058,7 @@ let girara = callPackage ../applications/misc/girara { gtk = gtk3; - stdenv = overrideGCC stdenv gcc49; + stdenv = overrideCC stdenv gcc49; }; girara-light = callPackage ../applications/misc/girara { @@ -12168,9 +12323,9 @@ let stardust = callPackage ../games/stardust {}; - steam = callPackage ../games/steam {}; + steam-original = callPackage ../games/steam { }; - steamChrootEnv = callPackage ../games/steam/chrootenv.nix { }; + steam = callPackage ../games/steam/chrootenv.nix { }; stuntrally = callPackage ../games/stuntrally { }; @@ -12546,7 +12701,7 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 { - stdenv = overrideGCC stdenv gccStdInc; + stdenv = overrideCC stdenv gccStdInc; }); plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {}); plasma5_latest = plasma52; @@ -13411,7 +13566,7 @@ let # this is to circumvent the bug with libgcc_s.so.1 which is # not found when using thread extraCmds = '' - LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib + LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.cc}/lib export LD_LIBRARY_PATH ''; }; @@ -13446,6 +13601,7 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; + arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix new file mode 100644 index 000000000000..dfff0b680cd4 --- /dev/null +++ b/pkgs/top-level/go-packages.nix @@ -0,0 +1,762 @@ +/* This file defines the composition for Go packages. */ + +{ overrides, stdenv, go, buildGoPackage, git, pkgconfig, libusb +, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr }: + +let self = _self // overrides; _self = with self; { + + inherit go buildGoPackage; + + ## OFFICIAL GO PACKAGES + + crypto = buildGoPackage rec { + rev = "31393df5baea"; + name = "go-crypto-${rev}"; + goPackagePath = "code.google.com/p/go.crypto"; + src = fetchhg { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "0b95dpsvxxapcjjvhj05fdmyn0mzffamc25hvxy7xgsl2l9yy3nw"; + }; + }; + + image = buildGoPackage rec { + rev = "490b1ad139b3"; + name = "go.image-${rev}"; + goPackagePath = "code.google.com/p/go.image"; + src = fetchhg { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "02m6ifwby2fi88njarbbb6dimwg0pd2b6llkgyadh4b9wzp2vy4r"; + }; + }; + + net = buildGoPackage rec { + rev = "3338d5f109e9"; + name = "go.net-${rev}"; + goPackagePath = "code.google.com/p/go.net"; + src = fetchhg { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "0yz807y3ac07x3nf0qlaw1w1i6asynrpyssjl8jyv3pplww0qj7i"; + }; + propagatedBuildInputs = [ text ]; + }; + + protobuf = buildGoPackage rec { + rev = "36be16571e14"; + name = "goprotobuf-${rev}"; + goPackagePath = "code.google.com/p/goprotobuf"; + src = fetchhg { + inherit rev; + url = "https://code.google.com/p/goprotobuf"; + sha256 = "14yay2sgfbbs0bx3q03bdqn1kivyvxfdm34rmp2612gvinlll215"; + }; + subPackages = [ "proto" "protoc-gen-go" ]; + }; + + text = buildGoPackage rec { + rev = "024681b033be"; + name = "go.text-${rev}"; + goPackagePath = "code.google.com/p/go.text"; + src = fetchhg { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "19px5pw5mvwjb7ymivfkkkr6cyl2npv834jxlr6y0x5ca1djhsci"; + }; + doCheck = false; + }; + + tools = buildGoPackage rec { + rev = "140fcaadc5860b1a014ec69fdeec807fe3b787e8"; + name = "go.tools-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "code.google.com/p/go.tools"; + src = fetchhg { + inherit rev; + url = "http://code.google.com/p/go.tools"; + sha256 = "1vgz4kxy0p56qh6pfbs2c68156hakgx4cmrci9jbg7lnrdaz4y56"; + }; + subPackages = [ "go/vcs" ]; + }; + + ## THIRD PARTY + + binarydist = buildGoPackage rec { + rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; + name = "binarydist-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/kr/binarydist"; + + src = fetchFromGitHub { + inherit rev; + owner = "kr"; + repo = "binarydist"; + sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"; + }; + }; + + bufio = buildGoPackage rec { + rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; + name = "bufio-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/vmihailenco/bufio"; + src = fetchFromGitHub { + inherit rev; + owner = "vmihailenco"; + repo = "bufio"; + sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983"; + }; + }; + + check-v1 = buildGoPackage rec { + rev = "871360013c92e1c715c2de6d06b54899468a8a2d"; + name = "check-v1-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "gopkg.in/check.v1"; + src = fetchgit { + inherit rev; + url = "https://github.com/go-check/check.git"; + sha256 = "0i83qjmd4ri9mrfddhsbpj9nb43rf2j9803k030fj155j31klwcx"; + }; + }; + + circbuf = buildGoPackage rec { + rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; + name = "circbuf-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/armon/circbuf"; + src = fetchFromGitHub { + inherit rev; + owner = "armon"; + repo = "circbuf"; + sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; + }; + }; + + cli = buildGoPackage rec { + rev = "8262fe3f76f0da53b5674eb35c8c6436430794c3"; + name = "cli-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mitchellh/cli"; + src = fetchFromGitHub { + inherit rev; + owner = "mitchellh"; + repo = "cli"; + sha256 = "0pqkxh1q49kkxihggrfjs8174d927g4c5qqx00ggw8sqqsgrw6vn"; + }; + }; + + cobra = buildGoPackage rec { + date = "20140617"; + rev = "10a8494a87448bf5003222d9974f166437e7f042"; + name = "cobra-${date}-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/spf13/cobra"; + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}.git"; + sha256 = "1ydcccx0zdswca4v9hfmrn8ck42h485hy3wrd9k7y6mra3r6c08j"; + }; + propagatedBuildInputs = [ pflag ]; + }; + + columnize = buildGoPackage rec { + rev = "785d943a7b6886e0bb2f139a60487b823dd8d9de"; + name = "columnize-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/ryanuber/columnize"; + src = fetchFromGitHub { + inherit rev; + owner = "ryanuber"; + repo = "columnize"; + sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f"; + }; + }; + + dns = buildGoPackage rec { + rev = "fc67c4b981930a377f8a26a5a1f2c0ccd5dd1514"; + name = "dns-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/miekg/dns"; + src = fetchFromGitHub { + inherit rev; + owner = "miekg"; + repo = "dns"; + sha256 = "1csjmkx0gl34r4hmkhdbdxb0693f1p10yrjaj8f2jwli9p9sl4mg"; + }; + }; + + ed25519 = buildGoPackage rec { + rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c"; + name = "ed25519-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/agl/ed25519"; + src = fetchgit { + inherit rev; + url = "git://${goPackagePath}.git"; + sha256 = "83e3010509805d1d315c7aa85a356fda69d91b51ff99ed98a503d63adb3613e9"; + }; + }; + + gocheck = buildGoPackage rec { + rev = "87"; + name = "gocheck-${rev}"; + goPackagePath = "launchpad.net/gocheck"; + src = fetchbzr { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; + }; + }; + + goconvey = buildGoPackage rec { + version = "1.5.0"; + name = "goconvey-${version}"; + goPackagePath = "github.com/smartystreets/goconvey"; + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/smartystreets/goconvey/archive/${version}.tar.gz"; + sha256 = "0g3965cb8kg4kf9b0klx4pj9ycd7qwbw1jqjspy6i5d4ccd6mby4"; + }; + buildInputs = [ oglematchers ]; + doCheck = false; # please check again + }; + + go-assert = buildGoPackage rec { + rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3"; + name = "assert-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bmizerany/assert"; + src = fetchFromGitHub { + inherit rev; + owner = "bmizerany"; + repo = "assert"; + sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc"; + }; + propagatedBuildInputs = [ pretty ]; + }; + + go-bencode = buildGoPackage rec { + version = "1.1.1"; + name = "go-bencode-${version}"; + goPackagePath = "github.com/ehmry/go-bencode"; + + src = fetchurl { + url = "https://${goPackagePath}/archive/v${version}.tar.gz"; + sha256 = "0y2kz2sg1f7mh6vn70kga5d0qhp04n01pf1w7k6s8j2nm62h24j6"; + }; + }; + + go-bindata = buildGoPackage rec { + version = "3.0.7"; + name = "go-bindata-${version}"; + goPackagePath = "github.com/jteeuwen/go-bindata"; + src = fetchFromGitHub { + repo = "go-bindata"; + owner = "jteeuwen"; + rev = "v${version}"; + sha256 = "1v8xwwlv6my5ixvis31m3vgz4sdc0cq82855j8gxmjp1scinv432"; + }; + + subPackages = [ "./" "go-bindata" ]; # don't build testdata + + meta = with stdenv.lib; { + homepage = "https://github.com/jteeuwen/go-bindata"; + description = "A small utility which generates Go code from any file. Useful for embedding binary data in a Go program."; + maintainers = with maintainers; [ cstrahan ]; + license = licenses.cc0 ; + platforms = platforms.all; + }; + }; + + go-codec = buildGoPackage rec { + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + name = "go-codec-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/ugorji/go"; + src = fetchFromGitHub { + inherit rev; + owner = "ugorji"; + repo = "go"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + }; + + go-fuse = buildGoPackage rec { + rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58"; + name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hanwen/go-fuse"; + src = fetchFromGitHub { + inherit rev; + owner = "hanwen"; + repo = "go-fuse"; + sha256 = "0lycfhchn88kbs81ypz8m5jh032fpbv14gldrjirf32wm1d4f8pj"; + }; + subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ]; + }; + + go-hostpool = buildGoPackage rec { + rev = "fed86fae5cacdc77e7399937e2f8836563620a2e"; + name = "go-hostpool-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bitly/go-hostpool"; + src = fetchFromGitHub { + inherit rev; + owner = "bitly"; + repo = "go-hostpool"; + sha256 = "0nbssfp5ksj4hhc0d8lfq54afd9nqv6qzk3vi6rinxr3fgplrj44"; + }; + }; + + rcrowley.go-metrics = buildGoPackage rec { + rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df"; + name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/rcrowley/go-metrics"; + src = fetchFromGitHub { + inherit rev; + owner = "rcrowley"; + repo = "go-metrics"; + sha256 = "07dc74kiam8v5my7rhi3yxqrpnaapladhk8b3qbnrpjk3shvnx5f"; + }; + + buildInputs = [ influxdb-go stathat ]; + }; + + armon.go-metrics = buildGoPackage rec { + rev = "02567bbc4f518a43853d262b651a3c8257c3f141"; + name = "armon.go-metrics-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/armon/go-metrics"; + src = fetchFromGitHub { + inherit rev; + owner = "armon"; + repo = "go-metrics"; + sha256 = "08fk3zmw0ywmdfp2qhrpv0vrk1y97hzqczrgr3y2yip3x8sr37ar"; + }; + }; + + go-msgpack = buildGoPackage rec { + rev = "75092644046c5e38257395b86ed26c702dc95b92"; + name = "go-msgpack-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/ugorji/go-msgpack"; + src = fetchFromGitHub { + inherit rev; + owner = "ugorji"; + repo = "go-msgpack"; + sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98"; + }; + }; + + go-nsq = buildGoPackage rec { + rev = "c79a282f05364e340eadc2ce2f862a3d44eea9c0"; + name = "go-nsq-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bitly/go-nsq"; + src = fetchFromGitHub { + inherit rev; + owner = "bitly"; + repo = "go-nsq"; + sha256 = "19jlwj5419p5xwjzfnzlddjnbh5g7ifnqhd00i5p0b6ww1gk011p"; + }; + propagatedBuildInputs = [ go-simplejson go-snappystream ]; + }; + + go-options = buildGoPackage rec { + rev = "896a539cd709f4f39d787562d1583c016ce7517e"; + name = "go-options-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mreiferson/go-options"; + src = fetchFromGitHub { + inherit rev; + owner = "mreiferson"; + repo = "go-options"; + sha256 = "0hg0n5grcjcj5719rqchz0plp39wfk3znqxw8y354k4jwsqwmn17"; + }; + }; + + go-simplejson = buildGoPackage rec { + rev = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5"; + name = "go-simplejson-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bitly/go-simplejson"; + src = fetchFromGitHub { + inherit rev; + owner = "bitly"; + repo = "go-simplejson"; + sha256 = "1d8x0himl58qn87lv418djy6mbs66p9ai3zpqq13nhkfl67fj3bi"; + }; + }; + + go-snappystream = buildGoPackage rec { + rev = "97c96e6648e99c2ce4fe7d169aa3f7368204e04d"; + name = "go-snappystream-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mreiferson/go-snappystream"; + src = fetchFromGitHub { + inherit rev; + owner = "mreiferson"; + repo = "go-snappystream"; + sha256 = "08ylvx9r6b1fi76v6cqjvny4yqsvcqjfsg93jdrgs7hi4mxvxynn"; + }; + propagatedBuildInputs = [ snappy-go ]; + }; + + go-syslog = buildGoPackage rec { + rev = "ac3963b72ac367e48b1e68a831e62b93fb69091c"; + name = "go-syslog-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/go-syslog"; + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "go-syslog"; + sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81"; + }; + }; + + go-update = buildGoPackage rec { + rev = "c1385108bc3a016f1c88b75ea7d2e2a356a1571d"; + name = "go-update-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/inconshreveable/go-update"; + + buildInputs = [ osext binarydist ]; + + src = fetchFromGitHub { + inherit rev; + owner = "inconshreveable"; + repo = "go-update"; + sha256 = "16zaxa0i07ismxdmkvjj4dpyc9lgp6wa94q090m9a48si40w9sjn"; + }; + }; + + go-vhost = buildGoPackage rec { + rev = "c4c28117502e4bf00960c8282b2d1c51c865fe2c"; + name = "go-vhost-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/inconshreveable/go-vhost"; + src = fetchFromGitHub { + inherit rev; + owner = "inconshreveable"; + repo = "go-vhost"; + sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"; + }; + }; + + influxdb-go = buildGoPackage rec { + rev = "63c9a5f67dcb633d05164bf8442160c9e2e402f7"; + name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/influxdb/influxdb-go"; + src = fetchFromGitHub { + inherit rev; + owner = "influxdb"; + repo = "influxdb-go"; + sha256 = "16in1xhx94pir06aw166inn0hzpb7836xbws16laabs1p2np7bld"; + }; + }; + + eckardt.influxdb-go = buildGoPackage rec { + rev = "8b71952efc257237e077c5d0672e936713bad38f"; + name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/eckardt/influxdb-go"; + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}.git"; + sha256 = "5318c7e1131ba2330c90a1b67855209e41d3c77811b1d212a96525b42d391f6e"; + }; + }; + + iochan = buildGoPackage rec { + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + name = "iochan-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mitchellh/iochan"; + src = fetchFromGitHub { + inherit rev; + owner = "mitchellh"; + repo = "iochan"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + }; + + log4go = buildGoPackage rec { + rev = "48"; + name = "log4go-${rev}"; + goPackagePath = "code.google.com/p/log4go"; + + src = fetchhg { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p"; + }; + + subPackages = [ "./" ]; # don't build examples + }; + + logutils = buildGoPackage rec { + rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; + name = "logutils-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/logutils"; + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "logutils"; + sha256 = "033rbkc066g657r0dnzysigjz2bs4biiz0kmiypd139d34jvslwz"; + }; + }; + + mapstructure = buildGoPackage rec { + rev = "6fb2c832bcac61d01212ab1d172f7a14a8585b07"; + name = "mapstructure-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mitchellh/mapstructure"; + src = fetchFromGitHub { + inherit rev; + owner = "mitchellh"; + repo = "mapstructure"; + sha256 = "0mx855lwhv0rk461wmbnbzbpkhmq5p2ipmrm5bhzimagrr1w17hw"; + }; + }; + + mdns = buildGoPackage rec { + rev = "70462deb060d44247356ee238ebafd7699ddcffe"; + name = "mdns-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/armon/mdns"; + src = fetchFromGitHub { + inherit rev; + owner = "armon"; + repo = "mdns"; + sha256 = "0xkm3d0hsixdm1yrkx9c39723kfjkb3wvrzrmx3np9ylcwn6h5p5"; + }; + + propagatedBuildInputs = [ dns net ]; + }; + + memberlist = buildGoPackage rec { + rev = "17d39b695094be943bfb98442a80b082e6b9ac47"; + name = "memberlist-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/memberlist"; + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "memberlist"; + sha256 = "0nvgjnwmfqhv2wvr77d2q5mq1bfw4xbpil6wgyj4fyrmhsfzrv3g"; + }; + + propagatedBuildInputs = [ go-codec armon.go-metrics ]; + }; + + mgo = buildGoPackage rec { + rev = "2"; + name = "mgo-${rev}"; + goPackagePath = "launchpad.net/mgo"; + src = fetchbzr { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; + }; + }; + + mousetrap = buildGoPackage rec { + rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; + name = "mousetrap-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/inconshreveable/mousetrap"; + src = fetchFromGitHub { + inherit rev; + owner = "inconshreveable"; + repo = "mousetrap"; + sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + }; + }; + + msgpack = buildGoPackage rec { + rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205"; + name = "msgpack-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/vmihailenco/msgpack"; + src = fetchFromGitHub { + inherit rev; + owner = "vmihailenco"; + repo = "msgpack"; + sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0"; + }; + }; + + oglematchers = buildGoPackage rec { + rev = "4fc24f97b5b74022c2a3f4ca7eed57ca29083d3e"; + name = "oglematchers-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/jacobsa/oglematchers"; + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}.git"; + sha256 = "4075ede31601adf8c4e92739693aebffa3718c641dfca75b09cf6b4bd6c26cc0"; + }; + #goTestInputs = [ ogletest ]; + doCheck = false; # infinite recursion + }; + + oglemock = buildGoPackage rec { + rev = "d054ecee522bdce4481690cdeb09d1b4c44da4e1"; + name = "oglemock-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/jacobsa/oglemock"; + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}.git"; + sha256 = "685e7fc4308d118ae25467ba84c64754692a7772c77c197f38d8c1b63ea81da2"; + }; + buildInputs = [ oglematchers ]; + #goTestInputs = [ ogletest ]; + doCheck = false; # infinite recursion + }; + + ogletest = buildGoPackage rec { + rev = "7de485607c3f215cf92c1f793b5d5a7de46ec3c7"; + name = "ogletest-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/jacobsa/ogletest"; + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}.git"; + sha256 = "0cfc43646d59dcea5772320f968aef2f565fb5c46068d8def412b8f635365361"; + }; + buildInputs = [ oglemock oglematchers ]; + doCheck = false; # check this again + }; + + osext = buildGoPackage rec { + rev = "10"; + name = "osext-${rev}"; + goPackagePath = "bitbucket.org/kardianos/osext"; + src = fetchhg { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "1sj9r5pm28l9sqx6354fwp032n53znx9k8495k3dfnyqjrkvlw6n"; + }; + }; + + perks = buildGoPackage rec { + rev = "aac9e2eab5a334037057336897fd10b0289a5ae8"; + name = "perks-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bmizerany/perks"; + src = fetchFromGitHub { + inherit rev; + owner = "bmizerany"; + repo = "perks"; + sha256 = "1d027jgc327qz5xmal0hrpqvsj45i9yqmm9pxk3xp3hancvz3l3k"; + }; + }; + + pflag = buildGoPackage rec { + date = "20131112"; + rev = "94e98a55fb412fcbcfc302555cb990f5e1590627"; + name = "pflag-${date}-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/spf13/pflag"; + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}.git"; + sha256 = "0z8nzdhj8nrim8fz11magdl0wxnisix9p2kcvn5kkb3bg8wmxhbg"; + }; + doCheck = false; # bad import path in tests + }; + + pretty = buildGoPackage rec { + rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f"; + name = "pretty-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/kr/pretty"; + src = fetchFromGitHub { + inherit rev; + owner = "kr"; + repo = "pretty"; + sha256 = "1m61y592qsnwsqn76v54mm6h2pcvh4wlzbzscc1ag645x0j33vvl"; + }; + propagatedBuildInputs = [ kr.text ]; + }; + + pty = buildGoPackage rec { + rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; + name = "pty-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/kr/pty"; + src = fetchFromGitHub { + inherit rev; + owner = "kr"; + repo = "pty"; + sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + }; + }; + + snappy-go = buildGoPackage rec { + rev = "14"; + name = "snappy-go-${rev}"; + goPackagePath = "code.google.com/p/snappy-go"; + src = fetchhg { + inherit rev; + url = "http://code.google.com/p/snappy-go"; + sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7"; + }; + }; + + stathat = buildGoPackage rec { + rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; + name = "stathat-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/stathat/go"; + src = fetchFromGitHub { + inherit rev; + owner = "stathat"; + repo = "go"; + sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; + }; + }; + + termbox-go = buildGoPackage rec { + rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; + name = "termbox-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/nsf/termbox-go"; + src = fetchFromGitHub { + inherit rev; + owner = "nsf"; + repo = "termbox-go"; + sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"; + }; + + subPackages = [ "./" ]; # prevent building _demos + }; + + kr.text = buildGoPackage rec { + rev = "6807e777504f54ad073ecef66747de158294b639"; + name = "kr.text-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/kr/text"; + src = fetchFromGitHub { + inherit rev; + owner = "kr"; + repo = "text"; + sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698"; + }; + propagatedBuildInputs = [ pty ]; + }; + + toml = buildGoPackage rec { + rev = "f87ce853111478914f0bcffa34d43a93643e6eda"; + name = "toml-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/BurntSushi/toml"; + src = fetchFromGitHub { + inherit rev; + owner = "BurntSushi"; + repo = "toml"; + sha256 = "0g8203y9ycf34j2q3ymxb8nh4habgwdrjn9vdgrginllx73yq565"; + }; + }; + + usb = buildGoPackage rec { + rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; + name = "usb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hanwen/usb"; + src = fetchFromGitHub { + inherit rev; + owner = "hanwen"; + repo = "usb"; + sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; + }; + buildInputs = [ pkgconfig libusb ]; + }; + + websocket = buildGoPackage rec { + rev = "f4076986b69612ecb8bc7ce06d742eda6286200d"; + name = "websocket-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/gorilla/websocket"; + + src = fetchFromGitHub { + inherit rev; + owner = "gorilla"; + repo = "websocket"; + sha256 = "09arvwlxw15maf4z8pcgjc25hd00mckqpdi0byafqfgm3nvvacvq"; + }; + }; + + yaml-v1 = buildGoPackage rec { + rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a"; + name = "yaml-v1-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "gopkg.in/yaml.v1"; + src = fetchgit { + inherit rev; + url = "https://github.com/go-yaml/yaml.git"; + sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"; + }; + }; + +}; in self diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix index 220fca90a53f..2e0d61f18733 100644 --- a/pkgs/top-level/haskell-ng.nix +++ b/pkgs/top-level/haskell-ng.nix @@ -1,4 +1,4 @@ -{ pkgs, callPackage }: +{ pkgs, callPackage, stdenv }: rec { @@ -7,18 +7,36 @@ rec { compiler = { ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; - ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix { gmp = pkgs.gmp4; }; - ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix { gmp = pkgs.gmp4; }; + ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); + ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; - ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix { ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; - ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix { ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; - ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix { ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; - ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix { ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; - ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix { ghc = compiler.ghc742Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; - ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; }; - ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; }; + ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix ({ ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); + ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix ({ ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); + ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix ({ ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); + ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix ({ ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); + ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; gmp = pkgs.gmp.override { withStatic = true; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); + ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); + ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); ghc = compiler.ghc784; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c17972dbd388..cc936d77608b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2827,6 +2827,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vectorBinaryInstances = callPackage ../development/libraries/haskell/vector-binary-instances {}; + vectorFftw = callPackage ../development/libraries/haskell/vector-fftw {}; + vectorInstances = callPackage ../development/libraries/haskell/vector-instances {}; vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18e50ffdfa4e..e996d35b80e4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -227,6 +227,14 @@ let self = _self // overrides; _self = with self; { }; }; + ListCompare = buildPerlPackage { + name = "List-Compare-1.18"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JK/JKEENAN/List-Compare-0.39.tar.gz; + sha256 = "1v4gn176faanzf1kr9axdp1220da7nkvz0d66mnk34nd0skjjxcl"; + }; + }; + ArchiveCpio = buildPerlPackage { name = "Archive-Cpio-0.09"; src = fetchurl { @@ -4745,7 +4753,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; @@ -4958,7 +4966,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CommonSense ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; @@ -9963,6 +9971,24 @@ let self = _self // overrides; _self = with self; { }; }; + Tk = buildPerlPackage rec { + name = "Tk-804.032_501"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz"; + sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa"; + }; + makeMakerFlags = "X11LIB=${pkgs.xlibs.libX11}/lib"; + buildInputs = with pkgs; [ xlibs.libX11 libpng ]; + configurePhase = '' + perl Makefile.PL PREFIX=$out $makeMakerFlags + ''; + doCheck = false; + meta ={ + homepage = "http://search.cpan.org/~srezic/Tk-804.032/Tk.pod"; + license = stdenv.lib.licenses.tcltk; + }; + }; + TreeDAGNode = buildPerlPackage { name = "Tree-DAG_Node-1.09"; src = fetchurl { diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 299941790e93..20cc39692c0b 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -372,4 +372,21 @@ rec { uboot = null; gcc.arch = "loongson2f"; }; + + beaglebone = { + name = "beaglebone"; + kernelMajor = "2.6"; + kernelHeadersBaseConfig = "omap2plus_defconfig"; + kernelBaseConfig = "omap2plus_defconfig"; + kernelArch = "arm"; + kernelAutoModules = false; + kernelExtraConfig = ""; # TBD kernel config + kernelTarget = "zImage"; + uboot = null; + gcc = { + arch = "armv7-a"; + fpu = "vfpv3-d16"; + float = "hard"; + }; + }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8fa350e5b52..8b2721e28fdc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -492,6 +492,23 @@ let }; }; + atomicwrites = buildPythonPackage rec { + version = "0.1.0"; + name = "atomicwrites-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/atomicwrites/atomicwrites-${version}.tar.gz"; + sha256 = "1lxz0xhnzihqlvl1h6j2nfxjqqgr4s08196z5phnlcz2s7d5z0mg"; + }; + + meta = { + description = "Atomic file writes on POSIX"; + homepage = https://pypi.python.org/pypi/atomicwrites/0.1.0; + maintainers = with maintainers; [ matthiasbeyer ]; + }; + + }; + argparse = buildPythonPackage (rec { name = "argparse-1.2.1"; @@ -1075,15 +1092,19 @@ let boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.34.0"; + version = "2.36.0"; src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "08zavyn02qng9y0251a9mrlkb3aw33m7gx5kc97hwngl3xk3s777"; + sha256 = "1zrlmri89q2090yh9ylx798q4yk54y39v7w7xj101fnwc1r6jlqr"; }; - # The tests seem to require AWS credentials. - doCheck = false; + checkPhase = '' + ${python.interpreter} tests/test.py default + ''; + + buildInputs = [ self.nose self.mock ]; + propagatedBuildInputs = [ self.requests self.httpretty ]; meta = { homepage = https://github.com/boto/boto; @@ -4226,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; @@ -7200,11 +7221,11 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.14.0"; + version = "0.15.4"; src = pkgs.fetchurl { + sha256 = "1s57krfa5kpn15ma7dcivizgn987j24i6cxrnjf9hnnann0q26cd"; url = "https://pypi.python.org/packages/source/p/pgcli/${name}.tar.gz"; - sha256 = "0x31b3kvybdvd413h6b5iq4b5vv2x30ff1r00gs6ana0xpzzrqxp"; }; propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ]; @@ -7215,7 +7236,7 @@ let Rich command-line interface for PostgreSQL with auto-completion and syntax highlighting. ''; - homepage = http://pgcli.com/about; + homepage = http://pgcli.com; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ nckx ]; }; @@ -7468,9 +7489,8 @@ let protobuf = buildPythonPackage rec { inherit (pkgs.protobuf) name src; - propagatedBuildInputs = with self; [ pkgs.protobuf google_apputils ]; - sourceRoot = "${name}/python"; - + propagatedBuildInputs = with self; [ pkgs.protobuf google_apputils ]; + sourceRoot = "${name}-src/python"; meta = { description = "Protocol Buffers are Google's data interchange format"; @@ -7642,7 +7662,7 @@ let sha256 = "1xanqn7rn96841s3lim5lnx5743gc4kyfg4ggj1ys5r0gw8i6har"; }; - disabled = isPy3k; + disabled = isPy3k || isPyPy; propagatedBuildInputs = with self; [ dateutil ]; @@ -7663,7 +7683,7 @@ let sha256 = "0avkrcpisfvhz103v7vmq2jd83hvmpqrb4mlbx6ikkk1wcvclsx8"; }; - disabled = isPy3k; + disabled = isPy3k || isPyPy; propagatedBuildInputs = with self; [ sqlite3 vobject lxml requests urwid pyxdg ]; @@ -8955,6 +8975,25 @@ let }; }; + requests_toolbelt = buildPythonPackage rec { + version = "0.3.0"; + name = "requests-toolbelt-${version}"; + + src = pkgs.fetchurl { + url = "https://github.com/sigmavirus24/requests-toolbelt/archive/${version}.tar.gz"; + sha256 = "177lqpm2czx81pjg0zfs1dkbbmcn5yf1y5qxj23x6y5d28518qwl"; + }; + + propagatedBuildInputs = with self; [ requests2 ]; + + meta = { + description = "A toolbelt of useful classes and functions to be used with python-requests"; + homepage = http://toolbelt.rtfd.org; + maintainers = with maintainers; [ matthiasbeyer ]; + }; + + }; + retry_decorator = buildPythonPackage rec { name = "retry_decorator-1.0.0"; src = pkgs.fetchurl { @@ -9767,12 +9806,12 @@ let }; sympy = buildPythonPackage rec { - name = "sympy-0.7.4"; + name = "sympy-0.7.6"; disabled = isPy34; # some tests fail src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sympy/${name}.tar.gz"; - sha256 = "0h1b9mx0snyyybj1x1ga69qssgjzkkgx2rw6nddjhyz1fknf8ywh"; + sha256 = "19yp0gy4i7p4g6l3b8vaqkj9qj7yqb5kqy0qgbdagpzgkdz958yz"; }; buildInputs = [ pkgs.glibcLocales ]; @@ -10207,11 +10246,11 @@ let }; sqlalchemy9 = buildPythonPackage rec { - name = "SQLAlchemy-0.9.4"; + name = "SQLAlchemy-0.9.8"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; - md5 = "c008ea5e2565ec1418ee8461393a99b1"; + md5 = "470ca4da4a0081efc830f0d90dd91682"; }; buildInputs = with self; [ nose mock ]; @@ -10502,13 +10541,12 @@ let }; taskw = buildPythonPackage rec { - version = "0.8.6"; + version = "1.0.2"; name = "taskw-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/taskw/${name}.tar.gz"; - # md5 = "9f3ce2eaff9a3986d04632547168894d"; # provided by pypi website. - sha256 = "341a165a1c2ef94fb1c2a49a785357377f04a0d55cabe9563179849497e47146"; + sha256 = "0wa2hwplss2r56jrwib6j9sxxm02dz78878975jk9fj10p84w5kr"; }; patches = [ ../development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch ]; @@ -10517,7 +10555,7 @@ let --replace '@@taskwarrior@@' '${pkgs.taskwarrior}' ''; - buildInputs = with self; [ nose pkgs.taskwarrior ]; + buildInputs = with self; [ nose pkgs.taskwarrior tox ]; propagatedBuildInputs = with self; [ six dateutil pytz ]; meta = { @@ -10657,14 +10695,8 @@ let }; }; - # TODO - # Installs correctly but fails tests that involve simple things like: - # cmd.run("tox", "-h") - # also, buildPythonPackage needs to supply the tox.ini correctly for projects that use tox for their tests - # - tox = buildPythonPackage rec { - name = "tox-1.7.2"; + name = "tox-1.8.1"; propagatedBuildInputs = with self; [ py virtualenv ]; @@ -10672,7 +10704,7 @@ let src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz"; - md5 = "0d9b3acb1a9252659d753b0ae6b9b264"; + md5 = "c4423cc6512932b37e5b0d1faa87bef2"; }; }; @@ -12237,6 +12269,8 @@ let sha256 = "0nyqb0v8yrkqnrqsh1hlhvzr2pyvkxvkw701p3gpsvk29c0gb5n6"; }; + doCheck = false; # some tests use networking + buildInputs = with self; [ mock unittest2 ]; propagatedBuildInputs = with self; [ requests ]; @@ -13360,4 +13394,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 |