Merge pull request #67236 from Chiiruno/dev/general
Update: easyjson, quicktemplate, statik, qtchan, vlang
This commit is contained in:
commit
a4083fb455
@ -1,27 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, qt, makeWrapper }:
|
||||
{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qtchan-${version}";
|
||||
version = "0.100";
|
||||
mkDerivation rec {
|
||||
pname = "qtchan";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siavash119";
|
||||
repo = "qtchan";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a";
|
||||
sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = https://github.com/siavash119/qtchan/commit/718abeee5cf4aca8c99b35b26f43909362a29ee6.patch;
|
||||
sha256 = "11b72l5njvfsyapd479hp4yfvwwb1mhq3f077hwgg0waz5l7n00z";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ qt.qmake qt.wrapQtAppsHook ];
|
||||
buildInputs = [ qt.qtbase ];
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase ];
|
||||
qmakeFlags = [ "CONFIG-=app_bundle" ];
|
||||
|
||||
installPhase = ''
|
||||
@ -29,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
cp qtchan $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "4chan browser in qt5";
|
||||
homepage = "https://github.com/siavash119/qtchan";
|
||||
license = licenses.mit;
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, glfw, freetype, curl }:
|
||||
{ stdenv, fetchFromGitHub, glfw, freetype, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vlang";
|
||||
version = "0.1.16";
|
||||
version = "0.1.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "v";
|
||||
rev = "${version}";
|
||||
sha256 = "08zgwy9ac3wa5ixy8rdw6izpn1n1c3ydb9rl8z8graw0bgv719ma";
|
||||
sha256 = "0js92v2r1h4vaaha3z1spgi7qynlmr9vls41gxp284w4yhnjzv15";
|
||||
};
|
||||
|
||||
# V compiler source translated to C for bootstrap.
|
||||
@ -16,18 +16,17 @@ stdenv.mkDerivation rec {
|
||||
owner = "vlang";
|
||||
repo = "vc";
|
||||
rev = "${version}";
|
||||
sha256 = "0k6c7v3r3cirypsqbaq10qlgg41v19rsnc1ygam4il2p8rsmfwz3";
|
||||
sha256 = "0qx1drs1hr94w7vaaq5w8mkq7j1d3biffnmxkyz63yv8573k03bj";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ glfw freetype curl ];
|
||||
buildInputs = [ glfw freetype openssl ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cc -std=gnu11 -w -o v $vc/v.c -lm
|
||||
cc -std=gnu11 $CFLAGS -w -o v $vc/v.c -lm $LDFLAGS
|
||||
./v -prod -o v compiler
|
||||
# -fPIC -pie required for examples/hot_code_reloading
|
||||
make CFLAGS+="-fPIC -pie" thirdparty
|
||||
make thirdparty
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
@ -1,16 +1,16 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "easyjson-unstable-${version}";
|
||||
version = "2019-02-21";
|
||||
pname = "easyjson";
|
||||
version = "unstable-2019-06-26";
|
||||
goPackagePath = "github.com/mailru/easyjson";
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mailru";
|
||||
repo = "easyjson";
|
||||
rev = "6243d8e04c3f819e79757e8bc3faa15c3cb27003";
|
||||
sha256 = "160sj5pq4bv9jshniimkd5f9zcg6xrbgb027lhr9l895nsv4dlib";
|
||||
rev = "b2ccc519800e761ac8000b95e5d57c80a897ff9e";
|
||||
sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -1,16 +1,16 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "quicktemplate-unstable-${version}";
|
||||
version = "2019-01-31";
|
||||
pname = "quicktemplate";
|
||||
version = "unstable-2019-07-08";
|
||||
goPackagePath = "github.com/valyala/quicktemplate";
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "valyala";
|
||||
repo = "quicktemplate";
|
||||
rev = "d08324ac14fa81325830fae7eb30188ec68427f8";
|
||||
sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx";
|
||||
rev = "840e9171940bbc80bb1b925c880664cababae022";
|
||||
sha256 = "1pimf5bwivklsr438if6l8by34gr48a05gl6hq07cvc8z6wl01m2";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -1,16 +1,16 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "statik-unstable-${version}";
|
||||
version = "2018-11-28";
|
||||
pname = "statik";
|
||||
version = "unstable-2019-07-31";
|
||||
goPackagePath = "github.com/rakyll/statik";
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakyll";
|
||||
repo = "statik";
|
||||
rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e";
|
||||
sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5";
|
||||
rev = "925a23bda946b50bb0804894f340c5da2b95603b";
|
||||
sha256 = "15wwgrprfq36pa13b9anp7097q1fqcad28hirvivybmc011p0fri";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -20234,9 +20234,7 @@ in
|
||||
|
||||
qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
|
||||
|
||||
qtchan = callPackage ../applications/networking/browsers/qtchan {
|
||||
qt = qt5;
|
||||
};
|
||||
qtchan = libsForQt5.callPackage ../applications/networking/browsers/qtchan { };
|
||||
|
||||
qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user