public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
This commit is contained in:
Yury G. Kudryashov
2012-02-06 23:03:12 +00:00
parent b31c67e24d 4e3dcd9254
commit 215a07c1a9
208 changed files with 2222 additions and 2185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/adobe-reader/default.nix
+3 -3
View File
@@ -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.