Merge #8363: pure-darwin stdenv

pkgs/build-support/fetchurl/mirrors.nix

@@ -289,6 +289,21 @@ rec {
     ftp://ftp.xemacs.org/sites/metalab.unc.edu/
   ];
 
+  # Bioconductor mirrors (from http://bioconductor.org/about/mirrors)
+  # The commented-out ones don't seem to allow direct package downloads;
+  # they serve error messages that result in hash mismatches instead.
+  bioc = [
+    # http://bioc.ism.ac.jp/3.2/bioc/
+    # http://bioc.openanalytics.eu/3.2/bioc/
+    # http://bioconductor.fmrp.usp.br/3.2/bioc/
+    # http://mirror.aarnet.edu.au/pub/bioconductor/3.2/bioc/
+    # http://watson.nci.nih.gov/bioc_mirror/3.2/bioc/
+    http://bioconductor.jp/packages/3.2/bioc/
+    http://bioconductor.statistik.tu-dortmund.de/packages/3.2/bioc/
+    http://mirrors.ebi.ac.uk/bioconductor/packages/3.2/bioc/
+    http://mirrors.ustc.edu.cn/bioc/3.2/bioc/
+  ];
+
   # CRAN mirrors (from http://cran.r-project.org/mirrors.html)
   cran = [
     http://cran.r-project.org/

pkgs/build-support/make-desktopitem/default.nix

@@ -9,7 +9,6 @@
 , genericName
 , mimeType ? ""
 , categories ? "Application;Other;"
-, encoding ? "UTF-8"
 }:
 
 stdenv.mkDerivation {
@@ -27,7 +26,6 @@ stdenv.mkDerivation {
     GenericName=${genericName}
     MimeType=${mimeType}
     Categories=${categories}
-    Encoding=${encoding}
     EOF
   '';
 }