diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-02 12:10:33 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-02 12:10:33 +0200 |
commit | b910b697f69cbe44ccc5e4ea56c30a97b47afc52 (patch) | |
tree | eef88ee5efa19af8c43a69a0393c20ae2cb2ee5f /pkgs/desktops | |
parent | 542a86037d57e4657919fb5130c7bf819d91d2c3 (diff) | |
parent | e5bd74879517e6283113d82bec6309b09152f5cd (diff) | |
download | nixpkgs-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar nixpkgs-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.gz nixpkgs-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.bz2 nixpkgs-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.lz nixpkgs-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.xz nixpkgs-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.zst nixpkgs-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.zip |
Merge master into staging
Diffstat (limited to 'pkgs/desktops')
6 files changed, 59 insertions, 12 deletions
diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix new file mode 100644 index 00000000000..e275429b395 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-gettext-tools"; + version = "1.0.8"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "03cwa82dd14a31v44jd3z0kpiri6g21ar4f48s8ph78nvjy55880"; + }; + + nativeBuildInputs = [ + python3Packages.wrapPython + ]; + + buildInputs = [ + gettext + perlPackages.perl + perlPackages.XMLLibXML + perlPackages.ConfigTiny + python3Packages.python + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + sed -e 's/sudo cp/cp/' -i src/generate_mo.py + ''; + + postFixup = '' + wrapPythonPrograms + wrapPythonProgramsIn "$out/lib/${pname}" + wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB + ''; + + meta = with stdenv.lib; { + description = "Deepin Internationalization utilities"; + homepage = https://github.com/linuxdeepin/deepin-gettext-tools; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 42a4b1989ca..e9406fc1a69 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -4,6 +4,7 @@ let packages = self: with self; { dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; + deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; deepin-icon-theme = callPackage ./deepin-icon-theme { }; deepin-terminal = callPackage ./deepin-terminal { diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 7e76b8991fd..6af2f7f4b03 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-font-viewer-${version}"; - version = "3.28.0"; + version = "3.30.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "16mp22f255b8zqnnlqh25n6v79b9bd0gmli9ywqyapa0cfai09x3"; + sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index f33970251d5..ad5b40d3c08 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -8,11 +8,11 @@ let pname = "tracker-miners"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "107638773mihxdi194wf3saacqrr4cp9xn3qjfmx60bwq5451ma0"; + sha256 = "10j6iifq0ccnqckdx7fqlrfifbvs08jbczgxajldz26057kwp8fz"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch index 74da929c564..47ad114eb0b 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -37,15 +37,15 @@ +@@ -25,15 +25,15 @@ # # This check acts as a guard to make sure we are being configured with the # right prefix, among other things. @@ -17,12 +17,12 @@ + tracker_uninstalled_domain_rule = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'domain-ontologies', 'default.rule') + tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'ontologies', 'nepomuk') + tracker_uninstalled_stop_words_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'stop-words', 'default.rule') - endif - - avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false) + else + tracker_subproject = subproject('tracker', + default_options: [ --- a/src/libtracker-miners-common/tracker-domain-ontology.c +++ b/src/libtracker-miners-common/tracker-domain-ontology.c -@@ -313,7 +313,7 @@ +@@ -323,7 +323,7 @@ goto end; } } else { @@ -31,7 +31,7 @@ DEFAULT_RULE, NULL); if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { -@@ -378,7 +378,7 @@ +@@ -388,7 +388,7 @@ if (!priv->ontology_location) { gchar *ontology_path; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 37f149c7ad9..9077d663523 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -6,14 +6,14 @@ let pname = "geary"; - version = "0.12.3"; + version = "0.12.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "18zzjzs075zja00xpnyvjrrdzm54icdhfw4ywhpr6rqfcpnzifw7"; + sha256 = "01ykhkjfkprvh9kp4rzrl6xs2pqibiw44ckvqsn5cs3xy2rlq8mm"; }; nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; |