Merge master into staging-next
This commit is contained in:
commit
1e3518a1db
@ -8,16 +8,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "lima";
|
pname = "lima";
|
||||||
version = "0.6.2";
|
version = "0.6.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lima-vm";
|
owner = "lima-vm";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-kSJbSJ85cM6N+V67z+trNNuEO4O2KNs62JTy3Mz8Bi4=";
|
sha256 = "sha256-3Bc8F8L4ac0YoUp2zoQYPsj7hcXKf8SVkE7q6q0MNSs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-PeIEIUX/PwwnbZfXnK3IsENO+zRYLhljBRe910aZgKs=";
|
vendorSha256 = "sha256-vYeHv6sSiO6fY+oXR8bFFs/NAhivtnkc15pXEu+reZQ=";
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||||
|
|
||||||
|
@ -6,11 +6,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bitarray";
|
pname = "bitarray";
|
||||||
version = "2.3.2";
|
version = "2.3.3";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-S+47qRZLZs72TxCZ6aO4jpndzQyUOAfplENhPhhLSLQ=";
|
sha256 = "sha256-Dt9jCkRxpIYnrsC4QM87jhCQEZHTKPZRFWBCBFneKC4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
@ -20,6 +20,9 @@ in stdenv.mkDerivation rec {
|
|||||||
++ lib.optionals stdenv.isLinux [ gtk3 tbb ];
|
++ lib.optionals stdenv.isLinux [ gtk3 tbb ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [ ]
|
NIX_CFLAGS_COMPILE = [ ]
|
||||||
|
# Apple's compiler finds a format string security error on
|
||||||
|
# ../../../server/TracyView.cpp:649:34, preventing building.
|
||||||
|
++ lib.optional stdenv.isDarwin "-Wno-format-security"
|
||||||
++ lib.optional stdenv.isLinux "-ltbb"
|
++ lib.optional stdenv.isLinux "-ltbb"
|
||||||
++ lib.optional stdenv.cc.isClang "-faligned-allocation"
|
++ lib.optional stdenv.cc.isClang "-faligned-allocation"
|
||||||
++ lib.optional disableLTO "-fno-lto";
|
++ lib.optional disableLTO "-fno-lto";
|
||||||
|
@ -2,14 +2,14 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "vikunja-api";
|
pname = "vikunja-api";
|
||||||
version = "0.17.1";
|
version = "0.18.0";
|
||||||
|
|
||||||
src = fetchFromGitea {
|
src = fetchFromGitea {
|
||||||
domain = "kolaente.dev";
|
domain = "kolaente.dev";
|
||||||
owner = "vikunja";
|
owner = "vikunja";
|
||||||
repo = "api";
|
repo = "api";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-xqC7MaPe5cClMUTSRE3HLTEH3LH1J1bJSdH+1ZOfGo4=";
|
sha256 = "sha256-43y9+y5VVgbCexHPsYZ9/Up84OoPSrThHWiKR0P1h3s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
@ -24,7 +24,7 @@ buildGoModule rec {
|
|||||||
'';
|
'';
|
||||||
in [ fakeGit mage ];
|
in [ fakeGit mage ];
|
||||||
|
|
||||||
vendorSha256 = "sha256-/vXyZznGxj5hxwqi4sttBBkEoS25DJqwoBtADCRO9Qc=";
|
vendorSha256 = "sha256-1tXnlOlVH61Y4jN07XBfTgZhAsU2HeudiEVAtlP+Cpk=";
|
||||||
|
|
||||||
# checks need to be disabled because of needed internet for some checks
|
# checks need to be disabled because of needed internet for some checks
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vikunja-frontend";
|
pname = "vikunja-frontend";
|
||||||
version = "0.17.0";
|
version = "0.18.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip";
|
url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip";
|
||||||
sha256 = "sha256-LUYBCdEwDMwhFuIIRmnrtQN9ChaEZyFbItMxh27H5XY=";
|
sha256 = "sha256-LV7+HfXeNcVHuoo+n6fuAQoIb/m0lOs6JYYMNLM/jTA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
nativeBuildInputs = [ unzip ];
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
{ lib, fetchFromGitHub, buildGoPackage }:
|
{ lib, fetchFromGitHub, buildGoModule }:
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoModule rec {
|
||||||
pname = "envsubst";
|
pname = "envsubst";
|
||||||
version = "1.2.0";
|
version = "1.2.0";
|
||||||
|
|
||||||
goPackagePath = "github.com/a8m/envsubst";
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "a8m";
|
owner = "a8m";
|
||||||
repo = "envsubst";
|
repo = "envsubst";
|
||||||
@ -12,6 +11,12 @@ buildGoPackage rec {
|
|||||||
sha256 = "0zkgjdlw3d5xh7g45bzxqspxr61ljdli8ng4a1k1gk0dls4sva8n";
|
sha256 = "0zkgjdlw3d5xh7g45bzxqspxr61ljdli8ng4a1k1gk0dls4sva8n";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
install -Dm444 -t $out/share/doc/${pname} LICENSE *.md
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Environment variables substitution for Go";
|
description = "Environment variables substitution for Go";
|
||||||
homepage = "https://github.com/a8m/envsubst";
|
homepage = "https://github.com/a8m/envsubst";
|
||||||
|
Loading…
Reference in New Issue
Block a user