From 72163a64c487888eea4c02fa570fb237b86b57d7 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 19 Nov 2017 09:01:10 +0000 Subject: [PATCH 1/6] pijul: 0.7.3 -> 0.8.0 --- pkgs/applications/version-management/pijul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 36c7c3c5885..1a8fe6f5fe5 100644 --- 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"; From 9ee089ae05d1ca9eed567670895aeed69fbbeaac Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 19 Nov 2017 09:03:43 +0000 Subject: [PATCH 2/6] lib: delete reference to lib/sandbox.nix after it was deleted in 0fe7bde3d88027977a07a24baee98d2ecc07222f --- lib/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index 3e30ec515fc..9dc4fea99fc 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -41,7 +41,6 @@ let generators = callLibs ./generators.nix; misc = callLibs ./deprecated.nix; # domain-specific - sandbox = callLibs ./sandbox.nix; fetchers = callLibs ./fetchers.nix; # Eval-time filesystem handling From daf8311ce1741dfc8b97d6d85b1d83e026549d6b Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 19 Nov 2017 10:13:06 +0000 Subject: [PATCH 3/6] Revert "lib: delete reference to lib/sandbox.nix" This reverts commit 9ee089ae05d1ca9eed567670895aeed69fbbeaac. 0fe7bde3d88027977a07a24baee98d2ecc07222f is not in master yet and it would break master if it were: https://github.com/NixOS/nixpkgs/pull/31803#pullrequestreview-77638434 --- lib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/default.nix b/lib/default.nix index 9dc4fea99fc..3e30ec515fc 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -41,6 +41,7 @@ let generators = callLibs ./generators.nix; misc = callLibs ./deprecated.nix; # domain-specific + sandbox = callLibs ./sandbox.nix; fetchers = callLibs ./fetchers.nix; # Eval-time filesystem handling From 38af8ec7208b071c2926e5b0d344c645637aca23 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 19 Nov 2017 12:01:15 +0100 Subject: [PATCH 4/6] stellarium: 0.15.0 -> 0.16.1 The 0.16-releases contain several useful new features: https://launchpad.net/stellarium/0.16/0.16.1 I also added myself as maintainer to have more people available if the package breaks a release. --- .../science/astronomy/stellarium/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 886a98f2e6b..32eaa37375f 100644 --- 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 ]; }; } From 5147d8bbee59f644613ee1728c5c31854a14e59b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 19 Nov 2017 12:57:37 +0100 Subject: [PATCH 5/6] android-studio-preview: 3.1.0.2 -> 3.1.0.3 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 57e3c58525e..b9e096c6927 100644 --- 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)"; From 1b594f05a2b0f5ce3f1ea947bcfcf6ad4d5d4dcc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 19 Nov 2017 20:28:49 +0800 Subject: [PATCH 6/6] mime-types: init at 9 --- pkgs/data/misc/mime-types/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/misc/mime-types/default.nix diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix new file mode 100644 index 00000000000..bce1c5d81d8 --- /dev/null +++ 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 index 13df874194e..64c99d79274 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13539,6 +13539,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 { };