diff options
author | William A. Kennington III <william@wkennington.com> | 2015-10-01 10:43:44 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-10-01 10:43:44 -0700 |
commit | 98172435f7ccf1912ab7804296c5026a545ae2dd (patch) | |
tree | 8df4430c1dbb2a5a09ca5085cd9198da896c4a87 /pkgs/top-level | |
parent | e7bb9e102323f79832c2e0553b98651a582368c9 (diff) | |
parent | 14961c87810330d22fc1ee11e11a17e32805ff8b (diff) | |
download | nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.gz nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.bz2 nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.lz nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.xz nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.zst nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 124 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 64 |
3 files changed, 189 insertions, 11 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24bd66c1c1ee..aaee17dbd31d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2018,9 +2018,8 @@ let ninka = callPackage ../development/tools/misc/ninka { }; - nodejs-4_1 = callPackage ../development/web/nodejs/v4_1_0.nix { + nodejs-4_1 = callPackage ../development/web/nodejs { libtool = darwin.cctools; - libuv = libuvVersions.v1_7_5; openssl = openssl_1_0_2; }; @@ -4708,9 +4707,7 @@ let rustfmt = callPackage ../development/tools/rust/rustfmt { }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; - sbcl = callPackage ../development/compilers/sbcl { - clisp = clisp; - }; + sbcl = callPackage ../development/compilers/sbcl {}; # For StumpWM sbcl_1_2_5 = callPackage ../development/compilers/sbcl/1.2.5.nix { clisp = clisp; @@ -8352,7 +8349,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 { @@ -11123,8 +11119,9 @@ let emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix { stdenv = pkgs.clangStdenv; }); - emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix { + emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix { stdenv = pkgs.clangStdenv; + inherit (darwin) libobjc; }); emacs24Macport = self.emacs24Macport_24_5; @@ -11298,6 +11295,7 @@ let external = { inherit (haskellPackages) ghc-mod structured-haskell-mode Agda; + inherit (pythonPackages) elpy; }; }; 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 |