diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-06 00:02:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-06 00:02:10 +0000 |
| commit | 9dd2a8b6000099ec6080aa5f0a77cb563cc0263d (patch) | |
| tree | a7b6372697c49060b43011649ef1b1e2a0978f28 /pkgs/tools/misc | |
| parent | 61655037aa1304bc7bb046b711217e989e97fefc (diff) | |
| parent | a173e92ee458878651356b9bcfb1e2b5145f76af (diff) | |
| download | nixpkgs-9dd2a8b6000099ec6080aa5f0a77cb563cc0263d.tar nixpkgs-9dd2a8b6000099ec6080aa5f0a77cb563cc0263d.tar.gz nixpkgs-9dd2a8b6000099ec6080aa5f0a77cb563cc0263d.tar.bz2 nixpkgs-9dd2a8b6000099ec6080aa5f0a77cb563cc0263d.tar.lz nixpkgs-9dd2a8b6000099ec6080aa5f0a77cb563cc0263d.tar.xz nixpkgs-9dd2a8b6000099ec6080aa5f0a77cb563cc0263d.tar.zst nixpkgs-9dd2a8b6000099ec6080aa5f0a77cb563cc0263d.zip | |
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/rauc/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 f74f7855d02..7f1655b9843 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 = "205"; + version = "207"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-Smx9trogh7E6jsH0K+FXAocN8znnMXXnN6N/QzXkdJQ="; + sha256 = "sha256-0PWnaOQV4Pj0hFMpn98xYhZDexctkweIE2ZM3ppYfvg="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index 667ce3cabe4..c99f2a46083 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.5.1"; + version = "1.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AIizbD2jaZ5SY0K/hwpHdGE20KEhWC53LWUiVYs9Oiw="; + sha256 = "sha256-HBeH9vzzfY7pG88xyoL+NJ78LMGphCAfyZiOxFSJnnc="; }; passthru = { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Safe and secure software updates for embedded Linux"; homepage = "https://rauc.io"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ emantor ]; platforms = with platforms; linux; }; |