diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-10 12:01:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-10 12:01:42 +0000 |
| commit | 265121ef549be513ffddda5e69704238691649b9 (patch) | |
| tree | 3edc350ab5488ae964519f59f440cea756e4912e /pkgs/tools | |
| parent | 96dc7cf3d2b832a13835cd7b241eed7687abf8b5 (diff) | |
| parent | 579238da5f431b7833a9f0681663900aaf0dd1e8 (diff) | |
| download | nixpkgs-265121ef549be513ffddda5e69704238691649b9.tar nixpkgs-265121ef549be513ffddda5e69704238691649b9.tar.gz nixpkgs-265121ef549be513ffddda5e69704238691649b9.tar.bz2 nixpkgs-265121ef549be513ffddda5e69704238691649b9.tar.lz nixpkgs-265121ef549be513ffddda5e69704238691649b9.tar.xz nixpkgs-265121ef549be513ffddda5e69704238691649b9.tar.zst nixpkgs-265121ef549be513ffddda5e69704238691649b9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/admin/swapspace/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/lorri/default.nix | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/tools/admin/swapspace/default.nix b/pkgs/tools/admin/swapspace/default.nix index a6082024069..a859de99670 100644 --- a/pkgs/tools/admin/swapspace/default.nix +++ b/pkgs/tools/admin/swapspace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "swapspace"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "Tookmund"; repo = "Swapspace"; rev = "v${version}"; - sha256 = "sha256-v1kSkepZm6+S4wf86ETgQzEAZBLJ2jQBgCRdF7yvuxs="; + sha256 = "sha256-tzsw10cpu5hldkm0psWcFnWToWQejout/oGHJais6yw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 94720f11937..aabc9d0e773 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -12,10 +12,12 @@ let # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - version = "1.5.0"; - gitRev = "f4b6a135e2efb18b3a679e3946d4d070a1c45a2c"; - sha256 = "0irgzw7vwhvm97nmylj44x2dnd8pwf47gvlgw7fj58fj67a0l8fr"; - cargoSha256 = "18l7yxciqcvagsg9lykilfhr104a4qqdydjkjysxgd197xalxgzr"; + # It will copy some required files if necessary. + # Also don’t forget to run `nix-build -A lorri.tests` + version = "1.6.0"; + gitRev = "1.6.0"; + sha256 = "sha256-peelMKv9GOTPdyb1iifzlFikeayTchqaYCgeXyR5EgM="; + cargoSha256 = "sha256-UFAmTYnCqsQxBnCm1zMu+BcWIZMuuxvpF7poLlzC6Kg="; in (rustPlatform.buildRustPackage rec { pname = "lorri"; |