cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #60926 from romildo/upd.deepin.all

Browse source 
deepin: update packages
This commit is contained in:
José Romildo Malaquias 2019-05-05 13:05:24 -03:00 committed by GitHub
commit 2458bfb000
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 96 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/deepin/dde-api/default.nix
View file

@ -26,7 +26,7 @@
buildGoPackage rec {
name = "${pname}-${version}";
pname = "dde-api";
version = "3.18.1";
version = "3.18.3";
goPackagePath = "pkg.deepin.io/dde/api";
@ -34,7 +34,7 @@ buildGoPackage rec {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0y8v18f6l3ycysdn4qi7c93z805q7alji8wix4j4qh9x9r35d728";
sha256 = "0sbzjpjy2d7j22v5sw3mf472lcnsy81n2rgly87k79r5gk9x89ar";
};
goDeps = ./deps.nix;

16
pkgs/desktops/deepin/dde-api/deps.nix generated
View file

@ -41,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/fogleman/gg";
rev = "0403632d5b905943a1c2a5b2763aaecd568467ec";
sha256 = "1nkldjghbqnzj2djfaxhiv35kk341xhcrj9m2dwq65v684iqkk8n";
rev = "72436a171bf31757dc87fb8fa9f7485307350307";
sha256 = "116ysxj7nv9zw5ff75p2mriwf6fx4qzdik9za8cy0l0vih78qvjq";
};
}
{
@ -59,8 +59,8 @@
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-x11-client";
rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561";
sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl";
rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a";
sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs";
};
}
{
@ -77,8 +77,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65";
sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3";
rev = "6d32002ffd7577f23673706728e1c510698cecb1";
sha256 = "03jzn07kfgdzzm4785xngcksv9ix6q1lf12b8j91flc0v7swsd1b";
};
}
{
@ -86,8 +86,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f";
sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s";
rev = "f4e77d36d62c17c2336347bb2670ddbd02d092b7";
sha256 = "0avjnglqqg9ya0cbhp23m4namykii219kxjywxn4cd7pfcc5arha";
};
}
{

5
pkgs/desktops/deepin/dde-daemon/default.nix
View file

@ -9,7 +9,7 @@
buildGoPackage rec {
name = "${pname}-${version}";
pname = "dde-daemon";
version = "3.24.1";
version = "3.27.1";
goPackagePath = "pkg.deepin.io/dde/daemon";
@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y";
sha256 = "1rbv7fals2bwhalw1hh3swmrdzclqbhny782shnrwqv53235xda3";
};
patches = [
@ -87,6 +87,7 @@ buildGoPackage rec {
'';
buildPhase = ''
export PAM_MODULE_DIR="$out/lib/security"
# compilation of the nm module is failing
#make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code
make -C go/src/${goPackagePath}

34
pkgs/desktops/deepin/dde-daemon/deps.nix generated
View file

@ -36,13 +36,22 @@
sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6";
};
}
{
goPackagePath = "github.com/gosexy/gettext";
fetch = {
type = "git";
url = "https://github.com/gosexy/gettext";
rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b";
sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi";
};
}
{
goPackagePath = "github.com/linuxdeepin/go-x11-client";
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-x11-client";
rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561";
sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl";
rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a";
sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs";
};
}
{
@ -68,8 +77,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65";
sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3";
rev = "6d32002ffd7577f23673706728e1c510698cecb1";
sha256 = "03jzn07kfgdzzm4785xngcksv9ix6q1lf12b8j91flc0v7swsd1b";
};
}
{
@ -77,8 +86,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f";
sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s";
rev = "f4e77d36d62c17c2336347bb2670ddbd02d092b7";
sha256 = "0avjnglqqg9ya0cbhp23m4namykii219kxjywxn4cd7pfcc5arha";
};
}
{
@ -86,8 +95,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "e3703dcdd614d2d7488fff034c75c551ea25da95";
sha256 = "1xh106aslp04vbzb4hc7cc5fyg2ljwny8fwfwsp5mpbqr9ixkikv";
rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475";
sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
};
}
{
@ -99,13 +108,4 @@
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
};
}
{
goPackagePath = "pkg.deepin.io/lib";
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-lib.git";
rev = "3558b2348565e983c7d4a57a0a21bbe716a55b83";
sha256 = "0p9yrxa3x71n3jxffh03ahjgimdzvxzhny632k363lkha6glvbnc";
};
}
]

