Merge staging-next into staging
This commit is contained in:
commit
8ed4976a55
3 changed files with 7 additions and 5 deletions
|
@ -44,11 +44,11 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bluejeans";
|
pname = "bluejeans";
|
||||||
version = "2.22.0.87";
|
version = "2.23.0.39";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
|
url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
|
||||||
sha256 = "sha256-0nobn+YcvqakwvBdkoEJrzHoL+OGym2zJ806oUabYfo=";
|
sha256 = "sha256-LGg14KJ/hEnSaSrdTltY9YXv7Nekkfo66uLkxjMx8AI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ rpmextract makeWrapper ];
|
nativeBuildInputs = [ rpmextract makeWrapper ];
|
||||||
|
|
|
@ -13,6 +13,8 @@ mkDerivation rec {
|
||||||
|
|
||||||
LC_ALL = "en_US.UTF-8";
|
LC_ALL = "en_US.UTF-8";
|
||||||
|
|
||||||
|
preConfigure = ''export AGDA_EXEC=agda'';
|
||||||
|
|
||||||
# The cubical library has several `Everything.agda` files, which are
|
# The cubical library has several `Everything.agda` files, which are
|
||||||
# compiled through the make file they provide.
|
# compiled through the make file they provide.
|
||||||
nativeBuildInputs = [ ghc glibcLocales ];
|
nativeBuildInputs = [ ghc glibcLocales ];
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
{ fetchFromGitHub, buildGoModule, lib, installShellFiles, libgit2, pkg-config }:
|
{ fetchFromGitHub, buildGoModule, lib, installShellFiles, libgit2, pkg-config }:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "turbogit";
|
pname = "turbogit";
|
||||||
version = "2.0.0";
|
version = "3.0.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "b4nst";
|
owner = "b4nst";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-UIPI1r6BnfD5ukk5yGg3VJHMyaMp30MXhJfOkoNT6vs=";
|
sha256 = "sha256-A1hVpapp6yIpUVnDQ1yLLHiYdLcQlr/JcTOmt5sr3Oo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-SX0VPENcfw8ysL+dDGPSJ/FNdyecjENx4+UHXdu71O8=";
|
vendorSha256 = "sha256-1AEcBq7wiENWQ5HZEEXpIgA6Bf2T28zm/MwYTke/f9s=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue