public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49499 from romildo/upd.deepin 

deepin: add update script and update some packages
This commit is contained in:
Jörg Thalheim 2018-11-10 16:51:34 +00:00 committed by GitHub
parent b6b4f702ff fc0d64e72d
commit 99e1a0dd0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 253 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/deepin/dbus-factory/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator }: { stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
sed -i -e 's:/share/gocode:/share/go:' Makefile sed -i -e 's:/share/gocode:/share/go:' Makefile
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Generates static DBus bindings for Golang and QML at build-time"; description = "Generates static DBus bindings for Golang and QML at build-time";
homepage = https://github.com/linuxdeepin/dbus-factory; homepage = https://github.com/linuxdeepin/dbus-factory;

26
pkgs/desktops/deepin/dde-api/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
go-gir-generator, glib, gtk3, poppler, librsvg, pulseaudio, alsaLib, deepin-gettext-tools, go-dbus-factory, go-gir-generator, go-lib,
libcanberra, gnome3, deepin-gettext-tools, go }: alsaLib, glib, gtk3, libcanberra, libgudev, librsvg, poppler,
pulseaudio, go, deepin }:
buildGoPackage rec { buildGoPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dde-api"; pname = "dde-api";
version = "3.1.30"; version = "3.5.0";
goPackagePath = "pkg.deepin.io/dde/api"; goPackagePath = "pkg.deepin.io/dde/api";
@ -13,29 +14,32 @@ buildGoPackage rec {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0piw6ka2xcbd5vi7m33d1afdjbb7nycxvmai530ka6r2xjabrkir"; sha256 = "1g3s0i5wa6qyv00yksz4r4cy2vhiknq8v0yx7aribvwm3gxf7jw3";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
go-gir-generator
deepin-gettext-tools deepin-gettext-tools
go-dbus-factory
go-gir-generator
go-lib
]; ];
buildInputs = [ buildInputs = [
alsaLib
glib glib
gtk3 gtk3
poppler
librsvg
pulseaudio
alsaLib
libcanberra libcanberra
gnome3.libgudev libgudev
librsvg
poppler
pulseaudio
]; ];
postPatch = '' postPatch = ''
patchShebangs .
sed -i -e "s|/var|$bin/var|" Makefile 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/* remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/*
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Go-lang bindings for dde-daemon"; description = "Go-lang bindings for dde-daemon";
homepage = https://github.com/linuxdeepin/dde-api; homepage = https://github.com/linuxdeepin/dde-api;

59
pkgs/desktops/deepin/dde-api/deps.nix generated
View File

@ -32,35 +32,26 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/disintegration/imaging"; url = "https://github.com/disintegration/imaging";
rev = "32df9565b4e0c1460f1915d53f6ff198d9a41af2"; rev = "9458da53d1e65e098d48467a4317c403327e4424";
sha256 = "1nkmaav375fv4610g8i9bam33pv4aa4fy2n4nypprhc7vq0svwkm"; sha256 = "1b0ma9if8s892qfx5b1vjinxn00ah9vsyxijs8knkilrhf5vqcx4";
}; };
} }
{ {
goPackagePath = "github.com/kr/pretty"; goPackagePath = "github.com/fogleman/gg";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/kr/pretty"; url = "https://github.com/fogleman/gg";
rev = "73f6ac0b30a98e433b289500d779f50c1a6f0712"; rev = "0e0ff3ade7039063fe954cc1b45fad6cd4ac80db";
sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; sha256 = "06gvsngfwizdxin90nldix5503fqgnwqmqvxzrz0xg5hfazwfra5";
}; };
} }
{ {
goPackagePath = "github.com/kr/text"; goPackagePath = "github.com/golang/freetype";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/kr/text"; url = "https://github.com/golang/freetype";
rev = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f"; rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4";
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; sha256 = "194w3djc6fv1rgcjqds085b9fq074panc5vw582bcb8dbfzsrqxc";
};
}
{
goPackagePath = "github.com/linuxdeepin/go-dbus-factory";
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-dbus-factory";
rev = "2a30fc6fb47b70b8879855df8e29c8f581c419aa";
sha256 = "0b0j47n3bb5fd04p01jla6k9vz2ck8l8512ga0xsn78177yb2z0w";
}; };
} }
{ {
@ -68,8 +59,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/linuxdeepin/go-x11-client"; url = "https://github.com/linuxdeepin/go-x11-client";
rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; rev = "03541136501cab4910ad8852fe749ef8e18907ca";
sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp";
}; };
} }
{ {
@ -86,8 +77,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/image"; url = "https://go.googlesource.com/image";
rev = "991ec62608f3c0da01d400756917825d1e2fd528"; rev = "69cc3646b96e61de0b417f4815b86c36e65783ee";
sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9";
}; };
} }
{ {
@ -95,8 +86,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/net"; url = "https://go.googlesource.com/net";
rev = "146acd28ed5894421fb5aac80ca93bc1b1f46f87"; rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
sha256 = "0d177474z85nvxz8ch6y9wjqz288844wwx8q9za3x2njnk4jbgxj"; sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
}; };
} }
{ {
@ -108,22 +99,4 @@
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; 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";
};
}
] ]

4
pkgs/desktops/deepin/dde-calendar/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools,
deepin-gettext-tools, dtkcore, dtkwidget deepin-gettext-tools, dtkcore, dtkwidget, deepin
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
-e "s,/usr,$out," -e "s,/usr,$out,"
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Calendar for Deepin Desktop Environment"; description = "Calendar for Deepin Desktop Environment";
homepage = https://github.com/linuxdeepin/dde-calendar; homepage = https://github.com/linuxdeepin/dde-calendar;

8
pkgs/desktops/deepin/dde-daemon/default.nix
View File

@ -2,12 +2,12 @@
dbus-factory, go-dbus-factory, go-gir-generator, go-lib, dbus-factory, go-dbus-factory, go-gir-generator, go-lib,
deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl, deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl,
librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3, librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3,
python3Packages, hicolor-icon-theme, go }: python3Packages, hicolor-icon-theme, go, deepin }:
buildGoPackage rec { buildGoPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dde-daemon"; pname = "dde-daemon";
version = "3.2.24.7"; version = "3.6.0";
goPackagePath = "pkg.deepin.io/dde/daemon"; goPackagePath = "pkg.deepin.io/dde/daemon";
@ -15,7 +15,7 @@ buildGoPackage rec {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "17dvhqrw0dqy3d0wd9ailb18y2rg7575g3ffy0d5rg9m3y65y1y6"; sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj";
}; };
patches = [ patches = [
@ -80,6 +80,8 @@ buildGoPackage rec {
remove-references-to -t ${go} $out/lib/deepin-daemon/* remove-references-to -t ${go} $out/lib/deepin-daemon/*
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Daemon for handling Deepin Desktop Environment session settings"; description = "Daemon for handling Deepin Desktop Environment session settings";
homepage = https://github.com/linuxdeepin/dde-daemon; homepage = https://github.com/linuxdeepin/dde-daemon;

25
pkgs/desktops/deepin/dde-daemon/deps.nix generated
View File

@ -41,8 +41,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/linuxdeepin/go-x11-client"; url = "https://github.com/linuxdeepin/go-x11-client";
rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; rev = "03541136501cab4910ad8852fe749ef8e18907ca";
sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp";
}; };
} }
{ {
@ -68,8 +68,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/image"; url = "https://go.googlesource.com/image";
rev = "991ec62608f3c0da01d400756917825d1e2fd528"; rev = "69cc3646b96e61de0b417f4815b86c36e65783ee";
sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9";
}; };
} }
{ {
@ -77,8 +77,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/net"; url = "https://go.googlesource.com/net";
rev = "04a2e542c03f1d053ab3e4d6e5abcd4b66e2be8e"; rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
sha256 = "040i9f6ymj4z25957h20id9kfmlrcp35y4sfd99hngw9li50ihql"; sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
}; };
} }
{ {
@ -86,8 +86,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/text"; url = "https://go.googlesource.com/text";
rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81"; rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da"; sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
}; };
} }
{ {
@ -99,4 +99,13 @@
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
}; };
} }
{
goPackagePath = "pkg.deepin.io/lib";
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-lib.git";
rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7";
sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv";
};
}
] ]

46
pkgs/desktops/deepin/dde-polkit-agent/default.nix
View File

@ -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 ];
};
}

8
pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, python }: { stdenv, fetchFromGitHub, pkgconfig, qmake, python, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dde-qt-dbus-factory"; pname = "dde-qt-dbus-factory";
version = "1.0.4"; version = "1.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0j0f57byzlz2ixgj6qr1pda83bpwn2q8kxv4i2jv99n6g0qw4nmw"; sha256 = "0cz55hsbhy1ab1mndv0sp6xnqrhz2y66w7pcxy8v9k87ii32czf8";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt DBus interface library for Deepin software"; description = "Qt DBus interface library for Deepin software";
homepage = https://github.com/linuxdeepin/dde-qt-dbus-factory; homepage = https://github.com/linuxdeepin/dde-qt-dbus-factory;

10
pkgs/desktops/deepin/dde-session-ui/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools, { stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools,
qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt, qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt,
dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget, dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget,
hicolor-icon-theme }: hicolor-icon-theme, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dde-session-ui"; pname = "dde-session-ui";
version = "4.5.1.10"; version = "4.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0cr3g9jbgpp8k41i86lr4pg88gn690nzili7ah745vf1kdwvi1w0"; sha256 = "190dgrwr5ji2bjndg2bmggpyccdz6pa3acx86yqmxfmirx669w92";
}; };
nativeBuildInputs = [ 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,Exec=/usr,Exec=$out," {} +
find -type f -exec sed -i -e "s,/usr/share/dde-session-ui,$out/share/dde-session-ui," {} + 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 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 # fix default background url
sed -i widgets/*.cpp boxframe/*.cpp -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' 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; { meta = with stdenv.lib; {
description = "Deepin desktop-environment - Session UI module"; description = "Deepin desktop-environment - Session UI module";
homepage = https://github.com/linuxdeepin/dde-session-ui; homepage = https://github.com/linuxdeepin/dde-session-ui;

8
pkgs/desktops/deepin/deepin-desktop-base/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, deepin-wallpapers }: { stdenv, fetchFromGitHub, deepin-wallpapers, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-desktop-base"; pname = "deepin-desktop-base";
version = "2018.7.23"; version = "2018.10.29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1n1bjkvhgq138jcg3zkwg55r41056x91mh191mirlpvpic574ydc"; sha256 = "0l2zb7rpag2q36lqsgvirhjgmj7w243nsi1rywkypf2xm7g2v235";
}; };
buildInputs = [ deepin-wallpapers ]; buildInputs = [ deepin-wallpapers ];
@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Base assets and definitions for Deepin Desktop Environment"; description = "Base assets and definitions for Deepin Desktop Environment";
homepage = https://github.com/linuxdeepin/deepin-desktop-base; homepage = https://github.com/linuxdeepin/deepin-desktop-base;

9
pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
View File

@ -1,16 +1,17 @@
{ stdenv, fetchFromGitHub, python, deepin-gtk-theme, { 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 { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-desktop-schemas"; pname = "deepin-desktop-schemas";
version = "3.2.18.7"; version = "3.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1siv28wbfjydr3s9k9i5b9fin39yr8ys90f3wi7b8rfm3cr5yy6j"; sha256 = "10x0rh9z925yzyp8h0vgmg4313smvran06lvr12c3931qkmkzwgq";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -33,6 +34,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GSettings deepin desktop-wide schemas"; description = "GSettings deepin desktop-wide schemas";
homepage = https://github.com/linuxdeepin/deepin-desktop-schemas; homepage = https://github.com/linuxdeepin/deepin-desktop-schemas;

4
pkgs/desktops/deepin/deepin-gettext-tools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages }: { stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin Internationalization utilities"; description = "Deepin Internationalization utilities";
homepage = https://github.com/linuxdeepin/deepin-gettext-tools; homepage = https://github.com/linuxdeepin/deepin-gettext-tools;

11
pkgs/desktops/deepin/deepin-gtk-theme/default.nix
View File

@ -1,20 +1,23 @@
{ stdenv, fetchFromGitHub, gtk-engine-murrine }: { stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "deepin-gtk-theme-${version}"; name = "${pname}-${version}";
version = "17.10.9"; pname = "deepin-gtk-theme";
version = "17.10.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = "deepin-gtk-theme"; repo = "deepin-gtk-theme";
rev = version; rev = version;
sha256 = "02yn76h007hlmrd7syd82f0mz1c79rlkz3gy1w17zxfy0gdvagz3"; sha256 = "0vwly24cvjwhvda7g3l595vpf99d2z7b2zr0q5kna4df4iql7vn4";
}; };
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin GTK Theme"; description = "Deepin GTK Theme";
homepage = https://github.com/linuxdeepin/deepin-gtk-theme; homepage = https://github.com/linuxdeepin/deepin-gtk-theme;

8
pkgs/desktops/deepin/deepin-icon-theme/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }: { stdenv, fetchFromGitHub, gtk3, papirus-icon-theme, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-icon-theme"; pname = "deepin-icon-theme";
version = "15.12.59"; version = "15.12.64";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1qkxhqx6a7pahkjhf6m9lm16lw9v9grk0d4j449h9622zwfjkxlq"; sha256 = "0z1yrp6yg2hb67azrbd9ac743jjh83vxdf2j0mmv2lfpd4fqw8qc";
}; };
nativeBuildInputs = [ gtk3 papirus-icon-theme ]; nativeBuildInputs = [ gtk3 papirus-icon-theme ];
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Icons for the Deepin Desktop Environment"; description = "Icons for the Deepin Desktop Environment";
homepage = https://github.com/linuxdeepin/deepin-icon-theme; homepage = https://github.com/linuxdeepin/deepin-icon-theme;

9
pkgs/desktops/deepin/deepin-image-viewer/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg,
qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw, qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw,
libexif libexif, deepin
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-image-viewer"; pname = "deepin-image-viewer";
version = "1.2.23"; version = "1.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1n1b3j65in6v7q5bxgkiam8qy56kjn9prld3sjrbc2mqzff8sm3q"; sha256 = "0dxdvm6hzj6izfxka35za8y7vacd06nksfgzx6xsv7ywzagri4k5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -41,11 +41,14 @@ stdenv.mkDerivation rec {
-e "s,/usr,$out," -e "s,/usr,$out,"
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Image Viewer for Deepin Desktop Environment"; description = "Image Viewer for Deepin Desktop Environment";
homepage = https://github.com/linuxdeepin/deepin-image-viewer; homepage = https://github.com/linuxdeepin/deepin-image-viewer;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ]; # See https://github.com/NixOS/nixpkgs/pull/46463#issuecomment-420274189
maintainers = with maintainers; [ romildo ]; maintainers = with maintainers; [ romildo ];
}; };
} }

4
pkgs/desktops/deepin/deepin-menu/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, { stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
qt5integration }: qt5integration, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin menu service"; description = "Deepin menu service";
homepage = https://github.com/linuxdeepin/deepin-menu; homepage = https://github.com/linuxdeepin/deepin-menu;

4
pkgs/desktops/deepin/deepin-metacity/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf, { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf,
json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
deepin-wallpapers, deepin-desktop-schemas }: deepin-wallpapers, deepin-desktop-schemas, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -52,6 +52,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "2D window manager for Deepin"; description = "2D window manager for Deepin";
homepage = https://github.com/linuxdeepin/deepin-metacity; homepage = https://github.com/linuxdeepin/deepin-metacity;

8
pkgs/desktops/deepin/deepin-movie-reborn/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, { stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio,
libdvdnav, libdvdread, xorg }: libdvdnav, libdvdread, xorg, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-movie-reborn"; pname = "deepin-movie-reborn";
version = "3.2.10"; version = "3.2.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0lqmbvl9yyxgkiipd9r8mgmxl2sm34l3gr3hkwlc7r2l6kc32933"; sha256 = "1i9sdg2p6qp57rqzrnjbxnqj3mg1qggzyq3yykw271vs8h85a707";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' 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; { meta = with stdenv.lib; {
description = "Deepin movie player"; description = "Deepin movie player";
homepage = https://github.com/linuxdeepin/deepin-movie-reborn; homepage = https://github.com/linuxdeepin/deepin-movie-reborn;

9
pkgs/desktops/deepin/deepin-mutter/default.nix
View File

@ -1,18 +1,17 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg, { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg,
libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
libstartup_notification, libinput, cogl, clutter, systemd libstartup_notification, libinput, cogl, clutter, systemd, deepin }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-mutter"; pname = "deepin-mutter";
version = "3.20.34"; version = "3.20.35";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0s427fmj806ljpdg6jdvpfislk5m1xvxpnnyrq3l8b7pkhjvp8wd"; sha256 = "0mwk06kgw8qp8rg1j6px1zlya4x5rr9llax0qks59j56b3m9yim7";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -51,6 +50,8 @@ stdenv.mkDerivation rec {
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Base window manager for deepin, fork of gnome mutter"; description = "Base window manager for deepin, fork of gnome mutter";
homepage = https://github.com/linuxdeepin/deepin-mutter; homepage = https://github.com/linuxdeepin/deepin-mutter;

5
pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, { stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
qt5integration qt5integration, deepin }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -27,6 +26,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Pop-up shortcut viewer for Deepin applications"; description = "Pop-up shortcut viewer for Deepin applications";
homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer; homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer;

7
pkgs/desktops/deepin/deepin-sound-theme/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "deepin-sound-theme-${version}"; name = "${pname}-${version}";
pname = "deepin-sound-theme";
version = "15.10.3"; version = "15.10.3";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -13,6 +14,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin sound theme"; description = "Deepin sound theme";
homepage = https://github.com/linuxdeepin/deepin-sound-theme; homepage = https://github.com/linuxdeepin/deepin-sound-theme;

62
pkgs/desktops/deepin/deepin-terminal/default.nix
View File

@ -1,55 +1,61 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, { stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, gettext, gobjectIntrospection, at-spi2-core, dbus, epoxy, expect,
json-glib, gobjectIntrospection, deepin-menu, deepin-shortcut-viewer 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 { stdenv.mkDerivation rec {
name = "deepin-terminal-${version}"; name = "${pname}-${version}";
version = "3.0.3"; pname = "deepin-terminal";
version = "3.0.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = "deepin-terminal"; repo = "deepin-terminal";
rev = version; 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 = [ nativeBuildInputs = [
pkgconfig pkgconfig
vala
cmake cmake
ninja ninja
vala
gettext gettext
gobjectIntrospection # For setup hook gobjectIntrospection # For setup hook
]; ];
buildInputs = [ buildInputs = [
gtk3 at-spi2-core
vte dbus
libgee
wnck
librsvg
libsecret
json-glib
deepin-menu deepin-menu
deepin-shortcut-viewer 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; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The default terminal emulation for Deepin"; description = "The default terminal emulation for Deepin";
longDescription = '' longDescription = ''

7
pkgs/desktops/deepin/deepin-wallpapers/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, dde-api }: { stdenv, fetchFromGitHub, dde-api, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "deepin-wallpapers-${version}"; name = "${pname}-${version}";
pname = "deepin-wallpapers";
version = "1.7.5"; version = "1.7.5";
src = fetchFromGitHub { 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 $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; { meta = with stdenv.lib; {
description = "Wallpapers for Deepin Desktop Environment"; description = "Wallpapers for Deepin Desktop Environment";
homepage = https://github.com/linuxdeepin/deepin-wallpapers; homepage = https://github.com/linuxdeepin/deepin-wallpapers;

8
pkgs/desktops/deepin/deepin-wm/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3,
bamf, clutter-gtk, granite, libcanberra-gtk3, libwnck3, bamf, clutter-gtk, granite, libcanberra-gtk3, libwnck3,
deepin-mutter, deepin-wallpapers, deepin-desktop-schemas, deepin-mutter, deepin-wallpapers, deepin-desktop-schemas,
hicolor-icon-theme }: hicolor-icon-theme, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-wm"; pname = "deepin-wm";
version = "1.9.32"; version = "1.9.33";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "02vwbkfpxcwv01vqa70pg7dm0lhm1lwhdqhk057r147a9cjb3ssc"; sha256 = "01l2np31g7fnh61fgq927h7a6xrmdvagqd41vr29a6cc3q9q9rzv";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin Window Manager"; description = "Deepin Window Manager";
homepage = https://github.com/linuxdeepin/deepin-wm; homepage = https://github.com/linuxdeepin/deepin-wm;

3
pkgs/desktops/deepin/default.nix
View File

@ -2,12 +2,12 @@
let let
packages = self: with self; { packages = self: with self; {
updateScript = callPackage ./update.nix { };
dbus-factory = callPackage ./dbus-factory { }; dbus-factory = callPackage ./dbus-factory { };
dde-api = callPackage ./dde-api { }; dde-api = callPackage ./dde-api { };
dde-calendar = callPackage ./dde-calendar { }; dde-calendar = callPackage ./dde-calendar { };
dde-daemon = callPackage ./dde-daemon { }; dde-daemon = callPackage ./dde-daemon { };
dde-polkit-agent = callPackage ./dde-polkit-agent { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { }; dde-session-ui = callPackage ./dde-session-ui { };
deepin-desktop-base = callPackage ./deepin-desktop-base { }; deepin-desktop-base = callPackage ./deepin-desktop-base { };
@ -28,7 +28,6 @@ let
}; };
deepin-wallpapers = callPackage ./deepin-wallpapers { }; deepin-wallpapers = callPackage ./deepin-wallpapers { };
deepin-wm = callPackage ./deepin-wm { }; deepin-wm = callPackage ./deepin-wm { };
dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
dtkcore = callPackage ./dtkcore { }; dtkcore = callPackage ./dtkcore { };
dtkwm = callPackage ./dtkwm { }; dtkwm = callPackage ./dtkwm { };
dtkwidget = callPackage ./dtkwidget { }; dtkwidget = callPackage ./dtkwidget { };

40
pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
View File

@ -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 ];
};
}

8
pkgs/desktops/deepin/dtkcore/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages }: { stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dtkcore"; pname = "dtkcore";
version = "2.0.9.4"; version = "2.0.9.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "184yg1501hvv7n1c7r0fl2y4d4nhif368rrbrd1phwzfvh6x1ji4"; sha256 = "06jj5gpy2qbmc21nf0fnbvgw7nbjjgvzx7m2vg9byw5il8l4g22h";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin tool kit core modules"; description = "Deepin tool kit core modules";
homepage = https://github.com/linuxdeepin/dtkcore; homepage = https://github.com/linuxdeepin/dtkcore;

9
pkgs/desktops/deepin/dtkwidget/default.nix
View File

@ -1,18 +1,17 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia,
qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt, qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt,
dde-qt-dbus-factory, dtkcore dde-qt-dbus-factory, dtkcore, deepin }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dtkwidget"; pname = "dtkwidget";
version = "2.0.9.4"; version = "2.0.9.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "06iyb3ryxrqkwxdazpv8cgabqa4djldgm3q5icsa2grqrgy8vw5m"; sha256 = "1h4vm6a4lb6w6nkx2ns7a526mqyi9hqi7j5lqafd7ycwxlrc64nb";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -41,6 +40,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin graphical user interface library"; description = "Deepin graphical user interface library";
homepage = https://github.com/linuxdeepin/dtkwidget; homepage = https://github.com/linuxdeepin/dtkwidget;

5
pkgs/desktops/deepin/dtkwm/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore }: { stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore,
deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -29,6 +30,8 @@ stdenv.mkDerivation rec {
LIB_INSTALL_DIR=$out/lib" LIB_INSTALL_DIR=$out/lib"
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin graphical user interface library"; description = "Deepin graphical user interface library";
homepage = https://github.com/linuxdeepin/dtkwm; homepage = https://github.com/linuxdeepin/dtkwm;

4
pkgs/desktops/deepin/go-dbus-factory/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
sed -i -e 's:/share/gocode:/share/go:' Makefile sed -i -e 's:/share/gocode:/share/go:' Makefile
''; '';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GoLang DBus factory for the Deepin Desktop Environment"; description = "GoLang DBus factory for the Deepin Desktop Environment";
homepage = https://github.com/linuxdeepin/go-dbus-factory; homepage = https://github.com/linuxdeepin/go-dbus-factory;

4
pkgs/desktops/deepin/go-dbus-generator/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, go, go-lib }: { stdenv, fetchFromGitHub, go, go-lib, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
"GOCACHE=off" "GOCACHE=off"
]; ];
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Convert dbus interfaces to go-lang or qml wrapper code"; description = "Convert dbus interfaces to go-lang or qml wrapper code";
homepage = https://github.com/linuxdeepin/go-dbus-generator; homepage = https://github.com/linuxdeepin/go-dbus-generator;

9
pkgs/desktops/deepin/go-gir-generator/default.nix
View File

@ -1,15 +1,16 @@
{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, libgudev }: { stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection,
libgudev, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "go-gir-generator"; pname = "go-gir-generator";
version = "1.0.4"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0yi3lsgkxi8ghz2c7msf2df20jxkvzj8s47slvpzz4m57i82vgzl"; sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
"GOCACHE=off" "GOCACHE=off"
]; ];
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Generate static golang bindings for GObject"; description = "Generate static golang bindings for GObject";
homepage = https://github.com/linuxdeepin/go-gir-generator; homepage = https://github.com/linuxdeepin/go-gir-generator;

9
pkgs/desktops/deepin/go-lib/default.nix
View File

@ -1,17 +1,16 @@
{ stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio, { stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio,
mobile-broadband-provider-info mobile-broadband-provider-info, deepin }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "go-lib"; pname = "go-lib";
version = "1.2.16.3"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0dk6k53in3ffwwvkr0sazfk83rf4fyc6rvb6k8fi2n3qj4gp8xd2"; sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv";
}; };
buildInputs = [ buildInputs = [
@ -27,6 +26,8 @@ stdenv.mkDerivation rec {
"GOSITE_DIR=$(out)/share/go" "GOSITE_DIR=$(out)/share/go"
]; ];
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Go bindings for Deepin Desktop Environment development"; description = "Go bindings for Deepin Desktop Environment development";
homepage = https://github.com/linuxdeepin/go-lib; homepage = https://github.com/linuxdeepin/go-lib;

9
pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
View File

@ -1,15 +1,16 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, mtdev, cairo }: { stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM,
mtdev, cairo, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "qt5dxcb-plugin"; pname = "qt5dxcb-plugin";
version = "1.1.11"; version = "1.1.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "157p2cqs9fvd4n4fmxj6mh4cxlc35bkl4rnf832wk2gvjnxdfrfy"; sha256 = "12lvh3agw3qdviqf32brmzba5kscnj5al5jhc08lq69a9kmip05x";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt platform theme integration plugin for DDE"; description = "Qt platform theme integration plugin for DDE";
homepage = https://github.com/linuxdeepin/qt5dxcb-plugin; homepage = https://github.com/linuxdeepin/qt5dxcb-plugin;

13
pkgs/desktops/deepin/qt5integration/default.nix
View File

@ -1,18 +1,17 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt { stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt ,
, lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype ,
, qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "qt5integration"; pname = "qt5integration";
version = "0.3.5"; version = "0.3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0qf9ndsg8pz2n68y68a30d1hxr3ri8k4j00dxlbcf5cn5mbnny1b"; sha256 = "1v9whlqn07c5c8xnaiicdshj9n88a667gfbn8y8bk5bfylilfzcy";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -42,6 +41,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt platform theme integration plugins for DDE"; description = "Qt platform theme integration plugins for DDE";
homepage = https://github.com/linuxdeepin/qt5integration; homepage = https://github.com/linuxdeepin/qt5integration;

37
pkgs/desktops/deepin/update.nix Normal file
View File

@ -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
''