diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-02 10:24:41 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-02 10:24:41 +0200 |
commit | 33373d939a19f465228ddede6d38ce9032b5916b (patch) | |
tree | e1e767d2274e689db4e7f6fb4150b5fc5f46a730 /pkgs/top-level | |
parent | b23038dd801fcbfad2980664758d820b29abebae (diff) | |
parent | d1047f7c12bb8097007fc644ea4bebcecbb1b934 (diff) | |
download | nixlib-33373d939a19f465228ddede6d38ce9032b5916b.tar nixlib-33373d939a19f465228ddede6d38ce9032b5916b.tar.gz nixlib-33373d939a19f465228ddede6d38ce9032b5916b.tar.bz2 nixlib-33373d939a19f465228ddede6d38ce9032b5916b.tar.lz nixlib-33373d939a19f465228ddede6d38ce9032b5916b.tar.xz nixlib-33373d939a19f465228ddede6d38ce9032b5916b.tar.zst nixlib-33373d939a19f465228ddede6d38ce9032b5916b.zip |
Merge: staging with systemd
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 59 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 124 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 64 |
3 files changed, 219 insertions, 28 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0433fd8dbc52..bb53ffe6bbdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -628,7 +628,9 @@ let inherit (androidenv) androidsdk_4_4 androidndk; - aria2 = callPackage ../tools/networking/aria2 { }; + aria2 = callPackage ../tools/networking/aria2 { + inherit (darwin.apple_sdk.frameworks) Security; + }; aria = aria2; at = callPackage ../tools/system/at { }; @@ -2017,10 +2019,12 @@ let ninka = callPackage ../development/tools/misc/ninka { }; nodejs-4_1 = callPackage ../development/web/nodejs { + libtool = darwin.cctools; openssl = openssl_1_0_2; }; nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { + libtool = darwin.cctools; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation; }; @@ -2029,7 +2033,7 @@ let else nodejs-4_1; - nodePackages_4_1 = callPackage ./node-packages.nix { self = nodePackages_4_1; nodejs = nodejs-4_1; }; + nodePackages_4_1 = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_1; nodejs = nodejs-4_1; }); nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; @@ -2244,6 +2248,8 @@ let mpage = callPackage ../tools/text/mpage { }; + mpw = callPackage ../tools/security/mpw { }; + mr = callPackage ../applications/version-management/mr { }; mrtg = callPackage ../tools/misc/mrtg { }; @@ -5091,23 +5097,13 @@ let bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { }; ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { }; - ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { - inherit (darwin) libobjc; - }; - ruby_2_0_0 = callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { }; - ruby_2_1_0 = callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { }; - ruby_2_1_1 = callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { }; - ruby_2_1_2 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { }; - ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { }; - ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { - inherit (darwin) libobjc libunwind; - }; - ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { - inherit (darwin) libobjc libunwind; - }; - ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix { - inherit (darwin) libobjc libunwind; - }; + inherit (callPackage ../development/interpreters/ruby {}) + # TODO: uncomment when ruby_1_8_7 doesn't need autoconf + # ruby_1_8_7 + ruby_1_9_3 + ruby_2_0_0 + ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 + ruby_2_2_0 ruby_2_2_2; # Ruby aliases ruby = ruby_2_2; @@ -5469,6 +5465,7 @@ let doxygen = callPackage ../development/tools/documentation/doxygen { qt4 = null; + inherit (darwin.apple_sdk.frameworks) CoreServices; }; doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); @@ -6004,6 +6001,10 @@ let cogl = cogl_1_20; }; + clutter_1_24 = callPackage ../development/libraries/clutter/1.24.nix { + cogl = cogl_1_22; + }; + clutter-gst = callPackage ../development/libraries/clutter-gst { }; clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix { @@ -6022,6 +6023,8 @@ let cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { }; + cogl_1_22 = callPackage ../development/libraries/cogl/1.22.nix { }; + coin3d = callPackage ../development/libraries/coin3d { }; CoinMP = callPackage ../development/libraries/CoinMP { }; @@ -7132,7 +7135,7 @@ let libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; - libjpeg = if (stdenv.isLinux) then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin + libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; @@ -8348,7 +8351,6 @@ let v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (pythonPackages) gyp; - stdenv = overrideCC stdenv gcc48; }; v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix { @@ -9346,14 +9348,16 @@ let zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; xquartz = callPackage ../servers/x11/xquartz { }; - quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; }; + quartz-wm = callPackage ../servers/x11/quartz-wm { + stdenv = clangStdenv; + }; xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../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 tradcpp libinput mcpp makeWrapper autoreconfHook autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; - inherit (darwin) apple_sdk; + inherit (darwin) apple_sdk libobjc CF; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; mesa = mesa_noglu; udev = if stdenv.isLinux then udev else null; @@ -9995,7 +9999,11 @@ let libcap_manpages = callPackage ../os-specific/linux/libcap/man.nix { }; - libcap_ng = callPackage ../os-specific/linux/libcap-ng { }; + libcap_ng = callPackage ../os-specific/linux/libcap-ng { + swig = null; # Currently not using the python2/3 bindings + python2 = null; # Currently not using the python2 bindings + python3 = null; # Currently not using the python3 bindings + }; libnscd = callPackage ../os-specific/linux/libnscd { }; @@ -11287,6 +11295,7 @@ let external = { inherit (haskellPackages) ghc-mod structured-haskell-mode Agda; + inherit (pythonPackages) elpy; }; }; @@ -13910,6 +13919,8 @@ let gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { }); + gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { }); + gnome3 = gnome3_16; gnome = recurseIntoAttrs gnome2; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 2600fe1b82a6..d331850b504b 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -440,6 +440,44 @@ let self = _self // overrides; }; }; + elpy = melpaBuild rec { + pname = "elpy"; + version = external.elpy.version; + src = fetchFromGitHub { + owner = "jorgenschaefer"; + repo = pname; + rev = "39ea47c73f040ce8dcc1c2d2639ebc0eb57ab8c8"; + sha256 = "0q3av1qv4m6aj4bil608f688hjpr5px8zqnnrdqx784nz98rpjrs"; + }; + + patchPhase = '' + for file in elpy.el elpy-pkg.el; do + substituteInPlace $file \ + --replace "company \"0.8.2\"" "company \"${company.version}\"" \ + --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${find-file-in-project.version}\"" \ + --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \ + --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \ + --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\"" + done + ''; + + packageRequires = [ + company find-file-in-project highlight-indentation pyvenv yasnippet + ]; + + propagatedUserEnvPkgs = [ external.elpy ] ++ packageRequires; + + meta = { + description = "Emacs Python Development Environment"; + longDescription = '' + Elpy is an Emacs package to bring powerful Python editing to Emacs. + It combines a number of other packages, both written in Emacs Lisp as + well as Python. + ''; + license = gpl3Plus; + }; + }; + engine-mode = melpaBuild rec { pname = "engine-mode"; version = "1.0.0"; @@ -571,6 +609,26 @@ let self = _self // overrides; }; }; + find-file-in-project = melpaBuild rec { + pname = "find-file-in-project"; + version = "3.5"; + src = fetchFromGitHub { + owner = "technomancy"; + repo = pname; + rev = "53a8d8174f915d9dcf5ac6954b1c0cae61266177"; + sha256 = "0wky8vqg08iw34prbz04bqmhfhj82y93swb8zkz6la2vf9da0gmd"; + }; + meta = { + description = "Quick access to project files in Emacs"; + longDescription = '' + Find files in a project quickly. + This program provides a couple methods for quickly finding any file in a + given project. It depends on GNU find. + ''; + license = gpl3Plus; + }; + }; + flim = melpaBuild rec { pname = "flim"; version = "1.14.9"; # 20141216 @@ -832,6 +890,30 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + highlight-indentation = melpaBuild rec { + pname = "highlight-indentation"; + version = "0.7.0"; + src = fetchFromGitHub { + owner = "antonj"; + repo = "Highlight-Indentation-for-Emacs"; + rev = "v${version}"; + sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k"; + }; + meta = { + description = "Minor modes to highlight indentation guides in emacs"; + longDescription = '' + Provides two minor modes highlight-indentation-mode and + highlight-indentation-current-column-mode + + - highlight-indentation-mode displays guidelines indentation + (space indentation only). + - highlight-indentation-current-column-mode displays guidelines for the + current-point indentation (space indentation only). + ''; + license = gpl2Plus; + }; + }; + ibuffer-vc = melpaBuild rec { pname = "ibuffer-vc"; version = "0.10"; @@ -1189,6 +1271,25 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + pyvenv = melpaBuild rec { + pname = "pyvenv"; + version = "1.7"; + src = fetchFromGitHub { + owner = "jorgenschaefer"; + repo = pname; + rev = "e4f2fa7a32cf480f34d628d8eb5b9b60374d0e8e"; + sha256 = "1669id1p69kpq8zzldxj1p6iyz68701snn462g22k2acfzc2bfha"; + }; + meta = { + description = "Python virtual environment interface for Emacs"; + longDescription = '' + This is a simple global minor mode which will replicate the changes done + by virtualenv activation inside Emacs. + ''; + license = gpl2Plus; + }; + }; + rainbow-delimiters = melpaBuild rec { pname = "rainbow-delimiters"; version = "2.1.1"; @@ -1506,6 +1607,29 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + yasnippet = melpaBuild rec { + pname = "yasnippet"; + version = "0.8.1"; + src = fetchFromGitHub { + owner = "capitaomorte"; + repo = pname; + rev = "01139a2deb9eda272b9b771fbbe15d096061efa4"; + sha256 = "1b0bxzkmw7yd1yf6326zf52aq63n283vy57pysj8cc34d9bk6nnk"; + }; + meta = { + description = "A template system for Emacs"; + longDescription = '' + YASnippet is a template system for Emacs. + It allows you to type an abbreviation and automatically expand it into + function templates. Bundled language templates include: C, C++, C#, + Perl, Python, Ruby, SQL, LaTeX, HTML, CSS and more. + The snippet syntax is inspired from TextMate's syntax, you can even import + most TextMate templates to YASnippet. + ''; + license = gpl2Plus; + }; + }; + zenburn-theme = melpaBuild rec { pname = "zenburn-theme"; version = "2.2"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f472aec99c0b..41f5d5925893 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3015,6 +3015,40 @@ let }; }; + deskcon = self.buildPythonPackage rec { + name = "deskcon-0.3"; + disabled = !isPy27; + + src = pkgs.fetchFromGitHub { + owner= "screenfreeze"; + repo = "deskcon-desktop"; + rev = "267804122188fa79c37f2b21f54fe05c898610e6"; + sha256 ="0i1dd85ls6n14m9q7lkympms1w3x0pqyaxvalq82s4xnjdv585j3"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + pythonPath = [ self.pyopenssl pkgs.gtk3 ]; + + installPhase = '' + substituteInPlace server/deskcon-server --replace "python2" "python" + + mkdir -p $out/bin + mkdir -p $out/lib/${python.libPrefix}/site-packages + cp -r server/* $out/lib/${python.libPrefix}/site-packages + mv $out/lib/${python.libPrefix}/site-packages/deskcon-server $out/bin/deskcon-server + + wrapPythonProgramsIn $out/bin "$out $pythonPath" + ''; + + meta = { + description = "integrates an Android device into a desktop"; + homepage = https://github.com/screenfreeze/deskcon-desktop; + license = licenses.gpl3; + }; + }; + + dill = buildPythonPackage rec { name = "dill-${version}"; version = "0.2.4"; @@ -5820,12 +5854,14 @@ let elpy = buildPythonPackage rec { - name = "elpy-1.0.1"; + name = "elpy-${version}"; + version = "1.9.0"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/e/elpy/elpy-1.0.1.tar.gz"; - md5 = "5453f085f7871ed8fc11d51f0b68c785"; + url = "https://pypi.python.org/packages/source/e/elpy/${name}.tar.gz"; + md5 = "651f6f46767b7132e5c0f83d5ac3b1f7"; }; - propagatedBuildInputs = with self; [ flake8 ]; + python2Deps = if isPy3k then [ ] else [ self.rope ]; + propagatedBuildInputs = with self; [ flake8 autopep8 jedi importmagic ] ++ python2Deps; doCheck = false; # there are no tests @@ -18470,4 +18506,24 @@ let }; }; + importmagic = buildPythonPackage rec { + simpleName = "importmagic"; + name = "${simpleName}-${version}"; + version = "0.1.3"; + doCheck = false; # missing json file from tarball + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/${simpleName}/${name}.tar.gz"; + sha256 = "194bl8l8sc2ibwi6g5kz6xydkbngdqpaj6r2gcsaw1fc73iswwrj"; + }; + + propagatedBuildInputs = with self; [ six ]; + + meta = { + description = "Python Import Magic - automagically add, remove and manage imports"; + homepage = http://github.com/alecthomas/importmagic; + license = "bsd"; + }; + }; + }; in pythonPackages |