diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 70 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 144 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 29 |
3 files changed, 212 insertions, 31 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf480f98520e..4ee30b3d3a6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -635,6 +635,9 @@ let oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; + derez = callPackage ../os-specific/darwin/derez { }; + rez = callPackage ../os-specific/darwin/rez { }; + setfile = callPackage ../os-specific/darwin/setfile { }; install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; @@ -1026,10 +1029,6 @@ let checkinstall = callPackage ../tools/package-management/checkinstall { }; - cheetahTemplate = builderDefsPackage (import ../tools/text/cheetah-template/2.0.1.nix) { - inherit makeWrapper python; - }; - chkrootkit = callPackage ../tools/security/chkrootkit { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -1282,6 +1281,8 @@ let doomseeker = callPackage ../applications/misc/doomseeker { }; + drive = callPackage ../applications/networking/drive { }; + dropbear = callPackage ../tools/networking/dropbear { }; dtach = callPackage ../tools/misc/dtach { }; @@ -1511,7 +1512,9 @@ let garmintools = callPackage ../development/libraries/garmintools {}; - gawk = callPackage ../tools/text/gawk { }; + gawk = callPackage ../tools/text/gawk { + locale = darwin.adv_cmds; + }; gawkInteractive = appendToName "interactive" (gawk.override { readlineSupport = true; }); @@ -1969,7 +1972,7 @@ let else nodePackages_0_12; - iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_5_0; }; + iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_6_1; }; iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }; @@ -4663,12 +4666,13 @@ let nativePrefix = stdenv.cc.nativePrefix or ""; cc = baseCC; libc = libc; + dyld = if stdenv.isDarwin then darwin.dyld else null; isGNU = baseCC.isGNU or false; isClang = baseCC.isClang or false; inherit stdenv binutils coreutils zlib; }; - wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) glibc; + wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) stdenv.cc.libc; # legacy version, used for gnat bootstrapping wrapGCC-old = baseGCC: (makeOverridable (import ../build-support/gcc-wrapper-old)) { nativeTools = stdenv.cc.nativeTools or false; @@ -5158,11 +5162,9 @@ let bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; - binutils = if stdenv.isDarwin - then import ../build-support/native-darwin-cctools-wrapper {inherit stdenv;} - else callPackage ../development/tools/misc/binutils { - inherit noSysDirs; - }; + binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw; + + binutils-raw = callPackage ../development/tools/misc/binutils { inherit noSysDirs; }; binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils { inherit noSysDirs; @@ -5259,12 +5261,12 @@ let cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { wantPS = stdenv.isDarwin; - ps = if stdenv.isDarwin then darwin.ps else null; + ps = if stdenv.isDarwin then darwin.adv_cmds else null; }; cmake = callPackage ../development/tools/build-managers/cmake { wantPS = stdenv.isDarwin; - ps = if stdenv.isDarwin then darwin.ps else null; + ps = if stdenv.isDarwin then darwin.adv_cmds else null; }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -5289,8 +5291,6 @@ let csslint = callPackage ../development/web/csslint { }; - infer = callPackage ../development/tools/analysis/infer { }; - libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; @@ -6040,6 +6040,8 @@ let fmod = callPackage ../development/libraries/fmod { }; + fmod42416 = callPackage ../development/libraries/fmod/4.24.16.nix { }; + freeimage = callPackage ../development/libraries/freeimage { }; freetts = callPackage ../development/libraries/freetts { }; @@ -6918,7 +6920,10 @@ let # glibc provides libiconv so systems with glibc don't need to build libiconv # separately, but we also provide libiconvReal, which will always be a # standalone libiconv, just in case you want it - libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal; + libiconv = + if stdenv.isGlibc then stdenv.cc.libc + else if stdenv.isDarwin then darwin.libiconv + else libiconvReal; libiconvReal = callPackage ../development/libraries/libiconv { fetchurl = fetchurlBoot; @@ -7218,7 +7223,7 @@ let automake = automake113x; # fails with 14 }); - libuv = libuvVersions.v1_5_0; + libuv = libuvVersions.v1_6_1; libv4l = lowPrio (v4l_utils.override { alsaLib = null; @@ -7983,6 +7988,8 @@ let sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { }); + sqlite-amalgamation = callPackage ../development/libraries/sqlite-amalgamation { }; + sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }); sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { @@ -8200,6 +8207,8 @@ let withMesa = lib.elem system lib.platforms.mesaPlatforms; }; + wxmac = callPackage ../development/libraries/wxmac { }; + wtk = callPackage ../development/libraries/wtk { }; x264 = callPackage ../development/libraries/x264 { }; @@ -8741,6 +8750,8 @@ let ghostOne = callPackage ../servers/games/ghost-one { }; + groovebasin = callPackage ../applications/audio/groovebasin { }; + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; @@ -9248,7 +9259,7 @@ let xctoolchain = xcode.toolchain; }; - cctools = (callPackage ../os-specific/darwin/cctools/port.nix {}).native; + cctools = (callPackage ../os-specific/darwin/cctools/port.nix { inherit libobjc; }).native; maloader = callPackage ../os-specific/darwin/maloader { inherit opencflite; @@ -9261,10 +9272,10 @@ 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; }; + binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; }; + cmdline_sdk = cmdline.sdk; cmdline_tools = cmdline.tools; @@ -10781,6 +10792,8 @@ let dvdauthor = callPackage ../applications/video/dvdauthor { }; + dvd-slideshow = callPackage ../applications/video/dvd-slideshow { }; + dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; }; dwbWrapper = wrapFirefox @@ -12575,8 +12588,8 @@ let thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { gconf = pkgs.gnome.GConf; inherit (pkgs.gnome) libgnome libgnomeui; - inherit (pkgs.xlibs) libX11 libXScrnSaver libXext - libXinerama libXrender libXt; + inherit (pkgs.xlibs) libX11 libXScrnSaver libXcomposite libXdamage libXext + libXfixes libXinerama libXrender libXt; }; tig = gitAndTools.tig; @@ -13552,6 +13565,10 @@ let inherit (xlibs) libX11 xproto libXpm libXt; }; + zandronum = callPackage ../games/zandronum { }; + zandronum-server = callPackage ../games/zandronum/server.nix { }; + zandronum-bin = callPackage ../games/zandronum/bin.nix { }; + zdoom = callPackage ../games/zdoom { }; zod = callPackage ../games/zod { }; @@ -14132,6 +14149,8 @@ let satallax = callPackage ../applications/science/logic/satallax {}; + saw-tools = callPackage ../applications/science/logic/saw-tools {}; + spass = callPackage ../applications/science/logic/spass {}; tptp = callPackage ../applications/science/logic/tptp {}; @@ -14673,6 +14692,10 @@ let utf8proc = callPackage ../development/libraries/utf8proc { }; + vbam = callPackage ../misc/emulators/vbam { + inherit (xlibs) libpthreadstubs; + }; + vice = callPackage ../misc/emulators/vice { libX11 = xlibs.libX11; giflib = giflib_4_1; @@ -14835,6 +14858,7 @@ let haskell-ng = haskell; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19 inherit (haskell.compiler) jhc uhc; # 2015-05-15 + cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 opentsdb = callPackage ../tools/misc/opentsdb {}; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index b60ccfdb0dea..ce8e529a9212 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -84,11 +84,7 @@ let sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i"; }; - extraSrcs = [ - { inherit (gcloud-golang) src goPackagePath; } - ]; - - propagatedBuildInputs = [ net ]; + propagatedBuildInputs = [ net gcloud-golang-compute-metadata ]; }; @@ -348,6 +344,18 @@ let propagatedBuildInputs = [ crypto ]; }; + cli-spinner = buildGoPackage rec { + rev = "610063bb4aeef25f7645b3e6080456655ec0fb33"; + name = "cli-spinner-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/odeke-em/cli-spinner"; + src = fetchFromGitHub { + inherit rev; + owner = "odeke-em"; + repo = "cli-spinner"; + sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c"; + }; + }; + cobra = buildGoPackage rec { date = "20140617"; rev = "10a8494a87448bf5003222d9974f166437e7f042"; @@ -374,6 +382,18 @@ let }; }; + command = buildGoPackage rec { + rev = "076a2ad5f3a7ec92179f2d57208728432280ec4e"; + name = "command-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/odeke-em/command"; + src = fetchFromGitHub { + inherit rev; + owner = "odeke-em"; + repo = "command"; + sha256 = "093as4kxlabk3hrsd52kr9fhl6qafr4ghg89cjyglsva0mk0n7sb"; + }; + }; + copystructure = buildGoPackage rec { rev = "6fc66267e9da7d155a9d3bd489e00dad02666dc6"; name = "copystructure-${stdenv.lib.strings.substring 0 7 rev}"; @@ -574,6 +594,18 @@ let }; }; + dts = buildGoPackage rec { + rev = "ec2daabf2f9078e887405f7bcddb3d79cb65502d"; + name = "dts-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/odeke-em/dts"; + src = fetchFromGitHub { + inherit rev; + owner = "odeke-em"; + repo = "dts"; + sha256 = "0vq3cz4ab9vdsz9s0jjlp7z27w218jjabjzsh607ps4i8m5d441s"; + }; + }; + ed25519 = buildGoPackage rec { rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c"; name = "ed25519-${stdenv.lib.strings.substring 0 7 rev}"; @@ -886,6 +918,23 @@ let buildInputs = [ net ]; }; + odeke-em.google-api-go-client = buildGoPackage rec { + rev = "30f4c144b02321ebbc712f35dc95c3e72a5a7fdc"; + name = "odeke-em-google-api-go-client-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/odeke-em/google-api-go-client"; + src = fetchFromGitHub { + inherit rev; + owner = "odeke-em"; + repo = "google-api-go-client"; + sha256 = "1fidlljxnd82i2r9yia0b9gh0vv3hwb5k65papnvw7sqpc4sriby"; + }; + preBuild = '' + rm -rf go/src/${goPackagePath}/examples + ''; + buildInputs = [ net ]; + propagatedBuildInputs = [ google-api-go-client ]; + }; + gopass = buildGoPackage rec { rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; name = "gopass-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1128,6 +1177,18 @@ let }; }; + go-isatty = buildGoPackage rec { + rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; + name = "go-isatty-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mattn/go-isatty"; + src = fetchFromGitHub { + inherit rev; + owner = "mattn"; + repo = "go-isatty"; + sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; + }; + }; + go-log = buildGoPackage rec { rev = "70d039bee4b0e389e5be560491d8291708506f59"; name = "go-log-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1157,6 +1218,19 @@ let buildInputs = [ influxdb stathat ]; }; + appengine = buildGoPackage rec { + rev = "25b8450bec636c6b6e3b9b33d3a3f55230b10812"; + name = "appengine-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "google.golang.org/appengine"; + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "appengine"; + sha256 = "1b0v244hmw8078601v18xda501aix0kw4q2m1g3ai33dl0p2dh2n"; + }; + buildInputs = [ protobuf net ]; + }; + armon.go-metrics = buildGoPackage rec { rev = "a54701ebec11868993bc198c3f315353e9de2ed6"; name = "armon.go-metrics-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1577,6 +1651,18 @@ let }; }; + odeke-em.log = buildGoPackage rec { + rev = "cad53c4565a0b0304577bd13f3862350bdc5f907"; + name = "log-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/odeke-em/log"; + src = fetchFromGitHub { + inherit rev; + owner = "odeke-em"; + repo = "log"; + sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w"; + }; + }; + log4go = buildGoPackage rec { rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8"; name = "log4go-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1911,6 +1997,18 @@ let }; }; + pb = buildGoPackage rec { + rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb"; + name = "pb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/cheggaaa/pb"; + src = fetchFromGitHub { + inherit rev; + owner = "cheggaaa"; + repo = "pb"; + sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam"; + }; + }; + beorn7.perks = buildGoPackage rec { rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}"; @@ -2175,6 +2273,18 @@ let }; }; + ripper = buildGoPackage rec { + rev = "bd1a682568fcb8a480b977bb5851452fc04f9ccb"; + name = "ripper-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/odeke-em/ripper"; + src = fetchFromGitHub { + inherit rev; + owner = "odeke-em"; + repo = "ripper"; + sha256 = "010jsclnmkaywdlyfqdmq372q7kh3qbz2zra0c4wn91qnkmkrnw1"; + }; + }; + sandblast = buildGoPackage rec { rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555"; name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}"; @@ -2285,6 +2395,18 @@ let }; }; + statos = buildGoPackage rec { + rev = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6"; + name = "statos-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/odeke-em/statos"; + src = fetchFromGitHub { + inherit rev; + owner = "odeke-em"; + repo = "statos"; + sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs"; + }; + }; + statik = buildGoPackage rec { rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465"; name = "statik-${stdenv.lib.strings.substring 0 7 rev}"; @@ -2469,4 +2591,16 @@ let }; }; + xon = buildGoPackage rec { + rev = "d580be739d723da4f6378083128f93017b8ab295"; + name = "xon-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/odeke-em/xon"; + src = fetchFromGitHub { + inherit rev; + owner = "odeke-em"; + repo = "xon"; + sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc"; + }; + }; + }; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e829be5a21ec..45148de8ac3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10775,12 +10775,12 @@ let }; requests_toolbelt = buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.0"; name = "requests-toolbelt-${version}"; src = pkgs.fetchurl { url = "https://github.com/sigmavirus24/requests-toolbelt/archive/${version}.tar.gz"; - sha256 = "177lqpm2czx81pjg0zfs1dkbbmcn5yf1y5qxj23x6y5d28518qwl"; + sha256 = "0zvfz4c9lqiwh2qh51rba6ckpjl3pbp9fcm0ri58qhcjd8mh8k34"; }; propagatedBuildInputs = with self; [ requests2 ]; @@ -10788,7 +10788,7 @@ let meta = { description = "A toolbelt of useful classes and functions to be used with python-requests"; homepage = http://toolbelt.rtfd.org; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer jgeerds ]; }; }; @@ -11485,6 +11485,29 @@ let ''; }; + setuptools_scm = buildPythonPackage rec { + name = "setuptools_scm-${version}"; + version = "1.5.4"; + + src = pkgs.fetchurl { + url = "https://bitbucket.org/pypa/setuptools_scm/get/v${version}.tar.bz2"; + sha256 = "0vd6xsl7r0vn5gpw87d31s195j33sqw5c26zdagimy9qzydgq6y6"; + }; + + buildInputs = with self; [ pip ]; + + preBuild = '' + ${python.interpreter} setup.py egg_info + ''; + + meta = with stdenv.lib; { + homepage = https://bitbucket.org/pypa/setuptools_scm/; + description = "Handles managing your python package versions in scm metadata"; + license = licenses.mit; + maintainers = with maintainers; [ jgeerds ]; + }; + }; + setuptoolsDarcs = buildPythonPackage { name = "setuptools-darcs-1.2.9"; |