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

Merge pull request #56173 from worldofpeace/worldofpeace-updates

Browse Source 
worldofpeace updates
This commit is contained in:
worldofpeace 2019-02-22 12:54:36 -05:00 committed by GitHub
commit 90e569811d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 142 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/lollypop/default.nix
View File

@ -5,7 +5,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
version = "0.9.915";
version = "0.9.921";
format = "other";
doCheck = false;
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
sha256 = "133qmqb015ghif4d4zh6sf8585fpfgbq00rv6qdj5xn13wziipwh";
sha256 = "0a79qnci93yicd58r6kr6yinpqz67s39h0xk5qkzlsplpbawvf3y";
};
nativeBuildInputs = [

17
pkgs/applications/editors/quilter/default.nix
View File

@ -1,39 +1,36 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, meson, ninja, python3
, gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon
, gnome3, discount, gobject-introspection, wrapGAppsHook }:
, libgee, discount, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "quilter";
version = "1.6.8";
name = "${pname}-${version}";
version = "1.7.0";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "07i9pivpddgixn1wzbr15gvzf0n5pklx0gkjjaa35kvj2z8k31x5";
sha256 = "0dqji6zwpn0k89mpmh10rq59hzrq8kqr30dz1hp06ygk8rlnv2ys";
};
nativeBuildInputs = [
desktop-file-utils
gobject-introspection
meson
ninja
pantheon.vala
pkgconfig
python3
pantheon.vala
wrapGAppsHook
];
buildInputs = [
discount
pantheon.elementary-icon-theme
pantheon.granite
gnome3.libgee
gtk3
gtksourceview
gtkspell3
libgee
pantheon.elementary-icon-theme
pantheon.granite
webkitgtk
];

15
pkgs/applications/misc/notejot/default.nix
View File

@ -1,36 +1,33 @@
{ stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, pantheon
, gtk3, gtksourceview, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
, gtk3, gtksourceview, json-glib, gnome3, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "notejot";
version = "1.5.4";
name = "${pname}-${version}";
version = "1.5.5";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "1lv4s2mqddi6lz414kqpp4vcwnkjibc0k2xhnczaa1wf3azlxjgf";
sha256 = "0khf6mwidybfgnq4zmhf3af4w6aicipmi12fvs722fqlf1lrkdmd";
};
nativeBuildInputs = [
gobject-introspection
meson
ninja
pantheon.vala
pkgconfig
python3
pantheon.vala
wrapGAppsHook
];
buildInputs = [
pantheon.elementary-icon-theme
pantheon.granite
gnome3.libgee
gtk3
gtksourceview
json-glib
pantheon.elementary-icon-theme
pantheon.granite
];
postPatch = ''

14
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
View File

