diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-16 00:03:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 00:03:24 +0000 |
| commit | c8608fae00ccedcad799851f850e5e926d786f5a (patch) | |
| tree | 71dccade34fab3421289300ee2557428b8deab62 /pkgs/tools/misc | |
| parent | 4d302fe767e1eaeb6d494cc9c850537f423a55b5 (diff) | |
| parent | fef077c32866909faeecfd1b1360ad108bb46c3d (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/nix-direnv/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 674ec355584a7..b07947e672ff8 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "211"; + version = "212"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-B2Ll1N9JJkBM32eGHBtTscq6MR4T+yB98LTpjz094zo="; + sha256 = "sha256-Kr8OHArnLR9AwN/s5QUSzX/puINkK1eu869OaFz3nlw="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index ae091c8d386f4..15c80f1e683d9 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-edRdnMNYB5N9v9QlfSFNqJl93X0rSCllmzSZO9+sCOg="; + sha256 = "sha256-PANJTaGdMvIPglgQCOs+fJc20ZnnHXx7rBdyoA4rQ0A="; }; # Substitute instead of wrapping because the resulting file is @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nix-community/nix-direnv"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 bbenne10 ]; }; } |