diff options
Diffstat (limited to 'pkgs/applications/networking')
14 files changed, 120 insertions, 65 deletions
diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 24447a40bec..4082fdbc0f4 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.15.7"; + version = "1.15.9"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-sGJfQ9sALQPxne+Q1Rf8PhCHBHupbWrIShk1dqFEPhk="; + hash = "sha256-P3NC1/ZujqSO2C4ToNLpxgbxqACXYYsAFQh1Xbbu7x4="; }; vendorHash = "sha256-KaBq1VCGWv3K50DDelS0hOQkXnK1ufBiXBtbPQFzwMY="; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 405eff58975..fe3732152d2 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-OoqmFv2cRUU/mDtDcXugx+NKwpePQzRD231YBT4xQmA="; + hash = "sha256-UGxtL8X1wEyo7jYmPw0GTvuzzQCBA3WTIowMnYSyfvM="; }; - vendorHash = "sha256-0+I0EeCguo1RPwKlnqmxgwvRfuW1CKD58PhftZDLfSg="; + vendorHash = "sha256-AbEEHG+LJB5fOm8koVQllKohtb0lqD6Kln3GCwlkb/0="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 0403f5d6431..53e37c55440 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-cwzxjK278xMqXwMQLhRhXWR2HhCKYOBMAiM4Y1B7Etk="; + hash = "sha256-e93rQRIF3CmXjQhpACxBp4WnPtQ5IJnm7H5BcHGqH0c="; }; - vendorHash = "sha256-lBOZe74SWMv+z3quIx8NEK6lqygiQAbiU4AvzuXcOKg="; + vendorHash = "sha256-YkOw4HpbX6e6uIAUa7zQPah/ifRfB4ICi90AxleKNNE="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 751f767bfac..ab02dff3160 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-7v0r5xwxlTUASkhVRbUUD+/wjvyurylqaRPmspLY/IM="; + sha256 = "sha256-L5j7+2m2zKRQ/zpmwq1OimPM6I1KmmPBzNcK+s1NIDs="; }; - vendorHash = "sha256-77KUQlOCIRxuyL/vkxK+F+WEyzDFAYaBNq+JuAmkQvY="; + vendorHash = "sha256-+x5wohzPYzff3jpqsvnDqElrBW867WLrl4RaLlRjkUk="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index ef12d8ae2e6..acead1775d2 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubevpn"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-C/GXcINuAtDdSN5CdoN62zeYlT9L6cXDTDR9S3eMP4w="; + sha256 = "sha256-fXRzo68d65FISW+m/BTmwOXlJiCmMm9Az1qsGGsbPIA="; }; - vendorHash = "sha256-24mw5ku0pQX2QNQPA9E+wowS3y0J+oKiIxuyVGcgBro="; + vendorHash = "sha256-EcHHSOAr93M2kPhEaZSpvpZCq4pi1NCedo9hw1Mn0a4="; # TODO investigate why some config tests are failing doCheck = false; diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index 38bdff136ac..8021d55156a 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke"; - version = "1.4.8"; + version = "1.4.10"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-tc3XZyn1jdjkxWXG6qjsE2udpoq+RhhIWHXGmUQyO0Y="; + hash = "sha256-rr6CN5ik4vuLNqzNPvISfRfOjTcD48pSre2K6xr6xSk="; }; - vendorHash = "sha256-MFXNwEEXtsEwB0Hcx8gn/Pz9dZM1zUUKhNYp5BlRUEk="; + vendorHash = "sha256-3bivFrn2xDyILD1ugSr7IehhNq4vkqShFQI3sbeY0iY="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index b4e85d0cff5..1e6c86915ac 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.52.0"; + version = "0.52.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7Qd3Eat133pRthoYZzL9UYmL/cqgCRRWKGuZj9kqfFo="; + hash = "sha256-t1GAcOZAYdfrI0lsyKUEBbnJaGzuFP0+Mz3Yrv4Bmik="; }; vendorHash = "sha256-NSrZVLQ3Qbnp94qCV7NbrEav/7LCRbTov+B2vzbuvdM="; diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index c7de76d279a..12d9d560760 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "unstable-2023-04-07"; + version = "unstable-2023-09-16"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "f8c58057945b1ded2f78dc0956ea25aa281a0b31"; - hash = "sha256-FUSPQK4rB0J89s+I7yhF8SQ/Q9uygQSCF9o6ltYxOk4="; + rev = "d3cdbe480392dbab6ddc099d7d880378f6a13f26"; + hash = "sha256-noCwPhp5/wYt28TM1vvsXb0ewRMV/cMzu/zUD2b0YV4="; }; - vendorHash = "sha256-fLhyyIChqh+eEzht3CSLPfx6glw0YhiTb9PsbWJafWQ="; + vendorHash = "sha256-5Y+SP374Bd8F2ABKEKRhTcGNhsFM77N5oC5wRN6AzKk="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index 4e78f0c0fcd..c6d8770415a 100644 --- a/pkgs/applications/networking/gnmic/default.nix +++ b/pkgs/applications/networking/gnmic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-aEAbIh1BH8R05SpSMSXL2IrudjIki72k7NGvjjKkxZw="; + hash = "sha256-7jykosmVG+oJ6/27x+VtlVVxq/OQIctcjB1Wjs1DcRU="; }; - vendorHash = "sha256-hIG3kG2e9Y2hnHJ+96cPLgnlp5ParsLgWQY0HZTDggY="; + vendorHash = "sha256-VjeOSnCAdG+RlIg9uIyyQ8wKUqyX5uc2RXG75q84vm4="; ldflags = [ "-s" "-w" diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index c29df0221b6..d4a8045d79c 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.96.0.207"; + version = "8.105.0.208"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-tkOPYFkmc4nzO8Rgat9/VNuzzIW10qSEzbXhjkZV83k="; + sha256 = "sha256-P1H9BSXHDmrE8x2kq4Mw5A7r2jVZGSHJh84Hn5EX2lk="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix new file mode 100644 index 00000000000..e166e156da4 --- /dev/null +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGo121Module +, cmake +, extra-cmake-modules +, git +, go_1_21 +, wrapQtAppsHook +, qtbase +, qtquickcontrols2 +, kconfig +, kcoreaddons +, kguiaddons +, ki18n +, kirigami2 +, kirigami-addons +, knotifications +}: + +let + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "f-koehler"; + repo = "KTailctl"; + rev = "v${version}"; + hash = "sha256-nY6DEHkDVWIlvc64smXb9KshrhNgNLKiilYydbMKCqc="; + }; + + goDeps = (buildGo121Module { + pname = "tailwrap"; + inherit src version; + modRoot = "tailwrap"; + vendorHash = "sha256-Y9xhoTf3vCtiNi5qOPg020EQmASo58BZI3rAoUEC8qE="; + }).goModules; +in stdenv.mkDerivation { + pname = "ktailctl"; + inherit version src; + + postPatch = '' + cp -r --reflink=auto ${goDeps} tailwrap/vendor + ''; + + # needed for go build to work + preBuild = '' + export HOME=$TMPDIR + ''; + + cmakeFlags = [ + # actually just disables Go vendoring updates + "-DKTAILCTL_FLATPAK_BUILD=ON" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + git + go_1_21 + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtquickcontrols2 + kconfig + kcoreaddons + kguiaddons + ki18n + kirigami2 + kirigami-addons + knotifications + ]; + + meta = with lib; { + description = "A GUI to monitor and manage Tailscale on your Linux desktop"; + homepage = "https://github.com/f-koehler/KTailctl"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ k900 ]; + mainProgram = "ktailctl"; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index 793f8b8d861..defb898b447 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchurl, nixosTests, openssl, pkg-config }: +{ lib +, buildGoModule +, fetchurl +, nixosTests +}: buildGoModule rec { pname = "kubo"; @@ -7,7 +11,7 @@ buildGoModule rec { passthru.repoVersion = "14"; # Also update kubo-migrator when changing the repo version - # Kubo makes changes to it's source tarball that don't match the git source. + # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; hash = "sha256-TX5ZM8Kyj3LZ12Ro7MsHRd+P5XLk/mU7DUxZaopSEV0="; diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index b3b69571ade..e3234af43da 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, rust , rustPlatform , fetchFromGitHub , substituteAll @@ -22,23 +21,16 @@ rustPlatform.buildRustPackage rec { pname = "celeste"; - version = "0.5.8"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hwittenborn"; repo = "celeste"; rev = "v${version}"; - hash = "sha256-U/6aqQig+uuWj/B9CODnV6chxY+KfMH7DqnPtSTDSA0="; + hash = "sha256-fqPAQCbuPnFyn3wioWDETmcXu53808nvnlEzcdUevI4="; }; - cargoHash = "sha256-69LK/oicfmSPbUGGzWV9kvXkHqMvEzCG8xCu61MxSdk="; - - patches = [ - (substituteAll { - src = ./target-dir.patch; - rustTarget = rust.toRustTarget stdenv.hostPlatform; - }) - ]; + cargoHash = "sha256-mVl7CsCX7HMlGC2EIKEfHnPNjmrexjsrpDK/Uq/GwpY="; postPatch = '' pushd $cargoDepsCopy/librclone-sys @@ -61,14 +53,6 @@ rustPlatform.buildRustPackage rec { cargo update --offline ''; - # We need to build celeste-tray first because celeste/src/launch.rs reads that file at build time. - # Upstream does the same: https://github.com/hwittenborn/celeste/blob/765dfa2/justfile#L1-L3 - cargoBuildFlags = [ "--bin" "celeste-tray" ]; - postConfigure = '' - cargoBuildHook - cargoBuildFlags= - ''; - RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sync/celeste/target-dir.patch b/pkgs/applications/networking/sync/celeste/target-dir.patch deleted file mode 100644 index a8da72e77f7..00000000000 --- a/pkgs/applications/networking/sync/celeste/target-dir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/celeste/src/launch.rs b/celeste/src/launch.rs -index 5227170..e3cf189 100644 ---- a/celeste/src/launch.rs -+++ b/celeste/src/launch.rs -@@ -172,10 +172,7 @@ impl TrayApp { - perms.set_mode(0o755); - file.set_permissions(perms).unwrap(); - -- #[cfg(debug_assertions)] -- let tray_file = include_bytes!("../../target/debug/celeste-tray"); -- #[cfg(not(debug_assertions))] -- let tray_file = include_bytes!("../../target/release/celeste-tray"); -+ let tray_file = include_bytes!(concat!("../../target/@rustTarget@/", env!("cargoBuildType"), "/celeste-tray")); - - file.write_all(tray_file).unwrap(); - drop(file); |