From 7b5db94b5f16e56212c905fc7f28897570f759ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Feb 2012 12:19:17 +0000 Subject: [PATCH] * Updated Adobe Reader to 9.4.7. svn path=/nixpkgs/trunk/; revision=31978 --- pkgs/applications/misc/adobe-reader/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index e56982a6680..25bce4203ee 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -3,13 +3,13 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "adobe-reader-9.4.2-1"; + name = "adobe-reader-9.4.7-1"; builder = ./builder.sh; src = fetchurl { - url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2; - sha256 = "0xm8ngr7lslhxli9ly1g2w7ichip88vpf7lfx1ma0liaw4m2gv0h"; + url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.7/enu/AdbeRdr9.4.7-1_i486linux_enu.tar.bz2; + sha256 = "0bzx1rcwc9bi5jkh8f8hjb354zxlvvx37lhm0l2r0mjxj8fimfb5"; }; # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b44d045938..99aab924b0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3084,7 +3084,6 @@ let omake = callPackage ../development/tools/ocaml/omake { }; - openocd = callPackage ../development/tools/misc/openocd { }; oprofile = import ../development/tools/profiling/oprofile { @@ -8693,7 +8692,6 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor texLivePGF texLiveBeamer texLiveModerncv ]; - }); /* Look in configurations/misc/raskin.nix for usage example (around revisions