deepin.dde-api: 3.1.30 -> 3.5.0

This commit is contained in:
José Romildo Malaquias 2018-10-30 21:16:19 -03:00
parent 287db0f9b9
commit f0bec94452
2 changed files with 31 additions and 55 deletions
pkgs/desktops/deepin/dde-api

View File

@ -1,12 +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, deepin 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";
@ -14,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
''; '';

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