diff options
Diffstat (limited to 'pkgs/applications')
18 files changed, 205 insertions, 104 deletions
diff --git a/pkgs/applications/editors/eclipse-classic/default.nix b/pkgs/applications/editors/eclipse-classic/default.nix index f2783409f35e5..beeaffb854901 100644 --- a/pkgs/applications/editors/eclipse-classic/default.nix +++ b/pkgs/applications/editors/eclipse-classic/default.nix @@ -7,16 +7,16 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "eclipse-3.4.2"; + name = "eclipse-3.5.1"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://ftp.heanet.ie/pub/eclipse/eclipse/downloads/drops/R-3.4.2-200902111700/eclipse-SDK-3.4.2-linux-gtk-x86_64.tar.gz; - sha256 = "33e4e88347acd7f2f9243a8b887bd012cf5aec06c2d0f64da1349444bbd6876b"; + url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz; + sha256 = "132zd7q9q29h978wnlsfbrlszc85r1wj30yqs2aqbv3l5xgny1kk"; } else fetchurl { - url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/eclipse/downloads/drops/R-3.4.2-200902111700/eclipse-SDK-3.4.2-linux-gtk.tar.gz; - sha256 = "4518992b0d7bafeaa2338017ebc7048b09a227f056f576b2b077a435110ef9dd"; + url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz; + sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56"; } ; diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 157da1a422657..924234bb446ba 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, emacs}: stdenv.mkDerivation rec { - name = "haskell-mode-2.4"; - + name = "haskell-mode-2.6.1"; + src = fetchurl { - url = "http://www.iro.umontreal.ca/~monnier/elisp/${name}.tar.gz"; - sha256 = "1s2dd0clwm0qaq7z43vxx437l48c88yrd3z1a6qhbq8aak9y8jc5"; + url = "http://projects.haskell.org/haskellmode-emacs/${name}.tar.gz"; + sha256 = "cc33fd0d4692667a6eb56fea3dc549de3897d8dbb7b71818489760f45d564a76"; }; - + buildInputs = [emacs]; - + installPhase = '' ensureDir "$out/share/emacs/site-lisp" cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 8a90c71ee7b39..bc1699be5e5bd 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ncurses, help2man }: stdenv.mkDerivation rec { - name = "zile-2.3.12"; + name = "zile-2.3.13"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "0ff9k9vr7sl463yhz0pi875lyaia02yhmb79dlkj356rdq8213nf"; + sha256 = "13nvrlns4vjngwjwg110r3djmpwq34q22crr4x8wpzf9c0chp8i4"; }; buildInputs = [ ncurses help2man ]; diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 6f5b1d85994e4..61da28cfbabc9 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -45,12 +45,12 @@ library, use the 'NOGUI' parameter: }: stdenv.mkDerivation { - name = "truecrypt-6.2a"; + name = "truecrypt-6.3"; builder = ./builder.sh; src = fetchurl { - url = http://www.sfr-fresh.com/unix/misc/TrueCrypt-6.2a-Source.tar.gz; - sha256 = "1a75wkn33bdcjhb483f383hid5w9p0ap1xk0lj226350pm71sa56"; + url = http://www.sfr-fresh.com/unix/misc/TrueCrypt_6.3_Source.tar.gz; + sha256 = "0vgyng5zmdjdqlhai0szzapfm14njr3swamnw6yyb6pnjdncd0jq"; }; pkcs11h = fetchurl { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix new file mode 100644 index 0000000000000..b72e70227607c --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -0,0 +1,72 @@ +{ stdenv +, fetchurl +, ffmpeg +, cairo +, pango +, glib +, libXrender +, gtk +, nspr +, nss +, fontconfig +, freetype +, alsaLib +, libX11 +, GConf +, libXext +, libXt +, atk +, makeWrapper +, unzip +, patchelf05 +}: + +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; + +stdenv.mkDerivation rec { + name = "chrome-20565"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/30565/chrome-linux.zip; + sha256 = "0ngxbb27g6yqwllkbwyb41vldz00nr5r0rfb3b0arznql2dkynhy"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/30565/chrome-linux.zip; + sha256 = "0q5432zn9jhy54s0w0xgdc2y0h7a51b8acc782s7j179hcgfa30a"; + } + else null; + + phases="unpackPhase installPhase"; + + buildInputs = [makeWrapper unzip]; + + libPath = + stdenv.lib.makeLibraryPath + [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt] ; + + installPhase = '' + ensureDir $out/bin + ensureDir $out/chrome + ensureDir $out/lib + + cp -R * $out/chrome + ln -s $out/chrome/chrome $out/bin/chrome + + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome + + ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d + ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d + ln -s ${nss}/lib/libssl3.so $out/lib/libssl3.so.1d + ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d + ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d + ln -s ${nspr}/lib/libplds4.so $out/lib/libplds4.so.0d + ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d + ''; + + meta = { + description = ""; + }; +} diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 4e6743c0286b4..038531419b139 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -4,13 +4,13 @@ , freetype, fontconfig , application ? "browser" }: -let version = "3.5.3"; in +let version = "3.5.4"; in stdenv.mkDerivation { name = "icecat-${version}"; src = fetchurl { url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2"; - sha256 = "0cjf75crk4g84swya57ixm7152v774hsxif3xrws4yz9dasqlz5j"; + sha256 = "0j506l2qg30xg11zlfk8b2jwrp8bghc286j21gx0ws2qy6snagnr"; }; buildInputs = [ @@ -47,8 +47,8 @@ stdenv.mkDerivation { export dontPatchELF=1; # Strip some more stuff - strip -S $out/lib/*/* || true - + strip -S "$out/lib/"*"/"* || true + # This fixes starting IceCat when there already is a running # instance. The `icecat' wrapper script actually expects to be # in the same directory as `run-mozilla.sh', apparently. @@ -81,7 +81,7 @@ stdenv.mkDerivation { # Put the GNU IceCat icon in the right place. ensureDir $out/lib/$libDir/chrome/icons/default ln -s ../../../icons/default.xpm $out/lib/$libDir/chrome/icons/default/ - ''; # */ + ''; meta = { description = "GNU IceCat, a free web browser based on Mozilla Firefox"; @@ -109,5 +109,3 @@ stdenv.mkDerivation { isFirefox3Like = true; }; } - - diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix index 7b0ad7522258e..a345cf44cc597 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix @@ -1,4 +1,22 @@ -{stdenv, fetchurl, zlib, alsaLib, curl}: +{ stdenv +, fetchurl +, zlib +, alsaLib +, curl +, nss +, nspr +, fontconfig +, freetype +, expat +, libX11 +, libXext +, libXrender +, libXt +, gtk +, glib +, pango +, atk +}: stdenv.mkDerivation { name = "flashplayer-10.0.32.18"; @@ -23,7 +41,7 @@ stdenv.mkDerivation { mozillaPlugin = "/lib/mozilla/plugins"; }; - rpath = "${zlib}/lib:${alsaLib}/lib:${curl}/lib"; + rpath = stdenv.lib.makeLibraryPath [zlib alsaLib curl nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ; meta = { description = "Adobe Flash Player browser plugin"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh index b58b289da7e7e..8a0cc3c94fee3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh @@ -6,7 +6,7 @@ dontPatchELF=1 installPhase() { ensureDir $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins - patchelf --set-rpath "$zlib/lib:$alsaLib/lib" $out/lib/mozilla/plugins/libflashplayer.so + patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so } genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix index f039d86e4e5c6..899d9fb48d2d9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix @@ -1,4 +1,21 @@ -{stdenv, fetchurl, zlib, alsaLib}: +{ stdenv +, fetchurl +, zlib +, alsaLib +, nss +, nspr +, fontconfig +, freetype +, expat +, libX11 +, libXext +, libXrender +, libXt +, gtk +, glib +, pango +, atk +}: assert stdenv.system == "i686-linux"; @@ -17,6 +34,8 @@ stdenv.mkDerivation { mozillaPlugin = "/lib/mozilla/plugins"; }; + rpath = stdenv.lib.makeLibraryPath [zlib alsaLib nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ; + meta = { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; diff --git a/pkgs/applications/science/logic/coq/configure.patch.gz b/pkgs/applications/science/logic/coq/configure.patch.gz new file mode 100644 index 0000000000000..85ecfda6dae16 --- /dev/null +++ b/pkgs/applications/science/logic/coq/configure.patch.gz Binary files differdiff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 475c68f7b9cf0..19827022072d6 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -1,23 +1,66 @@ -{stdenv, fetchurl, ocaml, ncurses}: +# TODO: +# - coqide compilation should be optional or (better) separate; +# - coqide libraries are not installed; -stdenv.mkDerivation (rec { +{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}: + +let + + pname = "coq"; + version = "8.2pl1"; + name = "${pname}-${version}"; + +in + +stdenv.mkDerivation { + inherit name; - name = "coq-8.1pl3"; src = fetchurl { - url = "http://coq.inria.fr/V8.1pl3/files/coq-8.1pl3.tar.gz"; - sha256 = "7f8f45594adff2625312c5ecb144cb00d39c99201dac309c9286b34d01a36bb6"; + url = "http://coq.inria.fr/V${version}/files/${name}.tar.gz"; + sha256 = "7c15acfd369111e51d937cce632d22fc77a6718a5ac9f2dd2dcbdfab4256ae0c"; }; - buildInputs = [ocaml ncurses]; + buildInputs = [ ocaml camlp5 ncurses lablgtk ]; prefixKey = "-prefix "; - patchPhase = '' + + configureFlags = + "-camldir ${ocaml}/bin " + + "-camlp5dir ${camlp5}/lib/ocaml/camlp5 " + + "-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 " + + "-opt -coqide opt"; + + buildFlags = "world"; # Debug with "world VERBOSE=1"; + + patches = [ ./configure.patch.gz ]; + + postPatch = '' + BASH=$(type -tp bash) UNAME=$(type -tp uname) MV=$(type -tp mv) - RM=$(type -tp cp) - substituteInPlace ./configure --replace "/bin/uname" "$UNAME" - substituteInPlace Makefile --replace "/bin/mv" "$MV" \ + RM=$(type -tp rm) + substituteInPlace configure --replace "/bin/bash" "$BASH" \ + --replace "/bin/uname" "$UNAME" + substituteInPlace Makefile --replace "/bin/bash" "$BASH" \ + --replace "/bin/mv" "$MV" \ --replace "/bin/rm" "$RM" + substituteInPlace Makefile.stage1 --replace "/bin/bash" "$BASH" + substituteInPlace install.sh --replace "/bin/bash" "$BASH" + substituteInPlace dev/v8-syntax/check-grammar --replace "/bin/bash" "$BASH" + substituteInPlace scripts/coqmktop.ml --replace \ + "\"-I\"; \"+lablgtk2\"" \ + "\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\"" ''; -}) + meta = { + description = "Coq proof assistant"; + longDescription = '' + Coq is a formal proof management system. It provides a formal language + to write mathematical definitions, executable algorithms and theorems + together with an environment for semi-interactive development of + machine-checked proofs. + ''; + homepage = "http://coq.inria.fr"; + license = "LGPL"; + }; +} diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 04cab117c81c9..403105aaaa7fa 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchurl, maxima, wxGTK }: +# TODO: Build the correct ${maxima}/bin/maxima store path into wxMaxima so that +# it can run that binary without relying on $PATH, /etc/wxMaxima.conf, or +# ~/.wxMaxima. + let name = "wxmaxima"; version = "0.8.3"; @@ -19,35 +23,3 @@ stdenv.mkDerivation { homepage = http://wxmaxima.sourceforge.net; }; } - -# # $Id: PKGBUILD,v 1.10 2008/05/13 19:03:39 ronald Exp $ -# # Maintainer: Ronald van Haren <ronald.archlinux.org> -# # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> -# # Contributor: Vinay S Shastry <vinayshastry@gmail.com> - -# pkgname=wxmaxima -# pkgver=0.8.3 -# pkgrel=1 -# pkgdesc="A -# arch=('i686' 'x86_64') -# url="http://wxmaxima.sourceforge.net/" -# license=('GPL2') -# depends=('maxima>=5.18.1' 'libxml2>=2.7.3' 'wxgtk>=2.8.10.1') -# source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz) -# md5sums=('341913b9d54f24b796a50a3167b4d9b2') - -# build() { -# cd "${srcdir}/wxMaxima-${pkgver}" -# ./configure --prefix=/usr || return 1 -# make || return 1 -# make DESTDIR="${pkgdir}" install || return 1 - -# # Fix category in .desktop file -# sed -i -e 's/Utility;X-Red-Hat-Base;X-Red-Hat-Base-Only;/Science;Math;/' wxmaxima.desktop - -# # Install desktop file and icon -# install -m755 -d "${pkgdir}/usr/share/applications" -# install -m755 -d "${pkgdir}/usr/share/pixmaps" -# install -m644 wxmaxima.desktop "${pkgdir}/usr/share/applications/" || return 1 -# install -m644 data/wxmaxima.png "${pkgdir}/usr/share/pixmaps/" || return 1 -# } diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 9e6c1043f0a78..a1e8cb903f606 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -11,7 +11,7 @@ rec { git = import ./git { inherit fetchurl stdenv curl openssl zlib expat perl gettext asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_42 libxslt + docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversion; svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support guiSupport = getConfig ["git" "guiSupport"] false; @@ -21,7 +21,7 @@ rec { gitGit = import ./git/git-git.nix { inherit fetchurl stdenv curl openssl zlib expat perl gettext asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_42 libxslt + docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversion autoconf; inherit (bleedingEdgeRepos) sourceByName; svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 99fcd45525425..06cc4b94d9464 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, cpio -, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42 +, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper , svnSupport, subversion, perlLibs , guiSupport @@ -9,11 +9,11 @@ assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBindings); stdenv.mkDerivation rec { - name = "git-1.6.5.1"; + name = "git-1.6.5.2"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "1zfrg8ifwfqgwp0x52rkpg4j9p0lvxlsb8k0fsszhl52amm2r3np"; + sha256 = "a7050b45a4c5a2b40db83dc67dc3ff4b422ef1864df72316b3221ead2eefb5c1"; }; patches = [ ./docbook2texi.patch ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ # documentation tools [ asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_42 libxslt ] + docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}"; diff --git a/pkgs/applications/version-management/git-and-tools/git/git-git.nix b/pkgs/applications/version-management/git-and-tools/git/git-git.nix index 03567b8a37d86..3a0e3aa9fa84b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix +++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, cpio -, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42 +, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper , svnSupport, subversion, perlLibs , guiSupport @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [curl openssl zlib expat gettext cpio makeWrapper autoconf] ++ # documentation tools [ asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_42 libxslt ] + docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; preConfigure = "autoconf"; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index e330e79c56267..9d0f76e0d843e 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -19,13 +19,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.6.5"; + version = "1.6.6"; name = "subversion-${version}"; src = fetchurl { url = "http://subversion.tigris.org/downloads/${name}.tar.bz2"; - sha256 = "1badvnx1305dm79g31l1536z78nsi7n9wi4v6s6lp64y8pd1ncv4"; + sha256 = "14iw9hla3jas4ikd3wkfi7i4p4hic76x2bynic2339ny8yic28zy"; }; buildInputs = [zlib apr aprutil sqlite] diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 58c59aae3cb45..0f31217d315bb 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,15 +1,13 @@ {stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig, libXtst, xextproto, readline}: stdenv.mkDerivation { - name = "ratpoison-1.4.3"; + name = "ratpoison-1.4.5"; src = fetchurl { - url = http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.3.tar.gz; - sha256 = "15y3hi4dc7f98mhhpms22ahmh8lbzhyqli878z3fgrix4z7vr4fz"; + url = http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.5.tar.gz; + sha256 = "7391079db20b8613eecfd81d64d243edc9d3c586750c8f2da2bb9db14d260f03"; }; - patches = [ ./fix-rpws.patch ]; - buildInputs = [libX11 inputproto libXt libXpm libXft fontconfig libXtst xextproto readline]; diff --git a/pkgs/applications/window-managers/ratpoison/fix-rpws.patch b/pkgs/applications/window-managers/ratpoison/fix-rpws.patch deleted file mode 100644 index e2c789ca01455..0000000000000 --- a/pkgs/applications/window-managers/ratpoison/fix-rpws.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** ratpoison-1.4.3/contrib/rpws.orig 1970-01-01 01:00:00.000000000 +0100 ---- ratpoison-1.4.3/contrib/rpws 1970-01-01 01:00:00.000000000 +0100 -*************** -*** 60,66 **** - rp_call( "only" ); - - my $i; -! for( my $i = 1; $i < $num; $i++ ) - { - ws_init_ws( $i ); - } ---- 60,66 ---- - rp_call( "only" ); - - my $i; -! for( my $i = 1; $i <= $num; $i++ ) - { - ws_init_ws( $i ); - } |