diff options
Diffstat (limited to 'pkgs/applications/editors')
21 files changed, 197 insertions, 208 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 8bace6210d7..0c0ddc3158a 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -7,7 +7,7 @@ let atomEnv = buildEnv { name = "env-atom"; paths = [ - stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "0.150.0"; + version = "0.171.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1vvsxj1pwpcz0hn58k1hsrv994vm61lxkih58ix1rkj32wpvdjxn"; + sha256 = "0syl3rljk2k8j6fy8xq59qhf13b8a4awpi5cvn1kka56y0vmhxs5"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 71b2ccb6fb8..25538df0384 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2 +{ stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2 , enchant, gucharmap, python }: stdenv.mkDerivation rec { - name = "bluefish-2.2.6"; + name = "bluefish-2.2.7"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "05j2mv6s2llf2pxknddhk8fzbghr7yff58xhkxy2icky64n8khjl"; + sha256 = "1psqx3ljz13ylqs4zkaxv9lv1hgzld6904kdp0alwx99p5rlnlr3"; }; - buildInputs = [intltool pkgconfig gtk libxml2 - enchant gucharmap python]; + buildInputs = [ intltool pkgconfig gtk libxml2 + enchant gucharmap python ]; meta = with stdenv.lib; { description = "A powerful editor targeted towards programmers and webdevelopers"; diff --git a/pkgs/applications/editors/emacs-24/builder.sh b/pkgs/applications/editors/emacs-24/builder.sh index 5b86f98d61c..984a61df6f3 100644 --- a/pkgs/applications/editors/emacs-24/builder.sh +++ b/pkgs/applications/editors/emacs-24/builder.sh @@ -5,6 +5,10 @@ source $stdenv/setup # *our* versions, not the ones found in the system, as it would do by default. # On other platforms, this appears to be unnecessary. preConfigure() { + for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do + substituteInPlace $i --replace /bin/pwd pwd + done + case "${system}" in x86_64-linux) glibclibdir=lib64 ;; i686-linux) glibclibdir=lib ;; @@ -23,7 +27,9 @@ preConfigure() { --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \ --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o done +} +preInstall () { for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do substituteInPlace $i --replace /bin/pwd pwd done diff --git a/pkgs/applications/editors/emacs-24/macport-24.4.nix b/pkgs/applications/editors/emacs-24/macport-24.4.nix index 0af0e479a07..802faf44c64 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.4.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.4.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { emacsName = "emacs-24.4"; - name = "${emacsName}-mac-5.1"; + name = "${emacsName}-mac-5.3"; #builder = ./builder.sh; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "0qn200vv91qxf93x6y8fdi7l3bsni3clqzf8rcjdpbva1qzgcx27"; + sha256 = "0qzzqnql0z0a2p3ciccy8gq79v0s7s717lchcprn3wlaqcrk2g1p"; }; patches = [ ./darwin-new-sections.patch ]; @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { ''; preConfigure = '' + substituteInPlace Makefile.in --replace "/bin/pwd" "pwd" + substituteInPlace lib-src/Makefile.in --replace "/bin/pwd" "pwd" + patch -p0 < patch-mac # The search for 'tputs' will fail because it's in ncursesw within the diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/pkgs/applications/editors/emacs-modes/d/default.nix new file mode 100644 index 00000000000..28736acded2 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/d/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, emacs}: + +# Note: Don't have a version, using date as fallback. +let version = "20150111"; + +in stdenv.mkDerivation { + name = "emacs-d-${version}"; + + src = fetchurl { + url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz"; + sha256 = "0vb0za51lc6qf1qgqisap4vzk36caa5k17zajjn034rhjsqfw0w7"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs -L . --batch -f batch-byte-compile *.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "Major mode for editing D code"; + homepage = https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index a44be28399d..1e9843447d9 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; broken = true; }; diff --git a/pkgs/applications/editors/emacs-modes/flycheck/default.nix b/pkgs/applications/editors/emacs-modes/flycheck/default.nix new file mode 100644 index 00000000000..98eab4d477c --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/flycheck/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, emacs, let-alist, dash, texinfo }: + +stdenv.mkDerivation { + name = "flycheck-0.22-64-g90dbc2d"; + + src = fetchFromGitHub { + owner = "flycheck"; + repo = "flycheck"; + rev = "90dbc2d"; + sha256 = "08bg4jps6hjldbcrvqarrwdv4xzirm5pns5s0331wm0sc47yvbli"; + }; + + buildInputs = [ emacs texinfo ]; + + buildPhase = '' + emacs -L ${let-alist}/share/emacs/site-lisp -L ${dash}/share/emacs/site-lisp --batch -f batch-byte-compile flycheck.el + makeinfo --force --no-split -o doc/flycheck.info doc/flycheck.texi + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp $out/share/info + mv flycheck.el flycheck.elc $out/share/emacs/site-lisp/ + mv "doc/"*.info $out/share/info/ + ''; + + meta = { + homepage = "https://github.com/magit/git-modes"; + description = "Emacs modes for various Git-related files"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/haskell/git.nix b/pkgs/applications/editors/emacs-modes/haskell/git.nix index 72f49592b51..20de1cae4d3 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/git.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/git.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo }: let - version = "13.10-299-g74b5a3c"; # git describe --tags + version = "13.10-361-gfa09425"; # git describe --tags in stdenv.mkDerivation { name = "haskell-mode-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "haskell"; repo = "haskell-mode"; rev = "v${version}"; - sha256 = "1qjrc1c4jsgbbhnhssvadg00qffn80a8slrxc9g1hnzp632kv8wl"; + sha256 = "1bq4gddzwjy2w1hbsmwxcamcy87amz7ksy1vmpwg0qij88fk4av9"; }; buildInputs = [ emacs texinfo ]; diff --git a/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/pkgs/applications/editors/emacs-modes/let-alist/default.nix new file mode 100644 index 00000000000..863e9f95d95 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/let-alist/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, emacs }: + +stdenv.mkDerivation rec { + name = "let-alist-1.0.3"; + + src = fetchurl { + url = "http://elpa.gnu.org/packages/let-alist-1.0.3.el"; + sha256 = "12n1cmjc7hzyy0jmsdxqz1hqzg4ri4nvvi0p9mw1d6v44xzfm0mx"; + }; + + buildInputs = [ emacs ]; + + unpackPhase = "cp -v ${src} let-alist.el"; + buildPhase = "emacs --batch -f batch-byte-compile let-alist.el"; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + mv -v *.el *.elc $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = "http://elpa.gnu.org/packages/let-alist.html"; + description = "Easily let-bind values of an assoc-list by their names"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }; +} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index e53292451d3..d5b8314cea5 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -6,28 +6,29 @@ assert stdenv.isLinux; let - mkIdeaProduct = - { name, product, version, build, src, meta, patchSnappy ? true }: + mkIdeaProduct = with stdenv.lib; + { name, product, version, build, src, meta }: - let loName = stdenv.lib.toLower product; - hiName = stdenv.lib.toUpper product; in + let loName = toLower product; + hiName = toUpper product; + execName = concatStringsSep "-" (init (splitString "-" name)); + in with stdenv; lib.makeOverridable mkDerivation rec { inherit name build src meta; desktopItem = makeDesktopItem { - name = loName; - exec = loName; + name = execName; + exec = execName; comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; categories = "Application;Development;"; - icon = loName; + icon = execName; }; buildInputs = [ makeWrapper patchelf p7zip unzip ]; - patchPhase = lib.concatStringsSep "\n" [ - '' + patchPhase = '' get_file_size() { local fname="$1" echo $(ls -l $fname | cut -d ' ' -f5) @@ -50,31 +51,18 @@ let patchelf --set-interpreter "$interpreter" bin/fsnotifier munge_size_hack bin/fsnotifier $target_size fi - '' - - (lib.optionalString patchSnappy '' - snappyPath="lib/snappy-java-1.0.5" - 7z x -o"$snappyPath" "$snappyPath.jar" - if [ "${stdenv.system}" == "x86_64-linux" ]; then - patchelf --set-rpath ${stdenv.cc.gcc}/lib64 "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so" - else - patchelf --set-rpath ${stdenv.cc.gcc}/lib "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so" - fi - 7z a -tzip "$snappyPath.jar" ./"$snappyPath"/* - rm -vr "$snappyPath" - '') - ]; + ''; installPhase = '' - mkdir -vp "$out/bin" "$out/$name" "$out/share/pixmaps" - cp -va . "$out/$name" - ln -s "$out/$name/bin/${loName}.png" "$out/share/pixmaps/" + mkdir -vp $out/{bin,$name,share/pixmaps,libexec/${name}} + cp -va . $out/$name + ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png + mv bin/fsnotifier* $out/libexec/${name}/. jdk=${jdk.home} - makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \ - --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ - --prefix LD_RUN_PATH : "${stdenv.cc.gcc}/lib/" \ + makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ + --prefix PATH : "$out/libexec/${name},${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ --prefix JDK_HOME : "$jdk" \ --prefix ${hiName}_JDK : "$jdk" @@ -104,7 +92,6 @@ let buildClion = { name, version, build, src, license, description }: (mkIdeaProduct rec { inherit name version build src; - patchSnappy = false; product = "CLion"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/clion/"; @@ -121,7 +108,6 @@ 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/"; @@ -139,7 +125,6 @@ let buildRubyMine = { name, version, build, src, license, description }: (mkIdeaProduct rec { inherit name version build src; - patchSnappy = false; product = "RubyMine"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/ruby/"; @@ -154,7 +139,6 @@ let (mkIdeaProduct { inherit name version build src; product = "PhpStorm"; - patchSnappy = false; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/phpstorm/"; inherit description license; @@ -171,7 +155,6 @@ let buildPycharm = { name, version, build, src, license, description }: (mkIdeaProduct rec { inherit name version build src; - patchSnappy = false; product = "PyCharm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/pycharm/"; @@ -202,50 +185,50 @@ in android-studio = buildAndroidStudio rec { name = "android-studio-${version}"; - version = "1.0.2"; - build = "135.1653844"; + version = "1.1.0b2"; + build = "135.1711524"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${build}-linux.zip"; - sha256 = "0y20gp5444c2lwyzhlppjpkb657qbgpskj31lwyfhx6xyqy83159"; + sha256 = "0pkmyk7ipd4bfbryhanak5mq3x8ix1yv4czx8yi9vdpa34b6pnkw"; }; }; clion = buildClion rec { - name = "clion"; + name = "clion-${version}"; version = "eap"; - build = "140.1221.2"; + build = "140.1740.3"; 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 = "0gf809plnw89dgn47j6hsh5nv0bpdynjnl1rg8wv7jaz2zx9bqcg"; + url = "https://download.jetbrains.com/cpp/${name}-${build}.tar.gz"; + sha256 = "1hpsq37hq61id836wg5j6l3xapln6qdkqa10r3ig2p1rs2hq7i9y"; }; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "14.0.2"; - build = "IC-139.659"; + version = "14.0.3"; + build = "IC-139.1117"; 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 = "0g8f66bdxdmsbv2r1jc308by5ca92ifczprf0gwy5bs2xsvxxwlf"; + url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; + sha256 = "01wcpzdahkh3li2l3k2bgirnlp7hdxk9y1kyrxc3d9d1nazq8wqn"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "14.0.2"; - build = "IU-139.659"; + version = "14.0.3"; + build = "IU-139.1117"; 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 = "0swd3lyrlcdlsgp350sa741bkmndlck1ss429f9faf3hm4s2y0k5"; + url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; + sha256 = "1zkqigdh9l1f3mjjvxsp7b7vc93v5ylvxa1dfpclzmfbzna7h69s"; }; }; @@ -256,7 +239,7 @@ in 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"; + url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; sha256 = "0xsx44gaddarkw5k4yjidzwkayf2xvsxklfzdnzcck4rg4vyk4v4"; }; }; @@ -268,7 +251,7 @@ in description = "PyCharm 4.0 Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { - url = "http://download.jetbrains.com/python/${name}.tar.gz"; + url = "https://download.jetbrains.com/python/${name}.tar.gz"; sha256 = "0jh0sxi5dpgpw7ga018fby7zvb4i9k49vwl8422lfcrgckdz9nv2"; }; }; @@ -280,7 +263,7 @@ in description = "PyCharm 4.0 Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "http://download.jetbrains.com/python/${name}.tar.gz"; + url = "https://download.jetbrains.com/python/${name}.tar.gz"; sha256 = "04yjhg6vi2kz00sy8zg4wkz26ai90vbp0cnd850ynsab0jsy24w4"; }; }; @@ -292,7 +275,7 @@ in description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "http://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; + url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; sha256 = "01b8vx6swi71sd0rc7i1jnicilqp11ch3zrm8gwb6xh1pmmpdirf"; }; }; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index f66540abaa6..852af584e90 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -5,7 +5,7 @@ let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss + stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite xlibs.libXi xlibs.libXfixes @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/LightTable/ltbin ln -s ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh deleted file mode 100644 index c069edb3a6d..00000000000 --- a/pkgs/applications/editors/monodevelop/builder.sh +++ /dev/null @@ -1,28 +0,0 @@ -source $stdenv/setup -source $makeWrapper - -export MONO_GAC_PREFIX=$monodoc:$gtksharp - -postInstall() { - mv $out/bin $out/bin-orig - mkdir $out/bin - - moz=$(ls $mozilla/lib/*/libgtkembedmoz.so) - - for i in $out/bin-orig/*; do - echo "wrapping $(basename $i)" - # !!! TODO: figure out the MONO_GAC_PREFIX automatically - makeWrapper "$i" "$out/bin/$(basename $i)" \ - --suffix PATH ':' "$(dirname $(type -p mono))" \ - --suffix PATH ':' "$(dirname $(type -p mono))" \ - --suffix LD_LIBRARY_PATH ':' "$gtksharp/lib" \ - --suffix MONO_GAC_PREFIX ':' "$gtksharp" \ - --suffix MONO_GAC_PREFIX ':' "$gtkmozembedsharp" \ - --suffix MONO_GAC_PREFIX ':' "$gtksourceviewsharp" \ - --suffix MONO_GAC_PREFIX ':' "$monodoc" \ - --set MOZILLA_FIVE_HOME "$(dirname $moz)" - done -} - -genericBuild - diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index aad6325fa44..737576a1da0 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,26 +1,47 @@ -{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp -, gtkmozembedsharp, monodoc -, perl, perlXMLParser, pkgconfig -, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome -, mozilla, makeWrapper +{stdenv, fetchgit +, autoconf, automake, pkgconfig, shared_mime_info, intltool +, glib, mono, gtk-sharp, gnome-sharp }: -stdenv.mkDerivation { - name = "monodevelop-0.6-pre2315"; - builder = ./builder.sh; - - src = fetchurl { - url = http://tarballs.nixos.org/monodevelop-0.6-pre2315.tar.bz2; - md5 = "8c33df5629b0676b7ab552854c1de6fd"; +stdenv.mkDerivation rec { + version = "5.1.4.0"; + revision = "7d45bbe2ee22625f125d0c52548524f02d005cca"; + name = "monodevelop-${version}"; + src = fetchgit { + url = https://github.com/mono/monodevelop.git; + rev = revision; + sha256 = "0qy12zdvb0jiic3pq1w9mcsz2wwxrn0m92abd184q06yg5m48g1b"; }; - patches = [./prefix.patch]; - buildInputs = [ - file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig - glib gtk GConf gnome_vfs libbonobo libglade libgnome - gtkmozembedsharp monodoc + autoconf automake pkgconfig shared_mime_info intltool + mono gtk-sharp gnome-sharp ]; - - inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper; + + preConfigure = "patchShebangs ./configure"; + preBuild = '' + cat > ./main/buildinfo <<EOF + Release ID: ${version} + Git revision: ${revision} + Build date: 1970-01-01 00:00:01 + EOF + ''; + + postInstall = '' + for prog in monodevelop mdtool; do + patch -p 0 $out/bin/$prog <<EOF + 2a3,5 + > export MONO_GAC_PREFIX=${gtk-sharp}:\$MONO_GAC_PREFIX + > export PATH=${mono}/bin:\$PATH + > export LD_LIBRARY_PATH=${glib}/lib:${gnome-sharp}/lib:${gtk-sharp}/lib:${gtk-sharp.gtk}/lib:\$LD_LIBRARY_PATH + > + EOF + done + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/editors/monodevelop/prefix.patch b/pkgs/applications/editors/monodevelop/prefix.patch deleted file mode 100644 index 5ab0b4042dd..00000000000 --- a/pkgs/applications/editors/monodevelop/prefix.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -rc MonoDevelop-orig/Makefile.in MonoDevelop/Makefile.in -*** MonoDevelop-orig/Makefile.in 2005-03-09 17:43:58.000000000 +0100 ---- MonoDevelop/Makefile.in 2005-03-09 18:10:20.000000000 +0100 -*************** -*** 298,304 **** - # (mkdir ../../build/bin/ hack) - SUBDIRS = Core build po Extras - bin_SCRIPTS = monodevelop -! gnome_data = @gnome_prefix@/share - desktopdir = $(gnome_data)/applications - desktop_DATA = monodevelop.desktop - pixmapdir = $(gnome_data)/pixmaps ---- 298,304 ---- - # (mkdir ../../build/bin/ hack) - SUBDIRS = Core build po Extras - bin_SCRIPTS = monodevelop -! gnome_data = @prefix@/share - desktopdir = $(gnome_data)/applications - desktop_DATA = monodevelop.desktop - pixmapdir = $(gnome_data)/pixmaps -*************** -*** 809,818 **** - all: - - install-data-hook: -! $(UPDATE_MIME_DB) $(gnome_data)/mime - - uninstall-hook: -! $(UPDATE_MIME_DB) $(gnome_data)/mime - - run: runmd - ---- 809,818 ---- - all: - - install-data-hook: -! # $(UPDATE_MIME_DB) $(gnome_data)/mime - - uninstall-hook: -! # $(UPDATE_MIME_DB) $(gnome_data)/mime - - run: runmd - -Only in MonoDevelop: Makefile.in~ diff --git a/pkgs/applications/editors/monodoc/builder.sh b/pkgs/applications/editors/monodoc/builder.sh deleted file mode 100644 index bcea7a7a89a..00000000000 --- a/pkgs/applications/editors/monodoc/builder.sh +++ /dev/null @@ -1,20 +0,0 @@ -source $stdenv/setup -source $makeWrapper - -postInstall() { - mv $out/bin $out/bin-orig - mkdir $out/bin - - for i in $out/bin-orig/*; do - echo "wrapping $(basename $i)" - # !!! TODO: figure out the MONO_GAC_PREFIX automatically - makeWrapper "$i" "$out/bin/$(basename $i)" \ - --suffix PATH ':' "$(dirname $(type -p mono))" \ - --suffix MONO_GAC_PREFIX ':' "$gtksharp" \ - --suffix MONO_GAC_PREFIX ':' "$out" - done -} - -genericBuild - - diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix deleted file mode 100644 index 0e8421646a8..00000000000 --- a/pkgs/applications/editors/monodoc/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, mono, gtksharp, pkgconfig, makeWrapper}: - -stdenv.mkDerivation { - name = "monodoc-1.0.6"; - - builder = ./builder.sh; - src = fetchurl { - url = http://tarballs.nixos.org/monodoc-1.0.6.tar.gz; - md5 = "f2fc27e8e4717d90dc7efa2450625693"; - }; - - buildInputs = [mono gtksharp pkgconfig]; - - inherit gtksharp makeWrapper; -} diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index d51562b0213..ffa1c4eed34 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/sublime/sublime_text ''; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 3864f48738a..dbfb98b087f 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -32,7 +32,7 @@ in let for i in sublime_text plugin_host crash_reporter; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $i done ''; @@ -41,7 +41,7 @@ in let mkdir -p $out cp -prvd * $out/ # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so ''; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/editors/tiled-qt/default.nix b/pkgs/applications/editors/tiled/default.nix index 05020df01a0..92cd5071306 100644 --- a/pkgs/applications/editors/tiled-qt/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt }: stdenv.mkDerivation rec { - name = "tiled-qt-0.9.1"; + name = "tiled-0.11.0"; src = fetchurl { - url = "mirror://sourceforge/tiled/${name}.tar.gz"; - sha256 = "09xm6ry56zsqbfl9fvlvc5kq9ikzdskm283r059q6rlc7crzhs38"; + url = "https://github.com/bjorn/tiled/archive/v0.11.0.tar.gz"; + sha256 = "03a15vbzjfwc8dpifbjvd0gnr208mzmdkgs2nlc8zq6z0a4h4jqd"; }; buildInputs = [ qt ]; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index d5b7182c64a..94ae1d9c846 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -31,10 +31,6 @@ let inherit (args.composableDerivation) composableDerivation edf; ''; in composableDerivation { - # use gccApple to compile on darwin - mkDerivation = ( if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv ).mkDerivation; } (fix: { name = "vim_configurable-7.4.516"; diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 5d1a8a6f141..b9e3d668d62 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -6,10 +6,6 @@ in let inherit (args.composableDerivation) composableDerivation edf; in composableDerivation { - # use gccApple to compile on darwin - mkDerivation = ( if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv ).mkDerivation; } (fix: { name = "qvim-7.4." + tag; |