diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-22 12:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-22 12:01:07 +0000 |
| commit | a331a49cf7bbc33aee0698d5cc6e5e458e0d73e9 (patch) | |
| tree | a1256a9c45076f24bf052b04223b8fccc7c085ec /pkgs/tools/networking | |
| parent | 418b5d9e5c316c15f7390cdbacaddd6df4e12c81 (diff) | |
| parent | 2a56c2ca6814a31f8211dad09302398a06acbcdf (diff) | |
| download | nixlib-a331a49cf7bbc33aee0698d5cc6e5e458e0d73e9.tar nixlib-a331a49cf7bbc33aee0698d5cc6e5e458e0d73e9.tar.gz nixlib-a331a49cf7bbc33aee0698d5cc6e5e458e0d73e9.tar.bz2 nixlib-a331a49cf7bbc33aee0698d5cc6e5e458e0d73e9.tar.lz nixlib-a331a49cf7bbc33aee0698d5cc6e5e458e0d73e9.tar.xz nixlib-a331a49cf7bbc33aee0698d5cc6e5e458e0d73e9.tar.zst nixlib-a331a49cf7bbc33aee0698d5cc6e5e458e0d73e9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/ockam/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/uget/default.nix | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index b50a4ff45245..a9481ba95b65 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -12,7 +12,7 @@ let pname = "ockam"; - version = "0.116.0"; + version = "0.117.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - sha256 = "sha256-dcSH/mO3cUamjOCuvEB/C24n7K5T1KnUMvTn8fVu+YM="; + sha256 = "sha256-iQ/bhrYJvvSevZGx4n1gTyfG/NvvWoQAHs6fcTT+vUc="; }; - cargoHash = "sha256-9UwPPOKg+Im+vfQFiYKS68tONYkKz1TqX7ukbtmLcRk="; + cargoHash = "sha256-WXRRZWQqgfw7priZrt+avMs2FHs4EcKwlkg5XK8hjoY="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 5f255ecb80f8..cbbb1c316949 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; + mainProgram = "uget-gtk"; }; } |