From 2d3883735558fcbbbde8b779d73c51a0a050a27d Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Thu, 30 Oct 2014 22:17:01 +0100 Subject: KDevelop: Add some propagatedUserEnvPkgs dependencies. Now KDevelop should start in a functional form without having to manually install those. --- pkgs/applications/editors/kdevelop/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index 945a6210e786..b98e02fd7b98 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info, - kdebase_workspace, gettext, perl, okteta, qjson }: + kdebase_workspace, gettext, perl, okteta, qjson, kate, konsole, kde_runtime, oxygen_icons }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ]; + propagatedUserEnvPkgs = [ kdevplatform kate konsole kde_runtime oxygen_icons ]; + NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; meta = with stdenv.lib; { -- cgit 1.4.1 From 21880ab6fb2622e2bd13049c0807ab1f9300b5f4 Mon Sep 17 00:00:00 2001 From: Allan Espinosa Date: Sat, 1 Nov 2014 23:21:01 +0900 Subject: Update the sha256sum of the new MacVim build Correct the update from #4576 --- pkgs/applications/editors/vim/macvim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 8fc3a4108d2d..d7156321f1db 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "genoma"; repo = "macvim"; rev = "f9c084b97fa9d5cad2448dfd3eff3d9b7f0fac59"; - sha256 = "190bngg8m4bwqcia7w24gn7mmqkhk0mavxy81ziwysam1f652ymf"; + sha256 = "1f6l39s6cgyzzr9ix729axmc299mpl29abbc7571g4vply17m7nv"; }; enableParallelBuilding = true; -- cgit 1.4.1 From c6089871bb6278d1a579474725b5a6a633648046 Mon Sep 17 00:00:00 2001 From: Allan Espinosa Date: Sun, 2 Nov 2014 09:43:19 +0900 Subject: Use fetchurl and the exact release tag --- pkgs/applications/editors/vim/macvim.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index d7156321f1db..0003779a52e2 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, gettext, +{ stdenv, fetchurl, ncurses, gettext, pkgconfig, cscope, python, ruby, tcl, perl, luajit }: @@ -7,10 +7,8 @@ stdenv.mkDerivation rec { version = "7.4.479"; - src = fetchFromGitHub { - owner = "genoma"; - repo = "macvim"; - rev = "f9c084b97fa9d5cad2448dfd3eff3d9b7f0fac59"; + src = fetchurl { + url = "https://github.com/genoma/macvim/archive/g-snapshot-21.tar.gz"; sha256 = "1f6l39s6cgyzzr9ix729axmc299mpl29abbc7571g4vply17m7nv"; }; -- cgit 1.4.1 From f2ae7bd844873a37cdaad39793b0b85c42768402 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Nov 2014 14:38:57 +0100 Subject: magit: update to version 90141025 --- pkgs/applications/editors/emacs-modes/magit/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 4a8d8b20d04a..676a86985f8f 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,16 +1,13 @@ { stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git }: -let - version = "90141016"; -in stdenv.mkDerivation rec { - name = "magit-${version}"; + name = "magit-90141025"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = version; - sha256 = "11d3gzj0hlb7wqsjzjb0vf9i0ik4xzwdyayjy4hfgx0gjmymkfx3"; + rev = "50c08522c8a3c67e0f3b821fe4df61e8bd456ff9"; + sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk"; }; buildInputs = [ emacs texinfo git ]; -- cgit 1.4.1 From 198874e4897793a180bf61543bb39dea0a4d8abc Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 3 Nov 2014 10:51:29 -0600 Subject: emacs24Macport: allow installing either 24.3 or 24.4 --- .../applications/editors/emacs-24/macport-24.3.nix | 100 +++++++++++++++++++++ .../applications/editors/emacs-24/macport-24.4.nix | 100 +++++++++++++++++++++ pkgs/applications/editors/emacs-24/macport.nix | 100 --------------------- pkgs/top-level/all-packages.nix | 6 +- 4 files changed, 205 insertions(+), 101 deletions(-) create mode 100644 pkgs/applications/editors/emacs-24/macport-24.3.nix create mode 100644 pkgs/applications/editors/emacs-24/macport-24.4.nix delete mode 100644 pkgs/applications/editors/emacs-24/macport.nix (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/emacs-24/macport-24.3.nix b/pkgs/applications/editors/emacs-24/macport-24.3.nix new file mode 100644 index 000000000000..d9b32351040b --- /dev/null +++ b/pkgs/applications/editors/emacs-24/macport-24.3.nix @@ -0,0 +1,100 @@ +{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls +}: + +stdenv.mkDerivation rec { + emacsName = "emacs-24.3"; + name = "${emacsName}-mac-4.8"; + + #builder = ./builder.sh; + + src = fetchurl { + url = "mirror://gnu/emacs/${emacsName}.tar.xz"; + sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"; + }; + + macportSrc = fetchurl { + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; + sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx"; + }; + + patches = [ ./darwin-new-sections.patch ]; + + buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; + + postUnpack = '' + mv $emacsName $name + tar xzf $macportSrc + mv $name $emacsName + ''; + + preConfigure = '' + patch -p0 < patch-mac + + # The search for 'tputs' will fail because it's in ncursesw within the + # ncurses package, yet Emacs' configure script only looks in ncurses. + # Further, we need to make sure that the -L option occurs before mention + # of the library, so that it finds it within the Nix store. + sed -i 's/tinfo ncurses/tinfo ncursesw/' configure + ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g') + sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure + sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure + + configureFlagsArray=( + LDFLAGS=-L${ncurses}/lib + --with-xml2=yes + --with-gnutls=yes + --with-mac + --enable-mac-app=$out/Applications + ) + makeFlagsArray=( + CFLAGS=-O3 + LDFLAGS="-O3 -L${ncurses}/lib" + ); + ''; + + postInstall = '' + cat >$out/share/emacs/site-lisp/site-start.el <$out/share/emacs/site-lisp/site-start.el <$out/share/emacs/site-lisp/site-start.el < Date: Mon, 3 Nov 2014 18:46:56 +0100 Subject: idea-{community,ultimate}: 13.1.5 -> 14pre --- pkgs/applications/editors/idea/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 7fbe58f1b292..41790e52a0a3 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -139,6 +139,7 @@ let buildIdea = { name, version, build, src, license, description }: (mkIdeaProduct rec { inherit name version build src; + patchSnappy = false; product = "IDEA"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/idea/"; @@ -190,25 +191,25 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "13.1.5"; - build = "IC-135.1289"; + version = "14pre"; + build = "IC-139.222.5"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { - url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "e08b9adad0ed9aa62a43f3026a1b499d1663710314d00a3bec2e171a6c375f09"; + url = "http://download-ln.jetbrains.com/idea/idea${build}.tar.gz"; + sha256 = "e2c696f465da36b77148a61b45f35f8f08ceae3b624904de8f7cccf0e7c20ce2"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "13.1.5"; - build = "IU-135.1289"; + version = "14pre"; + build = "IU-139.222.5"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "0800b1ffc135f884e46f1004289fb75850148d705afc447d3374cfd281c231a2"; + url = "http://download-ln.jetbrains.com/idea/idea${build}.tar.gz"; + sha256 = "d8e8927adebdc4d2e5f1f5bfb0ecc97c3e561b74d56391898dd36abe89a4f170"; }; }; -- cgit 1.4.1 From 4c81ac3320cc11277cd57e46ebb7578d775f2d74 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 3 Nov 2014 15:26:59 -0600 Subject: macvim: Update sha256 --- pkgs/applications/editors/vim/macvim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 0003779a52e2..784be80ecf48 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/genoma/macvim/archive/g-snapshot-21.tar.gz"; - sha256 = "1f6l39s6cgyzzr9ix729axmc299mpl29abbc7571g4vply17m7nv"; + sha256 = "1s86dpb8bcxh309gikiz8gm9ygv3d2jy6i4qlnxarbvcdk65fzv4"; }; enableParallelBuilding = true; -- cgit 1.4.1 From a7d3aed056da45aa9ca9d7fdaf1da4be24bc7a0e Mon Sep 17 00:00:00 2001 From: Edward Tjörnhammar Date: Tue, 4 Nov 2014 21:02:25 +0100 Subject: idea.clion: added eap --- pkgs/applications/editors/idea/default.nix | 65 +++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 18 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 41790e52a0a3..fd2044bec42d 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -109,32 +109,22 @@ let }; }); - buildPycharm = { name, version, build, src, license, description }: + buildClion = { name, version, build, src, license, description }: (mkIdeaProduct rec { inherit name version build src; - product = "PyCharm"; + patchSnappy = false; + product = "CLion"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/pycharm/"; + homepage = "https://www.jetbrains.com/clion/"; inherit description license; longDescription = '' - Python IDE with complete set of tools for productive - development with Python programming language. In addition, the - IDE provides high-class capabilities for professional Web - development with Django framework and Google App Engine. It - has powerful coding assistance, navigation, a lot of - refactoring features, tight integration with various Version - Control Systems, Unit testing, powerful all-singing - all-dancing Debugger and entire customization. PyCharm is - developer driven IDE. It was developed with the aim of - providing you almost everything you need for your comfortable - and productive development! + Enhancing productivity for every C and C++ + developer on Linux, OS X and Windows. ''; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; - }).override { - propagatedUserEnvPkgs = [ python ]; - }; + }); buildIdea = { name, version, build, src, license, description }: (mkIdeaProduct rec { @@ -172,6 +162,33 @@ let }; }); + buildPycharm = { name, version, build, src, license, description }: + (mkIdeaProduct rec { + inherit name version build src; + product = "PyCharm"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/pycharm/"; + inherit description license; + longDescription = '' + Python IDE with complete set of tools for productive + development with Python programming language. In addition, the + IDE provides high-class capabilities for professional Web + development with Django framework and Google App Engine. It + has powerful coding assistance, navigation, a lot of + refactoring features, tight integration with various Version + Control Systems, Unit testing, powerful all-singing + all-dancing Debugger and entire customization. PyCharm is + developer driven IDE. It was developed with the aim of + providing you almost everything you need for your comfortable + and productive development! + ''; + maintainers = with maintainers; [ jgeerds ]; + platforms = platforms.linux; + }; + }).override { + propagatedUserEnvPkgs = [ python ]; + }; + in { @@ -189,6 +206,18 @@ in }; }; + clion = buildClion rec { + name = "clion"; + version = "eap"; + build = "138.2344.17"; + description = "C/C++ IDE. New. Intelligent. Cross-platform."; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "http://download.jetbrains.com/cpp/${name}-${build}.tar.gz"; + sha256 = "4b568d31132a787b748bc41c69b614dcd90229db69b02406677361bc077efab3"; + }; + }; + idea-community = buildIdea rec { name = "idea-community-${version}"; version = "14pre"; -- cgit 1.4.1 From 6c1ebab0a01f06ae4a1d74ba61741ff9c80a2d50 Mon Sep 17 00:00:00 2001 From: Edward Tjörnhammar Date: Tue, 4 Nov 2014 21:16:59 +0100 Subject: idea.ruby-mine: added 6.3.3 --- pkgs/applications/editors/idea/default.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index fd2044bec42d..7c81f3c5c81a 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -144,6 +144,19 @@ let }; }); + buildRubyMine = { name, version, build, src, license, description }: + (mkIdeaProduct rec { + inherit name version build src; + product = "RubyMine"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/ruby/"; + inherit description license; + longDescription = description; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; + }); + buildPhpStorm = { name, version, build, src, license, description }: (mkIdeaProduct { inherit name version build src; @@ -242,6 +255,18 @@ in }; }; + ruby-mine = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "6.3.3"; + build = "135.1104"; + description = "The Most Intelligent Ruby and Rails IDE"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "http://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; + sha256 = "58d555c2702a93fe62f3809a5cc34e566ecce0c3f1f15daaf87744402157dfac"; + }; + }; + pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; version = "3.4.1"; -- cgit 1.4.1