diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-26 18:27:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 18:27:09 +0000 |
| commit | c994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5 (patch) | |
| tree | 498d17a87230f99e0a6e4b6256bb128885bc4194 /pkgs/development/tools | |
| parent | 69fca326f806e217b821a9c98493930699442c35 (diff) | |
| parent | fbaf92270556c23bb972f00d439051c8960ab97c (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/analysis/rr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/stagit/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index b63713f00073..c0121d242177 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: +{ lib, gcc9Stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: -stdenv.mkDerivation rec { +gcc9Stdenv.mkDerivation rec { version = "5.4.0"; pname = "rr"; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 1cabcfe044f3..f74698bb11ea 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "stagit"; - version = "0.9.1"; + version = "0.9.4"; src = fetchgit { url = "git://git.codemadness.org/stagit"; rev = version; - sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; + sha256 = "1n0f2pf4gmqnkx4kfn2c79zx2vk4xkg03h7wvdigijkkbhs7a3pm"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "git static site generator"; - homepage = "https://git.codemadness.org/stagit/"; + homepage = "https://git.codemadness.org/stagit/file/README.html"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jb55 ]; |