Merge branch 'master' into staging

vcunat · vcunat · commit e634d533193d · 2017-11-19T17:56:30.000+01:00
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
@@ -27,9 +27,9 @@ in rec {
 
   preview = mkStudio {
     pname = "android-studio-preview";
-    version = "3.1.0.2"; # "Android Studio 3.1 Canary 3"
-    build = "171.4435470";
-    sha256Hash = "1yqzxmzqxvhq9q9k07yfchh2al0wdy0j5k5fmjv4zbw20panx10h";
+    version = "3.1.0.3"; # "Android Studio 3.1 Canary 4"
+    build = "171.4444016";
+    sha256Hash = "0qgd0hd3i3p1adv0xqa0409r5injw3ygs50lajzi99s33j6vdc6s";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,23 +1,23 @@
 { mkDerivation, lib, fetchurl
 , cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
 , qtscript, qtserialport, qttools
-, qtmultimedia
+, qtmultimedia, qtlocation
 }:
 
 mkDerivation rec {
   name = "stellarium-${version}";
-  version = "0.15.0";
+  version = "0.16.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "0il751lgnfkx35h1m8fzwwnrygpxjx2a80gng1i1rbybkykf7l3l";
+    sha256 = "087x6mbcn2yj8d3qi382vfkzgdwmanxzqi5l1x3iranxmx9c40dh";
   };
 
   nativeBuildInputs = [ cmake perl ];
 
   buildInputs = [
     freetype libpng mesa openssl libiconv qtscript qtserialport qttools
-    qtmultimedia
+    qtmultimedia qtlocation
   ];
 
   meta = with lib; {
@@ -26,6 +26,6 @@ mkDerivation rec {
     license = licenses.gpl2;
 
     platforms = platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
-    maintainers = [ maintainers.peti ];
+    maintainers = with maintainers; [ peti ma27 ];
   };
 }
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
@@ -4,11 +4,11 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "pijul-${version}";
-  version = "0.7.3";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "https://pijul.org/releases/${name}.tar.gz";
-    sha256 = "08cffv6nfp1iv9m2qhr9hggy9kg8xp07p8kqkjypfsdsb983vz5n";
+    sha256 = "00pi03yp2bgnjpsz2hgaapxfw2i4idbjqc88cagpvn4yr1612wqx";
   };
 
   sourceRoot = "${name}/pijul";
@@ -18,7 +18,7 @@ buildRustPackage rec {
 
   doCheck = false;
 
-  cargoSha256 = "0r69vghjd6b30v0qjsipyv56n92iwvyxmllrnwjzjf5pzhhjl7sy";
+  cargoSha256 = "1cnr08qbpia3336l37k1jli20d7kwnrw2gys8s9mg271cb4vdx03";
 
   meta = with stdenv.lib; {
     description = "A distributed version control system";
diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "mime-types-${version}";
+  version = "9";
+
+  src = fetchurl {
+    url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2";
+    sha256 = "0pib8v0f5xwwm3xj2ygdi2dlxxvbq6p95l3fah5f66qj9xrqlqxl";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm644 -t $out/etc mime.types
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A database of common mappings of file extensions to MIME types";
+    homepage = https://packages.gentoo.org/packages/app-misc/mime-types;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -13545,6 +13545,8 @@ with pkgs;
 
   shaderc = callPackage ../development/compilers/shaderc { };
 
+  mime_types = callPackage ../data/misc/mime-types { };
+
   shared_mime_info = callPackage ../data/misc/shared-mime-info { };
 
   shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };
