diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:25:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:25:54 +0200 |
commit | 08900c0554657442c60c86e54081325c0f4cedce (patch) | |
tree | 4e7a2e330991ee3eb08cf6b51d3f44ae47ae03f3 /pkgs/development/tools/misc | |
parent | 458b2cb7d67561c796c6f0660a97eea9b685fc65 (diff) | |
parent | 3327b9a385f5ec2e219bf93b48896772b3f66afc (diff) | |
download | nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar.gz nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar.bz2 nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar.lz nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar.xz nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar.zst nixlib-08900c0554657442c60c86e54081325c0f4cedce.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/act/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/tools/misc/patchelf/unstable.nix | 12 | ||||
-rw-r--r-- | pkgs/development/tools/misc/strace/default.nix | 4 |
3 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index e7234c0492d4..21ad66b62bd1 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,23 +2,24 @@ buildGoModule rec { pname = "act"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "14ird8z8f467spa0kdzjf6lq7pipq7rwxrdk6ppv7y1fxw96qm9x"; + sha256 = "17w7pqpn9pkzc85lrsmyhxy6rip47dxw1hkz4ml3y5n68nysfpb9"; }; - vendorSha256 = "0ns20vvrj0j921wsx227dxbpga6kll7pxglfqhl53xckrh85yyd8"; + vendorSha256 = "0qf26g0a2j1mbzlc7xjackww22w9bl1x0iw3q1x6kq7fp8xiwhdn"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with lib; { description = "Run your GitHub Actions locally"; homepage = "https://github.com/nektos/act"; + changelog = "https://github.com/nektos/act/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 05d39ed56534..858e8e5a9b8f 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchurl, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { name = "patchelf-${version}"; - version = "0.10"; + version = "2020-06-03"; - src = fetchurl { - url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; - sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "patchelf"; + rev = "4aff679d9eaa1a3ec0228901a4e79b57361b4094"; + sha256 = "1i47z2dl6pgv5krl58lwy3xs327jmhy9cni3b8yampab1kh9ad1l"; }; # Drop test that fails on musl (?) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 75a960c80c50..23700a2ddc2d 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.6"; + version = "5.7"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "008v3xacgv8hw2gpqibacxs47j23161mmibf2qh9xv86mvp6i68q"; + sha256 = "1n6cfz3i2krkyvxpdp3kmxhf7sy5xp0danzaiirbk5fdkfgvb15j"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; |