diff options
Diffstat (limited to 'pkgs/applications')
14 files changed, 75 insertions, 54 deletions
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 3a15d32aa7f5..38eb51b93dba 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -2,7 +2,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let version = "0.6.1.309"; in +let version = "0.6.2.291"; in stdenv.mkDerivation { name = "spotify-${version}"; @@ -10,13 +10,13 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_i386.deb"; - sha256 = "01bavmv78vd3lxsinbls72v2sj8czbcwzdg6sc2f9yd5g7snb3im"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_i386.deb"; + sha256 = "164ka9xry9nbnv77w71kzi7bjidlmccw8wnn4fyzavi8pbrpmj08"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_amd64.deb"; - sha256 = "13ki1pcpna7f5sxf1j2axww95c4kqhj0r1d11y98mfvzxxjqimjs"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_amd64.deb"; + sha256 = "08snnpqd5ldiqv98pwx3fjrhdlwp4arbgda9xnsy92wfk0s85lv8"; } else throw "Spotify not supported on this platform."; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index c0ebb95a67a2..b0452bba115d 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchurl, - GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib, - gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2, - lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg, - libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb, - openexr, pixman, pkgconfig, sqlite}: +{ stdenv, fetchurl +, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib +, gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2 +, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg +, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb +, openexr, pixman, pkgconfig, sqlite }: + +assert stdenv ? glibc; stdenv.mkDerivation rec { version = "0.9.1"; @@ -14,11 +16,12 @@ stdenv.mkDerivation rec { sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e"; }; - buildInputs = [ - GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk - ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif - libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394 - librsvg libtiff libxcb openexr pixman pkgconfig sqlite]; + buildInputs = + [ GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk + ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif + libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394 + librsvg libtiff libxcb openexr pixman pkgconfig sqlite + ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0" diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 0da9bf0b41c0..19a2346802c4 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,14 +4,14 @@ , gsl, python, pyxml, lxml, poppler }: stdenv.mkDerivation rec { - name = "inkscape-0.48.1"; + name = "inkscape-0.48.2"; src = fetchurl { url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; - sha256 = "11mvwil787pj3kx3qvjqvd6z5hlk40i6g95g4vs52hrp2ifs9ga4"; + sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2"; }; - patches = [ ./configure-python-libs.patch ]; + patches = [ ./configure-python-libs.patch ]; propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from 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 6cdd175573d4..ad6867ab5be5 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix @@ -53,9 +53,9 @@ let url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz; sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc"; } else { - version = "10.3.183.7"; + version = "10.3.183.10"; url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; - sha256 = "166ipldmd03psy68xxirmdd4p591vjnffpv2l97yg1bbkn5h2pj6"; + sha256 = "0fj51dg0aa813b44yn8dvmmvw4qwi8vbi0x8n1bcqrcld3sbpmfz"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 02870c70f646..5364bd445e67 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, ncurses, which, perl, gpgme +{ stdenv, fetchurl, ncurses, which, perl , sslSupport ? true , imapSupport ? true , headerCache ? true , saslSupport ? true +, gpgmeSupport ? true , gdbm ? null , openssl ? null , cyrus_sasl ? null +, gpgme ? null }: assert headerCache -> gdbm != null; @@ -21,17 +23,20 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses which perl gpgme + ncurses which perl (if headerCache then gdbm else null) (if sslSupport then openssl else null) (if saslSupport then cyrus_sasl else null) + (if gpgmeSupport then gpgme else null) ]; configureFlags = [ "--with-mailpath=" "--enable-smtp" # This allows calls with "-d N", that output debug info into ~/.muttdebug* - "--enable-debug" "--enable-pop" "--enable-imap" "--enable-gpgme" + "--enable-debug" + + "--enable-pop" "--enable-imap" # The next allows building mutt without having anything setgid # set by the installer, and removing the need for the group 'mail' @@ -41,6 +46,7 @@ stdenv.mkDerivation rec { (if sslSupport then "--with-ssl" else "--without-ssl") (if imapSupport then "--enable-imap" else "--disable-imap") (if saslSupport then "--with-sasl" else "--without-sasl") + (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme") ]; meta = { diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix new file mode 100644 index 000000000000..7ef6a86c5eb7 --- /dev/null +++ b/pkgs/applications/networking/netperf/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "netperf-2.5.0"; + + src = fetchurl { + url = "ftp://ftp.netperf.org/netperf/${name}.tar.bz2"; + sha256 = "1l06bb99b4wfnmq247b8rvp4kn3w6bh1m46ri4d74z22li7br545"; + }; +} + diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 541c0e105931..98abc0a3db7a 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }: stdenv.mkDerivation (rec { - name = "mldonkey-3.0.7"; + name = "mldonkey-3.1.0"; src = fetchurl { url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; - sha256 = "1m5cfx79jiym93bx789lqc1bmwrkz1b1jilhga7d994jsjcw6c2n"; + sha256 = "02038nhh6lbb714ariy2xw1vgfycr1w750zplbgwk5pa3cm163zx"; }; meta = { diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index ae3ce06ca50f..a6c3c43417e0 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = { description = "ftp/sftp client with readline, autocompletion and bookmarks"; homepage = http://yafc.sourceforge.net; + license = "GPLv2+"; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 6bf401b895ac..29aa9843fbea 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, zlib, openssl, tcl}: +{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite}: let - version = "1.19"; - filedate = "20110901182519"; + version = "1.20"; + filedate = "20111021125253"; in stdenv.mkDerivation { @@ -10,10 +10,10 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz"; - sha256 = "14snmwjfl9xz52d8lfzsp4zciwfbi9fwk623bm5dxhn2fczzc960"; + sha256 = "0m75kw77iray3kbjm1xfn8hr116fn11yv1wr7adcwy314cgj0vv3"; }; - buildInputs = [ zlib openssl ]; + buildInputs = [ zlib openssl readline sqlite ]; buildNativeInputs = [ tcl ]; doCheck = true; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 7513a7adbc78..6319c3592c66 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -3,7 +3,7 @@ */ args: with args; with pkgs; let - inherit (pkgs) stdenv fetchurl subversion; + inherit (pkgs) stdenv fetchgit fetchurl subversion; in rec { @@ -48,8 +48,7 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack monadControl hS3 mtl network hslogger hxt json; - QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; + HTTP testpack monadControl hS3 mtl network hslogger hxt json QuickCheck2; }; qgit = import ./qgit { @@ -92,8 +91,7 @@ rec { }; gitFastExport = import ./fast-export { - inherit fetchurl sourceFromHead stdenv mercurial coreutils git makeWrapper - subversion; + inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion; }; git2cl = import ./git2cl { diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index ef633d87ca63..45860362433f 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -1,13 +1,14 @@ -args: with args; +{stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}: + stdenv.mkDerivation { name = "fast-export"; - # REGION AUTO UPDATE: { name="git_fast_export"; type = "git"; url="git://repo.or.cz/hg2git.git"; } - src = sourceFromHead "git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"; sha256 = "c65b8607836794b250f5faeef5ec1bcbf40f0bfaeb39ccb600966deb6a40d755"; }); - # END + src = fetchgit { + url = "git://repo.or.cz/fast-export.git"; + rev = "refs/heads/master"; + }; - buildInputs =([mercurial.python mercurial makeWrapper subversion]); + buildInputs = [mercurial.python mercurial makeWrapper subversion]; buildPhase="true"; # skip svn for now @@ -24,7 +25,7 @@ stdenv.mkDerivation { mv *.py $l for p in $out/bin/*.sh; do wrapProgram $p \ - --set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)" \ + --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}" \ --prefix PATH : "$(dirname $(type -p python))":$l done ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 848214b0fb9b..5fdf9f43bb16 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20110915"; + version = "3.20111011"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47"; + sha256 = "6bfd8ff6784d309bc20aaae38b0edd8f71ed44255b584093a881153d8a70c01c"; }; buildInputs = [ 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 1491b6f74178..eb5daae67e26 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -8,15 +8,15 @@ }: let + version = "1.7.7"; svn = subversionClient.override { perlBindings = true; }; in - -stdenv.mkDerivation rec { - name = "git-1.7.6"; +stdenv.mkDerivation { + name = "git-${version}"; src = fetchurl { - url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082"; + url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; + sha256 = "1xkpyd6mff4m8kmk4vkwi7snr2ff2nmrmsa5hf9bk2a93v07p5ss"; }; patches = [ ./docbook2texi.patch ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index eca4dfea17ee..e263d7556c0b 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, python, makeWrapper, docutils -, guiSupport ? false, tk ? null, ssl }: +, guiSupport ? false, tk ? null, ssl, curses }: stdenv.mkDerivation rec { - name = "mercurial-1.9"; + name = "mercurial-1.9.2"; src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1q1307rv5cyv7qalwkampy1h2f92j4d46v4x9647ljljs8f4n7ki"; + sha256 = "481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa"; }; inherit python; # pass it so that the same version can be used in hg2git + pythonPackages = [ ssl curses ]; buildInputs = [ python makeWrapper docutils ]; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl}")" \ + --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \ $WRAP_TK done |