4
pkgs/desktops/deepin/dde-network-utils/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-network-utils";
version = "0.1.2";
version = "0.1.4";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1m6njld06yphppyyhygz8mv4gvq2zw0676pbls9m3fs7b3dl56sv";
sha256 = "0nj9lf455lf2hyqv6xwhm4vrr825ldbl83azzrrzqs6p781x65i1";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/dde-polkit-agent/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-polkit-agent";
version = "0.2.4";
version = "0.2.6";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1x7mv63g8412w1bq7fijsdzi8832qjb6gnr1nykcv7imzlycq9m6";
sha256 = "1ih78sxhnn6hbx9mzhalx95dk18f217mjbvymf8dky2vkmw8vnmx";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/dde-session-ui/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-session-ui";
version = "4.9.0";
version = "4.9.6";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1bh7wbkzikcnka94nzqzl87cs2m6bslrv9r2hdsvqqr3aaad5za3";
sha256 = "1wk5mjv1g9my80cxpcycqkm2gjc5r5rrcpxmsl06w4g2c19k50x1";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-desktop-base/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-desktop-base";
version = "2019.03.29";
version = "2019.04.24";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1d016h95nsn5yay9f4c13hixfxj0q01hpxwj2x84i6qpx63dxdwq";
sha256 = "0mdfjkyjrccxlsg05mf80qcw8v5srlp80rvjkpnnbhfscq1fnpgn";
};
nativeBuildInputs = [ deepin.setupHook ];

4
pkgs/desktops/deepin/deepin-icon-theme/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-icon-theme";
version = "15.12.68";
version = "15.12.69";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "12jgz81s5qggmnkfg9m5f799r10p43qmh4zqxl1kjvlrqgvsc9rf";
sha256 = "1y6r2as3acqkq8z1d44c82jfplihscmqc9fgpq1j0anznwcdj73k";
};
nativeBuildInputs = [ gtk3 xcursorgen ];

