From e0fbad9a66714bcace29ff34e65573e9d6a0bec0 Mon Sep 17 00:00:00 2001 From: Leo Maroni Date: Sun, 5 Sep 2021 20:49:59 +0200 Subject: [PATCH 1/6] vikunja-frontend: 0.17.0 -> 0.18.0 --- pkgs/servers/web-apps/vikunja/frontend.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix index e3b8a8785dec..6cca64e19ae9 100644 --- a/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - sha256 = "sha256-LUYBCdEwDMwhFuIIRmnrtQN9ChaEZyFbItMxh27H5XY="; + sha256 = "sha256-LV7+HfXeNcVHuoo+n6fuAQoIb/m0lOs6JYYMNLM/jTA="; }; nativeBuildInputs = [ unzip ]; From 732316e9c571d17eb039bfecfc3604738bba33ad Mon Sep 17 00:00:00 2001 From: Leo Maroni Date: Sun, 5 Sep 2021 20:51:11 +0200 Subject: [PATCH 2/6] vikunja-api: 0.17.1 -> 0.18.0 --- pkgs/servers/web-apps/vikunja/api.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index 285352da36e6..fc1aa09e4f69 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vikunja-api"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitea { domain = "kolaente.dev"; owner = "vikunja"; repo = "api"; rev = "v${version}"; - sha256 = "sha256-xqC7MaPe5cClMUTSRE3HLTEH3LH1J1bJSdH+1ZOfGo4="; + sha256 = "sha256-43y9+y5VVgbCexHPsYZ9/Up84OoPSrThHWiKR0P1h3s="; }; nativeBuildInputs = @@ -24,7 +24,7 @@ buildGoModule rec { ''; in [ fakeGit mage ]; - vendorSha256 = "sha256-/vXyZznGxj5hxwqi4sttBBkEoS25DJqwoBtADCRO9Qc="; + vendorSha256 = "sha256-1tXnlOlVH61Y4jN07XBfTgZhAsU2HeudiEVAtlP+Cpk="; # checks need to be disabled because of needed internet for some checks doCheck = false; From e4cb871eafe121e14cea80899bb3ee30814fa0a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Sep 2021 23:42:19 +0200 Subject: [PATCH 3/6] python3Packages.bitarray: 2.3.2 -> 2.3.3 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index ad97a5f04c8b..ad20467f162d 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-S+47qRZLZs72TxCZ6aO4jpndzQyUOAfplENhPhhLSLQ="; + sha256 = "sha256-Dt9jCkRxpIYnrsC4QM87jhCQEZHTKPZRFWBCBFneKC4="; }; checkPhase = '' From 5e47a07e9f2d7ed999f2c7943b0896f5f7321ca3 Mon Sep 17 00:00:00 2001 From: Jade Date: Sun, 5 Sep 2021 14:55:45 -0700 Subject: [PATCH 4/6] pkgs/tracy: fix on Darwin --- pkgs/development/tools/tracy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 5bb056d5b34e..55114c518e57 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -20,6 +20,9 @@ in stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ gtk3 tbb ]; 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.cc.isClang "-faligned-allocation" ++ lib.optional disableLTO "-fno-lto"; From 87c6a8a7066117f547f05fcc678db4119059bbd9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 5 Sep 2021 16:21:47 +0800 Subject: [PATCH 5/6] envsubst: drive-by cleanup --- pkgs/tools/misc/envsubst/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix index be563345b2c2..5ecae8dbcbe9 100644 --- a/pkgs/tools/misc/envsubst/default.nix +++ b/pkgs/tools/misc/envsubst/default.nix @@ -1,10 +1,9 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "envsubst"; version = "1.2.0"; - goPackagePath = "github.com/a8m/envsubst"; src = fetchFromGitHub { owner = "a8m"; repo = "envsubst"; @@ -12,6 +11,12 @@ buildGoPackage rec { sha256 = "0zkgjdlw3d5xh7g45bzxqspxr61ljdli8ng4a1k1gk0dls4sva8n"; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} LICENSE *.md + ''; + meta = with lib; { description = "Environment variables substitution for Go"; homepage = "https://github.com/a8m/envsubst"; From 9fcf2a8a2cb0f5b78edc8ec7ca877240e7fe3009 Mon Sep 17 00:00:00 2001 From: Vo Anh Duy Date: Mon, 6 Sep 2021 10:26:37 +0800 Subject: [PATCH 6/6] lima: 0.6.2 -> 0.6.3 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index c201ad8805b1..adff564a3c9a 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; 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 ];