diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index 610e367b09f..3c99c40ee80 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator }: +{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; homepage = https://github.com/linuxdeepin/dbus-factory; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index d8452e5f7a3..c1321acb853 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -1,11 +1,12 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, -go-gir-generator, glib, gtk3, poppler, librsvg, pulseaudio, alsaLib, -libcanberra, gnome3, deepin-gettext-tools, go }: + deepin-gettext-tools, go-dbus-factory, go-gir-generator, go-lib, + alsaLib, glib, gtk3, libcanberra, libgudev, librsvg, poppler, + pulseaudio, go, deepin }: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-api"; - version = "3.1.30"; + version = "3.5.0"; goPackagePath = "pkg.deepin.io/dde/api"; @@ -13,29 +14,32 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0piw6ka2xcbd5vi7m33d1afdjbb7nycxvmai530ka6r2xjabrkir"; + sha256 = "1g3s0i5wa6qyv00yksz4r4cy2vhiknq8v0yx7aribvwm3gxf7jw3"; }; goDeps = ./deps.nix; nativeBuildInputs = [ pkgconfig - go-gir-generator deepin-gettext-tools + go-dbus-factory + go-gir-generator + go-lib ]; buildInputs = [ + alsaLib glib gtk3 - poppler - librsvg - pulseaudio - alsaLib libcanberra - gnome3.libgudev + libgudev + librsvg + poppler + pulseaudio ]; postPatch = '' + patchShebangs . sed -i -e "s|/var|$bin/var|" Makefile ''; @@ -50,6 +54,8 @@ buildGoPackage rec { remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/* ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Go-lang bindings for dde-daemon"; homepage = https://github.com/linuxdeepin/dde-api; diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix index 9df368325e3..bd7a13043da 100644 --- a/pkgs/desktops/deepin/dde-api/deps.nix +++ b/pkgs/desktops/deepin/dde-api/deps.nix @@ -32,35 +32,26 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "32df9565b4e0c1460f1915d53f6ff198d9a41af2"; - sha256 = "1nkmaav375fv4610g8i9bam33pv4aa4fy2n4nypprhc7vq0svwkm"; + rev = "9458da53d1e65e098d48467a4317c403327e4424"; + sha256 = "1b0ma9if8s892qfx5b1vjinxn00ah9vsyxijs8knkilrhf5vqcx4"; }; } { - goPackagePath = "github.com/kr/pretty"; + goPackagePath = "github.com/fogleman/gg"; fetch = { type = "git"; - url = "https://github.com/kr/pretty"; - rev = "73f6ac0b30a98e433b289500d779f50c1a6f0712"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + url = "https://github.com/fogleman/gg"; + rev = "0e0ff3ade7039063fe954cc1b45fad6cd4ac80db"; + sha256 = "06gvsngfwizdxin90nldix5503fqgnwqmqvxzrz0xg5hfazwfra5"; }; } { - goPackagePath = "github.com/kr/text"; + goPackagePath = "github.com/golang/freetype"; fetch = { type = "git"; - url = "https://github.com/kr/text"; - rev = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-dbus-factory"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-dbus-factory"; - rev = "2a30fc6fb47b70b8879855df8e29c8f581c419aa"; - sha256 = "0b0j47n3bb5fd04p01jla6k9vz2ck8l8512ga0xsn78177yb2z0w"; + url = "https://github.com/golang/freetype"; + rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4"; + sha256 = "194w3djc6fv1rgcjqds085b9fq074panc5vw582bcb8dbfzsrqxc"; }; } { @@ -68,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; - sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; + rev = "03541136501cab4910ad8852fe749ef8e18907ca"; + sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; }; } { @@ -86,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "991ec62608f3c0da01d400756917825d1e2fd528"; - sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; + rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; + sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; }; } { @@ -95,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "146acd28ed5894421fb5aac80ca93bc1b1f46f87"; - sha256 = "0d177474z85nvxz8ch6y9wjqz288844wwx8q9za3x2njnk4jbgxj"; + rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; + sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; }; } { @@ -108,22 +99,4 @@ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd78401277ebd861206a03c884797c6ec5541"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "pkg.deepin.io/lib"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-lib.git"; - rev = "f09dcc32fc5a36b53ff7760e5a06e7f8f97b81f9"; - sha256 = "1z4iw7h6lknm9jrna2c73icg1a1mxvzrqdhgjvaiww89mql1jzb4"; - }; - } ] diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index ad6b0f1912a..6d0abab2100 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, - deepin-gettext-tools, dtkcore, dtkwidget + deepin-gettext-tools, dtkcore, dtkwidget, deepin }: stdenv.mkDerivation rec { @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { -e "s,/usr,$out," ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Calendar for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/dde-calendar; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index fe2c5f8f55a..3678694be9e 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -2,12 +2,12 @@ dbus-factory, go-dbus-factory, go-gir-generator, go-lib, deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl, librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3, - python3Packages, hicolor-icon-theme, go }: + python3Packages, hicolor-icon-theme, go, deepin }: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-daemon"; - version = "3.2.24.7"; + version = "3.6.0"; goPackagePath = "pkg.deepin.io/dde/daemon"; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "17dvhqrw0dqy3d0wd9ailb18y2rg7575g3ffy0d5rg9m3y65y1y6"; + sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj"; }; patches = [ @@ -80,6 +80,8 @@ buildGoPackage rec { remove-references-to -t ${go} $out/lib/deepin-daemon/* ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Daemon for handling Deepin Desktop Environment session settings"; homepage = https://github.com/linuxdeepin/dde-daemon; diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix index 5ffecc28882..3d241baa326 100644 --- a/pkgs/desktops/deepin/dde-daemon/deps.nix +++ b/pkgs/desktops/deepin/dde-daemon/deps.nix @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; - sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; + rev = "03541136501cab4910ad8852fe749ef8e18907ca"; + sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "991ec62608f3c0da01d400756917825d1e2fd528"; - sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; + rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; + sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "04a2e542c03f1d053ab3e4d6e5abcd4b66e2be8e"; - sha256 = "040i9f6ymj4z25957h20id9kfmlrcp35y4sfd99hngw9li50ihql"; + rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; + sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81"; - sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da"; + rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; + sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; }; } { @@ -99,4 +99,13 @@ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } + { + goPackagePath = "pkg.deepin.io/lib"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-lib.git"; + rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7"; + sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; + }; + } ] diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix deleted file mode 100644 index 71f9e9b0298..00000000000 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, -dtkcore, dtkwidget, dde-qt-dbus-factory }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "dde-polkit-agent"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1n3hys5hhhd99ycpx4im6ihy53vl9c28z7ls7smn117h3ca4c8wc"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - ]; - - buildInputs = [ - dde-qt-dbus-factory - dtkcore - dtkwidget - polkit-qt - ]; - - postPatch = '' - patchShebangs . - - sed -i dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop \ - -e "s,/usr,$out," - - sed -i pluginmanager.cpp \ - -e "s,/usr/lib/polkit-1-dde/plugins,/run/current-system/sw/lib/polkit-1-dde/plugins," - ''; - - meta = with stdenv.lib; { - description = "PolicyKit agent for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-polkit-agent; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index 007d58b3c30..f28d8f77b3c 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, python }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, python, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-qt-dbus-factory"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0j0f57byzlz2ixgj6qr1pda83bpwn2q8kxv4i2jv99n6g0qw4nmw"; + sha256 = "0cz55hsbhy1ab1mndv0sp6xnqrhz2y66w7pcxy8v9k87ii32czf8"; }; nativeBuildInputs = [ @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Qt DBus interface library for Deepin software"; homepage = https://github.com/linuxdeepin/dde-qt-dbus-factory; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index cab3aff1404..303c4db57dd 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools, qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt, dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget, - hicolor-icon-theme }: + hicolor-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-session-ui"; - version = "4.5.1.10"; + version = "4.6.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0cr3g9jbgpp8k41i86lr4pg88gn690nzili7ah745vf1kdwvi1w0"; + sha256 = "190dgrwr5ji2bjndg2bmggpyccdz6pa3acx86yqmxfmirx669w92"; }; nativeBuildInputs = [ @@ -45,11 +45,13 @@ stdenv.mkDerivation rec { find -type f -exec sed -i -e "s,Exec=/usr,Exec=$out," {} + find -type f -exec sed -i -e "s,/usr/share/dde-session-ui,$out/share/dde-session-ui," {} + sed -i global_util/xkbparser.h -e "s,/usr/share/X11/xkb/rules/base.xml,${xkeyboard_config}/share/X11/xkb/rules/base.xml," - sed -i lightdm-deepin-greeter/Scripts/lightdm-deepin-greeter -e "s,/usr/bin/lightdm-deepin-greeter,$out/bin/lightdm-deepin-greeter," + sed -i lightdm-deepin-greeter/scripts/lightdm-deepin-greeter -e "s,/usr/bin/lightdm-deepin-greeter,$out/bin/lightdm-deepin-greeter," # fix default background url sed -i widgets/*.cpp boxframe/*.cpp -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin desktop-environment - Session UI module"; homepage = https://github.com/linuxdeepin/dde-session-ui; diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index 5b96e335c67..80a368c5be9 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, deepin-wallpapers }: +{ stdenv, fetchFromGitHub, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-base"; - version = "2018.7.23"; + version = "2018.10.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1n1bjkvhgq138jcg3zkwg55r41056x91mh191mirlpvpic574ydc"; + sha256 = "0l2zb7rpag2q36lqsgvirhjgmj7w243nsi1rywkypf2xm7g2v235"; }; buildInputs = [ deepin-wallpapers ]; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-desktop-base; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index b1a9c52014b..d2b70ec4a89 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchFromGitHub, python, deepin-gtk-theme, -deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3 }: + deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3, + deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-schemas"; - version = "3.2.18.7"; + version = "3.4.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1siv28wbfjydr3s9k9i5b9fin39yr8ys90f3wi7b8rfm3cr5yy6j"; + sha256 = "10x0rh9z925yzyp8h0vgmg4313smvran06lvr12c3931qkmkzwgq"; }; nativeBuildInputs = [ @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "GSettings deepin desktop-wide schemas"; homepage = https://github.com/linuxdeepin/deepin-desktop-schemas; diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index e275429b395..779fae6a113 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages }: +{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin Internationalization utilities"; homepage = https://github.com/linuxdeepin/deepin-gettext-tools; diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index c46dea2875a..8d11ca8bf42 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }: stdenv.mkDerivation rec { - name = "deepin-gtk-theme-${version}"; - version = "17.10.9"; + name = "${pname}-${version}"; + pname = "deepin-gtk-theme"; + version = "17.10.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "02yn76h007hlmrd7syd82f0mz1c79rlkz3gy1w17zxfy0gdvagz3"; + sha256 = "0vwly24cvjwhvda7g3l595vpf99d2z7b2zr0q5kna4df4iql7vn4"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin GTK Theme"; homepage = https://github.com/linuxdeepin/deepin-gtk-theme; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index c6d7f349301..ef457420601 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-icon-theme"; - version = "15.12.59"; + version = "15.12.64"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1qkxhqx6a7pahkjhf6m9lm16lw9v9grk0d4j449h9622zwfjkxlq"; + sha256 = "0z1yrp6yg2hb67azrbd9ac743jjh83vxdf2j0mmv2lfpd4fqw8qc"; }; nativeBuildInputs = [ gtk3 papirus-icon-theme ]; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Icons for the Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-icon-theme; diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 0ba2e306110..0b08f7cd39a 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw, - libexif + libexif, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-image-viewer"; - version = "1.2.23"; + version = "1.3.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1n1b3j65in6v7q5bxgkiam8qy56kjn9prld3sjrbc2mqzff8sm3q"; + sha256 = "0dxdvm6hzj6izfxka35za8y7vacd06nksfgzx6xsv7ywzagri4k5"; }; nativeBuildInputs = [ @@ -41,11 +41,14 @@ stdenv.mkDerivation rec { -e "s,/usr,$out," ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Image Viewer for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-image-viewer; license = licenses.gpl3Plus; platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; # See https://github.com/NixOS/nixpkgs/pull/46463#issuecomment-420274189 maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index eeed3579f45..9ac61355c75 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration }: + qt5integration, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin menu service"; homepage = https://github.com/linuxdeepin/deepin-menu; diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index b5eb7110876..78b6303188a 100644 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf, json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, - deepin-wallpapers, deepin-desktop-schemas }: + deepin-wallpapers, deepin-desktop-schemas, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "2D window manager for Deepin"; homepage = https://github.com/linuxdeepin/deepin-metacity; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 52a51c0db86..3d195f8f1c0 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, - libdvdnav, libdvdread, xorg }: + libdvdnav, libdvdread, xorg, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-movie-reborn"; - version = "3.2.10"; + version = "3.2.14"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0lqmbvl9yyxgkiipd9r8mgmxl2sm34l3gr3hkwlc7r2l6kc32933"; + sha256 = "1i9sdg2p6qp57rqzrnjbxnqj3mg1qggzyq3yykw271vs8h85a707"; }; nativeBuildInputs = [ @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin movie player"; homepage = https://github.com/linuxdeepin/deepin-movie-reborn; diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix index e397ab53576..be845d3c6ba 100644 --- a/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, - libstartup_notification, libinput, cogl, clutter, systemd -}: + libstartup_notification, libinput, cogl, clutter, systemd, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-mutter"; - version = "3.20.34"; + version = "3.20.35"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0s427fmj806ljpdg6jdvpfislk5m1xvxpnnyrq3l8b7pkhjvp8wd"; + sha256 = "0mwk06kgw8qp8rg1j6px1zlya4x5rr9llax0qks59j56b3m9yim7"; }; nativeBuildInputs = [ @@ -51,6 +50,8 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Base window manager for deepin, fork of gnome mutter"; homepage = https://github.com/linuxdeepin/deepin-mutter; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 1bb112b76f6..737c99261f9 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration -}: + qt5integration, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -27,6 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Pop-up shortcut viewer for Deepin applications"; homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer; diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index f12419a615b..bb004372497 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { - name = "deepin-sound-theme-${version}"; + name = "${pname}-${version}"; + pname = "deepin-sound-theme"; version = "15.10.3"; src = fetchFromGitHub { @@ -13,6 +14,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin sound theme"; homepage = https://github.com/linuxdeepin/deepin-sound-theme; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 26146b8ab47..de5ac800747 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,55 +1,61 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, - ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, - json-glib, gobjectIntrospection, deepin-menu, deepin-shortcut-viewer -}: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala, + gettext, gobjectIntrospection, at-spi2-core, dbus, epoxy, expect, + gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, + libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, + deepin-menu, deepin-shortcut-viewer, deepin }: stdenv.mkDerivation rec { - name = "deepin-terminal-${version}"; - version = "3.0.3"; + name = "${pname}-${version}"; + pname = "deepin-terminal"; + version = "3.0.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "04yvim97a4j8fq5lq2g6svs8qs79np9m4nl6x83iv02wkb9b7gqa"; + sha256 = "1jrzx0igq2csb25k4ak5hj81gpvb7zwbg4i64p4mln4vl7x27i5q"; }; - patches = [ - # Do not build vendored zssh and vte - (fetchurl { - name = "remove-vendor.patch"; - url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=de701614c19c273b98b60fd6790795ff7d8a157e; - sha256 = "0g7hhvr7ay9g0cgc6qqvzhbcwvbzvrrilbn8w46ypfzj7w5hlkqv"; - }) - ]; - - postPatch = '' - substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" - ''; - nativeBuildInputs = [ pkgconfig - vala cmake ninja + vala gettext gobjectIntrospection # For setup hook ]; buildInputs = [ - gtk3 - vte - libgee - wnck - librsvg - libsecret - json-glib + at-spi2-core + dbus deepin-menu deepin-shortcut-viewer + epoxy + expect + gtk3 + json-glib + libXdmcp + libgee + libpthreadstubs + librsvg + libsecret + libtasn1 + libxcb + libxkbcommon + p11-kit + pcre + vte + wnck ]; + postPatch = '' + patchShebangs . + ''; + enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "The default terminal emulation for Deepin"; longDescription = '' diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index ed2c795fd9c..8f04bd48218 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, dde-api }: +{ stdenv, fetchFromGitHub, dde-api, deepin }: stdenv.mkDerivation rec { - name = "deepin-wallpapers-${version}"; + name = "${pname}-${version}"; + pname = "deepin-wallpapers"; version = "1.7.5"; src = fetchFromGitHub { @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Wallpapers for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-wallpapers; diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix index f936934dcc0..db60e7b499b 100644 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, bamf, clutter-gtk, granite, libcanberra-gtk3, libwnck3, deepin-mutter, deepin-wallpapers, deepin-desktop-schemas, - hicolor-icon-theme }: + hicolor-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-wm"; - version = "1.9.32"; + version = "1.9.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "02vwbkfpxcwv01vqa70pg7dm0lhm1lwhdqhk057r147a9cjb3ssc"; + sha256 = "01l2np31g7fnh61fgq927h7a6xrmdvagqd41vr29a6cc3q9q9rzv"; }; nativeBuildInputs = [ @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin Window Manager"; homepage = https://github.com/linuxdeepin/deepin-wm; diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index a6163cd32e2..62a67c11492 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -2,12 +2,12 @@ let packages = self: with self; { + updateScript = callPackage ./update.nix { }; dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; dde-daemon = callPackage ./dde-daemon { }; - dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; @@ -28,7 +28,6 @@ let }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; deepin-wm = callPackage ./deepin-wm { }; - dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; dtkcore = callPackage ./dtkcore { }; dtkwm = callPackage ./dtkwm { }; dtkwidget = callPackage ./dtkwidget { }; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix deleted file mode 100644 index 4aeba1b4c1b..00000000000 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3, dde-polkit-agent }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "dpa-ext-gnomekeyring"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - ]; - - buildInputs = [ - dde-polkit-agent - gnome3.libgnome-keyring - ]; - - postPatch = '' - patchShebangs . - - sed -i dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp \ - -e "s,/usr,$out," - ''; - - meta = with stdenv.lib; { - description = "GNOME keyring extension for dde-polkit-agent"; - homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 3fc9a1b4a03..9904c58128f 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkcore"; - version = "2.0.9.4"; + version = "2.0.9.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "184yg1501hvv7n1c7r0fl2y4d4nhif368rrbrd1phwzfvh6x1ji4"; + sha256 = "06jj5gpy2qbmc21nf0fnbvgw7nbjjgvzx7m2vg9byw5il8l4g22h"; }; nativeBuildInputs = [ @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin tool kit core modules"; homepage = https://github.com/linuxdeepin/dtkcore; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 268f9518495..16125efff8e 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt, - dde-qt-dbus-factory, dtkcore -}: + dde-qt-dbus-factory, dtkcore, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwidget"; - version = "2.0.9.4"; + version = "2.0.9.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "06iyb3ryxrqkwxdazpv8cgabqa4djldgm3q5icsa2grqrgy8vw5m"; + sha256 = "1h4vm6a4lb6w6nkx2ns7a526mqyi9hqi7j5lqafd7ycwxlrc64nb"; }; nativeBuildInputs = [ @@ -41,6 +40,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin graphical user interface library"; homepage = https://github.com/linuxdeepin/dtkwidget; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index 46ed7bcc3be..7154ae3da6a 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore, + deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -29,6 +30,8 @@ stdenv.mkDerivation rec { LIB_INSTALL_DIR=$out/lib" ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin graphical user interface library"; homepage = https://github.com/linuxdeepin/dtkwm; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index b9b3aa59a0b..01d504eda89 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/go-dbus-factory; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index fa38e650c3a..28873d8459e 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go, go-lib }: +{ stdenv, fetchFromGitHub, go, go-lib, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { "GOCACHE=off" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Convert dbus interfaces to go-lang or qml wrapper code"; homepage = https://github.com/linuxdeepin/go-dbus-generator; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index d5ec29f1ef8..183ae58fecd 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, libgudev }: +{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, + libgudev, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-gir-generator"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0yi3lsgkxi8ghz2c7msf2df20jxkvzj8s47slvpzz4m57i82vgzl"; + sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb"; }; nativeBuildInputs = [ @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { "GOCACHE=off" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Generate static golang bindings for GObject"; homepage = https://github.com/linuxdeepin/go-gir-generator; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index ff9394425e0..684f1dd7f32 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -1,17 +1,16 @@ { stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio, - mobile-broadband-provider-info -}: + mobile-broadband-provider-info, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-lib"; - version = "1.2.16.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0dk6k53in3ffwwvkr0sazfk83rf4fyc6rvb6k8fi2n3qj4gp8xd2"; + sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; }; buildInputs = [ @@ -27,6 +26,8 @@ stdenv.mkDerivation rec { "GOSITE_DIR=$(out)/share/go" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; homepage = https://github.com/linuxdeepin/go-lib; diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 3754de3ea98..c4ce0ca563b 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, mtdev, cairo }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, + mtdev, cairo, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; - version = "1.1.11"; + version = "1.1.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "157p2cqs9fvd4n4fmxj6mh4cxlc35bkl4rnf832wk2gvjnxdfrfy"; + sha256 = "12lvh3agw3qdviqf32brmzba5kscnj5al5jhc08lq69a9kmip05x"; }; nativeBuildInputs = [ @@ -30,6 +31,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; homepage = https://github.com/linuxdeepin/qt5dxcb-plugin; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 28e06bae42d..80915637722 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt -, lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype -, qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget -}: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt , + lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype , + qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5integration"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0qf9ndsg8pz2n68y68a30d1hxr3ri8k4j00dxlbcf5cn5mbnny1b"; + sha256 = "1v9whlqn07c5c8xnaiicdshj9n88a667gfbn8y8bk5bfylilfzcy"; }; nativeBuildInputs = [ @@ -42,6 +41,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Qt platform theme integration plugins for DDE"; homepage = https://github.com/linuxdeepin/qt5integration; diff --git a/pkgs/desktops/deepin/update.nix b/pkgs/desktops/deepin/update.nix new file mode 100644 index 00000000000..761ead015c6 --- /dev/null +++ b/pkgs/desktops/deepin/update.nix @@ -0,0 +1,37 @@ +{ lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: +{ name, ignored-versions ? "^2014\\.|^v[0-9]+" }: + +let + nameAndVersion = builtins.parseDrvName name; + packageVersion = nameAndVersion.version; + packageName = nameAndVersion.name; + attrPath = "deepin.${packageName}"; +in + +writeScript "update-${packageName}" '' + set -o errexit + set -x + + # search for the latest version of the package on github + PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq ]} + tags=$(curl -s https://api.github.com/repos/linuxdeepin/${packageName}/tags) + tags=$(echo "$tags" | jq -r '.[] | .name') + echo "# ${name}" >> git-commits.txt + echo "# available tags:" >> git-commits.txt + echo "$tags" | ${gnused}/bin/sed -e 's/^/# /' >> git-commits.txt + if [ -n "${ignored-versions}" ]; then + tags=$(echo "$tags" | grep -vE "${ignored-versions}") + fi + latest_tag=$(echo "$tags" | sort --version-sort | tail -1) + + # generate commands to commit the changes + if [ "${packageVersion}" != "$latest_tag" ]; then + pfile=$(EDITOR=echo ${nix}/bin/nix edit -f. ${attrPath}) + echo " git add $pfile " >> git-commits.txt + echo " git commit -m \"${attrPath}: ${packageVersion} -> $latest_tag\"" >> git-commits.txt + fi + + # update the nix expression + update-source-version "${attrPath}" "$latest_tag" + echo "" >> git-commits.txt +''