@ -43,7 +43,7 @@ let
xorg.libxcb
];
version = "3.5.2881";
version = "3.6.2885";
plat = {
"i686-linux" = "i386";
@ -51,8 +51,8 @@ let
}.${stdenv.hostPlatform.system};
sha256 = {
"i686-linux" = "0s5j6acsiymsikvah9f1ywandzvcdx5m8csrc7ymhv0gx2a9xm1d";
"x86_64-linux" = "17siis4xws27jmhf1gyb6cvip6clak27zxckyk0b312kkc4q363i";
"i686-linux" = "1lj2gjv69z94dj7b4zjhls420fs5zzxkdlwv25p2gp4lkv0v6l98";
"x86_64-linux" = "1dl88fpy8v3aprzdp1nnwg08sy7yiljqjnpnl3rw0h5nix6xmv9v";
}.${stdenv.hostPlatform.system};
in
@ -60,7 +60,7 @@ in
name = "wire-desktop-${version}";
src = fetchurl {
url = "https://wire-app.wire.com/linux/debian/pool/main/wire_${version}_${plat}.deb";
url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_${plat}.deb";
inherit sha256;
};
@ -103,9 +103,9 @@ in
meta = with stdenv.lib; {
description = "A modern, secure messenger";
homepage = https://wire.com/;
license = licenses.gpl3;
homepage = https://wire.com/;
license = licenses.gpl3;
maintainers = with maintainers; [ worldofpeace ];
platforms = [ "i686-linux" "x86_64-linux" ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

17
pkgs/applications/networking/weather/meteo/default.nix
View File

@ -1,24 +1,19 @@
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk
, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }:
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3, geocode-glib, json-glib, libsoup, webkitgtk, libappindicator, desktop-file-utils, hicolor-icon-theme, appstream, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "meteo";
version = "0.8.5";
name = "${pname}-${version}";
version = "0.9.6";
src = fetchFromGitLab {
owner = "bitseater";
repo = pname;
rev = version;
sha256 = "1mc2djhkg0nzcjmy87l1wqwni48vgpqh8s1flr90pipk12a1mh7n";
sha256 = "1786s5637hc3dnnkf5vr2ngfiq73dyvx8187gx7qkh7cr8xrl50w";
};
nativeBuildInputs = [
appstream
desktop-file-utils
gobject-introspection
meson
ninja
pkgconfig
@ -28,13 +23,11 @@ stdenv.mkDerivation rec {
];
buildInputs = [
clutter
clutter-gtk
gnome3.geocode-glib
geocode-glib
gtk3
hicolor-icon-theme
json-glib
libappindicator
libchamplain
libsoup
webkitgtk
];

10
pkgs/shells/zsh/antibody/default.nix
View File

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "antibody-${version}";
version = "4.0.2";
pname = "antibody";
version = "4.1.0";
goPackagePath = "github.com/getantibody/antibody";
src = fetchFromGitHub {
owner = "getantibody";
repo = "antibody";
owner = "getantibody";
repo = "antibody";
rev = "v${version}";
sha256 = "1lq0bd2l928bgwqiq3fa5ippjhnsfgwdqn6nd3hfis8bijrwc5jv";
sha256 = "027qh535cpk5mbxav199vvzhwfkcs0lm7skgfhshpzps1yw4w4mb";
};
goDeps = ./deps.nix;

183
pkgs/shells/zsh/antibody/deps.nix generated
View File

@ -1,73 +1,110 @@
[{
goPackagePath = "github.com/getantibody/folder";
fetch = {
type = "git";
url = "https://github.com/getantibody/folder";
rev = "479aa91767d47bc27599e6ebc7fd07945dd38132";
sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j";
};
}{
goPackagePath = "github.com/alecthomas/units";
fetch = {
type = "git";
url = "https://github.com/alecthomas/units";
rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
};
}{
goPackagePath = "github.com/alecthomas/template";
fetch = {
type = "git";
url = "https://github.com/alecthomas/template";
rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
};
}{
goPackagePath = "github.com/caarlos0/gohome";
fetch = {
type = "git";
url = "https://github.com/caarlos0/gohome";
rev = "75f08ebc60b144c5c3178115baedce176fdcfe99";
sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz";
};
}{
goPackagePath = "github.com/alecthomas/kingpin";
fetch = {
type = "git";
url = "https://github.com/alecthomas/kingpin";
rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
};
}{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
};
}{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
};
}{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "2491c5de3490fced2f6cff376127c667efeed857";
sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
};
}]
[
{
goPackagePath = "github.com/alecthomas/kingpin";
fetch = {
type = "git";
url = "https://github.com/alecthomas/kingpin";
rev = "a39589180ebd";
sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
};
}
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
type = "git";
url = "https://github.com/alecthomas/template";
rev = "a0175ee3bccc";
sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
};
}
{
goPackagePath = "github.com/alecthomas/units";
fetch = {
type = "git";
url = "https://github.com/alecthomas/units";
rev = "2efee857e7cf";
sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
};
}
{
goPackagePath = "github.com/caarlos0/gohome";
fetch = {
type = "git";
url = "https://github.com/caarlos0/gohome";
rev = "75f08ebc60b1";
sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.1";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/getantibody/folder";
fetch = {
type = "git";
url = "https://github.com/getantibody/folder";
rev = "v1.0.0";
sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.2.2";
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "1a580b3eff78";
sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "2491c5de3490";
sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "1d60e4601c6f";
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "7c87d13f8e83";
sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
};
}
]