diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-18 18:01:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 18:01:22 +0000 |
| commit | 9f26e7ee023d290a1255d8032dbab2ac28993fc0 (patch) | |
| tree | cec514bece3ecc021028232c9ca9db97f41c2e05 /pkgs/development/tools | |
| parent | 1fc6296f9bfb29b5338049d884d3f217847bd460 (diff) | |
| parent | da1bd1d6815ef005097e42778c43b84e3f78a055 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools')
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 479f319c5426a..ac8e06cf8570c 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.6.0"; + version = "16.6.1"; in buildGoModule rec { inherit version; @@ -23,7 +23,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-4N00+yO7Ps0+jy7WmHhm4Eh4MXt3beH00ScZ1RWNByE="; + sha256 = "sha256-z/W4mqC6524ocBR0c2UpMrlo5njXoewgBOulPoe2UBY="; }; patches = [ diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 26337b0dcc7dd..f4540cdacc63b 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.55"; + version = "0.2.56"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OFtzqnXKj03papfBDQlgUonOA7eKGWDJeVZmfFkPUcc="; + hash = "sha256-Lco14Zwnad9AlujmPwhT5zRhsrifbQ3oi0AftjqsUQk="; }; - vendorHash = "sha256-45UPm7ThTSRTgzaD4tXoTaeT4hRlMKn01mvgJS1I7zI="; + vendorHash = "sha256-rQCxRUIzTJtL8gC9nYV+HKzB7hozyR24TCb+1y/qKM4="; doCheck = false; diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 54f744a1608ef..15995303748f3 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { description = "A front-end for libsass"; homepage = "https://github.com/sass/sassc/"; license = licenses.mit; + mainProgram = "sassc"; maintainers = with maintainers; [ codyopel pjones ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index c19936b2bf64c..b5a1c90926fb7 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -4,11 +4,10 @@ rustPlatform, fetchFromGitHub, pkg-config, openssl, -libiconv, jq, moreutils, CoreServices, -Security +SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = if stdenv.isDarwin - then [ libiconv CoreServices Security ] + then [ CoreServices SystemConfiguration ] else [ openssl ]; # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; |