diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-21 00:02:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 00:02:24 +0000 |
| commit | 94a7cf0dcd44b08363c23e2579962b323f08a2a9 (patch) | |
| tree | 552d0bd8ed8f1f27c831713793baa0afd50c2a22 /pkgs/tools/misc | |
| parent | 6e112807d83b0bed211f0f9cecc2f5347135073d (diff) | |
| parent | 63c505b7f25f4c3582f1730f7577578ac493e5a0 (diff) | |
| download | nixpkgs-94a7cf0dcd44b08363c23e2579962b323f08a2a9.tar nixpkgs-94a7cf0dcd44b08363c23e2579962b323f08a2a9.tar.gz nixpkgs-94a7cf0dcd44b08363c23e2579962b323f08a2a9.tar.bz2 nixpkgs-94a7cf0dcd44b08363c23e2579962b323f08a2a9.tar.lz nixpkgs-94a7cf0dcd44b08363c23e2579962b323f08a2a9.tar.xz nixpkgs-94a7cf0dcd44b08363c23e2579962b323f08a2a9.tar.zst nixpkgs-94a7cf0dcd44b08363c23e2579962b323f08a2a9.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/esptool/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/zellij/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 7c7f91621b8..3fc6e96e228 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "1y022qlcdgdx5a88lkc3sqavklz494afbfyh100lp7xfk3f2mjln"; + sha256 = "sha256-GaGrV8L//pU4kt4HJmY88l5BNtT0IcZox7b24AFjPCI="; }; checkInputs = with python3.pkgs; @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = "https://github.com/espressif/esptool"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index d55353682fd..c7889b15873 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-1GG3Bvw3P77dLhvJKwq48TUWMwg+bDgzWmtrw2JixLg="; + sha256 = "sha256-IcpCE9mqR7H1+gRhHyscvXhYHOynJFtOyrSr1FiMxFc="; }; - cargoSha256 = "sha256-cqm4QCGy6eTKtEBlE2ihmh93eO7d47zlCrLY8Gp0dxM="; + cargoSha256 = "sha256-22ggPs4iVOI1LKHtW5skfSO7J/FLF8EinvcyHVO14Dw="; nativeBuildInputs = [ installShellFiles pkg-config ]; |