4
pkgs/desktops/deepin/deepin-image-viewer/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-image-viewer";
version = "1.3.10";
version = "1.3.13";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0paanw9sd67ic9yrbzqhrwi4bf4lpvsk16jynx99n76j3jgyijkk";
sha256 = "1ql3li63qiw92jx5jzmx3k115vdn3cjfysja3afjhmfngq1xibmj";
};
nativeBuildInputs = [

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-menu";
version = "3.4.1";
version = "3.4.6";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0aga4d4qwd7av6aa4cynhk0sidns7m7y6x0rq1swnkpr9ksr80gi";
sha256 = "1gxf3slqx1s15bjrds29sas7ah6kp8c4pjvzwipncyx6qfgczj2a";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-movie-reborn/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-movie-reborn";
version = "3.2.21";
version = "3.2.22.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "09a4sirbdxnrwj9ww2v7b1s9ylsincqzpqm2zisny9zxy22fm8s9";
sha256 = "1qh079j4c2n33z0ykv87af9vfkmdxxrv6dy54wdqdpr7vrhn89gb";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-screenshot/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-screenshot";
version = "4.1.8";
version = "4.1.10";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1zhjchflgws2q74b9fgdjy2wzifjhimnrrq1sxlv395793xv8lrr";
sha256 = "00zmmnvm5wv9fkc9fbqs23jsqs1mnr68afl4irj6y287ic0pj61i";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-terminal/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-terminal";
version = "3.2.1.2";
version = "3.2.2.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-terminal";
rev = version;
sha256 = "0dj386csbiw0yqz9nj6ij0s4d0ak9lpq2bmsfs17bjkgdp0ayp90";
sha256 = "08bhdd9q4aqy5yjbpqy918j63c3b2rrdqdkxh3fk258n1fm72gmw";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-turbo/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-turbo";
version = "0.0.2";
version = "0.0.3";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "13vbj18pclv7c25pb1y5x6dd7wmcgisa40mb13qyixnzpq2ssjg5";
sha256 = "15l0pgszmbirlaxj04ishj43kyvigsl1yaf58kxlbdb3lkmcp5f3";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-wm/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-wm";
version = "1.9.37";
version = "1.9.38";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1xd2x0kyav2cxnk0bybl7lrmak1r2468slxz5a6anrdriw9l10gi";
sha256 = "1qhdnv4x78f0gkr94q0j8x029fk9ji4m9jdipgrdm83pnahib80g";
};
nativeBuildInputs = [

14
pkgs/desktops/deepin/dtkcore/default.nix
View file

@ -3,19 +3,20 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dtkcore";
version = "2.0.10";
version = "2.0.12.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0dwpq6c38gaa95mgjnwj3vjz57n0cz6jfk950xi6s9ww2f4g6kq7";
sha256 = "1akfzkdhgsndm6rlr7snhpznxj0w351v6rr8vvnr6ka2dw75xsl4";
};
nativeBuildInputs = [
pkgconfig
qmake
pythonPackages.wrapPython
deepin.setupHook
];
buildInputs = [
@ -23,21 +24,18 @@ stdenv.mkDerivation rec {
];
postPatch = ''
# Only define QT_HOST_DATA if it is empty
sed '/QT_HOST_DATA=/a }' -i src/dtk_module.prf
sed '/QT_HOST_DATA=/i isEmpty(QT_HOST_DATA) {' -i src/dtk_module.prf
searchHardCodedPaths # debugging
# Fix shebang
sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env,"
'';
preConfigure = ''
qmakeFlags="$qmakeFlags QT_HOST_DATA=$out"
'';
qmakeFlags = [ "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" ];
postFixup = ''
chmod +x $out/lib/dtk2/*.py
wrapPythonProgramsIn "$out/lib/dtk2" "$out $pythonPath"
searchHardCodedPaths $out # debugging
'';
enableParallelBuilding = true;

4
pkgs/desktops/deepin/dtkwidget/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dtkwidget";
version = "2.0.10";
version = "2.0.12.3";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "11a7yirfkcj3rq7va9av4m1pr22mq1yx1j9k18xrqv36n0rlbrr6";
sha256 = "0z71il09gj1frkxfw3av97szh17spr6ss1k07l0prk1s1wm7yyfr";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/dtkwm/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dtkwm";
version = "2.0.9";
version = "2.0.11";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0vkx6vlz83pgawhdwqkwpq3dy8whxmjdzfpgrvm2m6jmspfk9bab";
sha256 = "10l89i84vsh5knq9wg2php7vfg5rj5c9hrrl9rjlcidn1rz8yx6f";
};
nativeBuildInputs = [

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "go-dbus-factory";
version = "0.4.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1i1ymi2qpcbf4d6rnfzrbq5n2vwnn8dvbq9xlw7jls3jpr3d5r00";
sha256 = "080bcwbq00d91iazgl59cp5ra2x6xkhnc41ipvglvrkibq9zi1a4";
};
makeFlags = [ "PREFIX=${placeholder ''out''}" ];

4
pkgs/desktops/deepin/go-gir-generator/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "go-gir-generator";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0d93qzp3dlia5d1yxw0rwca76qk3jyamj9xzmk13vzig8zw0jx16";
sha256 = "0jdhfnwrpp77893zxljr453w23kahqsdpd8a8i5jp6pyvkdm816j";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/go-lib/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "go-lib";
version = "1.10.0";
version = "1.10.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "090l33y79gdj2xy1bhk2ksl6hvmsfhmx0bhygm4y4d0iqckf2x2m";
sha256 = "05z7ayl23cm8mbn4vkn3isy5kgwxljc26ifmzrhmnqm5yibd6lsf";
};
buildInputs = [

5
pkgs/desktops/deepin/qcef/default.nix
View file

@ -42,14 +42,14 @@ in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qcef";
version = "1.1.4.6";
version = "1.1.6";
srcs = [
(fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "06909sd0gf7n4hw6p4j96apjym219zabflgpwjafm7v00bgnwxxs";
sha256 = "1x0vb4nkfa1lq0nh6iqpxfvsqmb6qfn305pbc92bsqpgiqd7jvb1";
name = pname;
})
(fetchFromGitHub {
@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/linuxdeepin/qcef;
license = licenses.lgpl3;
platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available
maintainers = with maintainers; [ romildo ];
};
}

4
pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qt5dxcb-plugin";
version = "1.1.25";
version = "1.1.27";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1nadmj1hdpw4n3kpk3dlx22bmxdli66abhjl73hwrbvszmmcm9vp";
sha256 = "1hs7r17qsqn3hgfjd0scagpj1dqys7i1507vxadfac4h1ahyxaz7";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/qt5integration/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qt5integration";
version = "0.3.8";
version = "0.3.11";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "12d6iv2x0q2n73rscma30q31nh7h26gmhlf665gkgl2j825hlx5n";
sha256 = "1p3bnjy449vy5mpxassjv6sr2dp887gsss000szk5s0p1agmydxq";
};
nativeBuildInputs = [

27
pkgs/desktops/deepin/setup-hook.sh
View file

@ -1,17 +1,28 @@
# Helper functions for deepin packaging
searchHardCodedPaths() {
# looks for ocurrences of hard coded paths in given (current)
# directory and command invocations for the purpose of debugging a
# derivation
# Usage:
#
# searchHardCodedPaths [-a] [<path>]
#
# Looks for ocurrences of FHS hard coded paths and command
# invocations in the given path (default: current directory) for
# the purpose of debugging a derivation. The option -a enables
# processing binary files as if they were text.
local dir=$1
local binary
if [ "$1" = "-a" ]; then
binary="-a"
shift
fi
echo ----------- looking for command invocations
grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $dir || true
local path=$1
echo ----------- looking for hard coded paths
grep --color=always -a -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true
echo ----------- looking for command invocations in $path
grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $path || true
echo ----------- looking for hard coded paths in $path
grep --color=always $binary -r -E '/(usr|bin|sbin|etc|var|opt)\>' $path || true
echo ----------- done
}