diff options
Diffstat (limited to 'pkgs/applications/networking')
12 files changed, 45 insertions, 155 deletions
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index d2f96600d787..153e208d6958 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.61.109"; + version = "1.61.114"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-vIi205FqgoQEZCV4iWCFxjH2hJNWH9HjRU94jt7Ee8A="; + hash = "sha256-AVL08Npg1nuvFJrd3rC2rCZeoLnPuQsgpvf2R623c6Y="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/crc/default.nix b/pkgs/applications/networking/cluster/crc/default.nix deleted file mode 100644 index 6f975de875db..000000000000 --- a/pkgs/applications/networking/cluster/crc/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, git -, stdenv -, testers -, crc -, runtimeShell -, coreutils -}: - -let - openShiftVersion = "4.12.5"; - okdVersion = "4.12.0-0.okd-2023-02-18-033438"; - podmanVersion = "4.3.1"; - writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; - gitHash = "sha256-zk/26cG2Rt3jpbhKgprtq2vx7pIQVi7cPUA90uoQa80="; -in -buildGoModule rec { - version = "2.15.0"; - pname = "crc"; - gitCommit = "72256c3cb00ac01519b26658dd5cfb0dd09b37a1"; - modRoot = "cmd/crc"; - - src = fetchFromGitHub { - owner = "crc-org"; - repo = "crc"; - rev = "v${version}"; - hash = gitHash; - }; - - vendorHash = null; - - nativeBuildInputs = [ git ]; - - postPatch = '' - substituteInPlace pkg/crc/oc/oc_linux_test.go \ - --replace "/bin/echo" "${coreutils}/bin/echo" - - substituteInPlace Makefile \ - --replace "/bin/bash" "${runtimeShell}" - ''; - - tags = [ "containers_image_openpgp" ]; - - ldflags = [ - "-X github.com/crc-org/crc/pkg/crc/version.crcVersion=${version}" - "-X github.com/crc-org/crc/pkg/crc/version.ocpVersion=${openShiftVersion}" - "-X github.com/crc-org/crc/pkg/crc/version.okdVersion=${okdVersion}" - "-X github.com/crc-org/crc/pkg/crc/version.podmanVersion=${podmanVersion}" - "-X github.com/crc-org/crc/pkg/crc/version.commitSha=${builtins.substring 0 8 gitCommit}" - "-X github.com/crc-org/crc/pkg/crc/segment.WriteKey=${writeKey}" - ]; - - preBuild = '' - export HOME=$(mktemp -d) - ''; - - passthru.tests.version = testers.testVersion { - package = crc; - command = '' - export HOME=$(mktemp -d) - crc version - ''; - }; - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "Manages a local OpenShift 4.x cluster or a Podman VM optimized for testing and development purposes"; - homepage = "https://crc.dev"; - license = licenses.asl20; - maintainers = with maintainers; [ matthewpi shikanime tricktron ]; - }; -} diff --git a/pkgs/applications/networking/cluster/crc/update.sh b/pkgs/applications/networking/cluster/crc/update.sh deleted file mode 100755 index 6114ee46bc09..000000000000 --- a/pkgs/applications/networking/cluster/crc/update.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused jq - -set -x -eu -o pipefail - -WORKDIR=$(mktemp -d) -trap "rm -rf ${WORKDIR}" EXIT - -NIXPKGS_CRC_FOLDER=$( - cd $(dirname ${BASH_SOURCE[0]}) - pwd -P -) -cd ${NIXPKGS_CRC_FOLDER} - -LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json -curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - https://api.github.com/repos/crc-org/crc/releases >${LATEST_TAG_RAWFILE} - -LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | - grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | head -n1) - -CRC_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') - -CRC_COMMIT=$(curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - https://api.github.com/repos/crc-org/crc/tags | - jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") - -CRC_GIT_PREFETCH=$(nix-prefetch-url --unpack https://github.com/crc-org/crc/archive/${CRC_COMMIT}.tar.gz) -CRC_GIT_HASH=$(nix hash to-sri --type sha256 ${CRC_GIT_PREFETCH}) - -FILE_MAKEFILE=${WORKDIR}/Makefile -curl --silent https://raw.githubusercontent.com/crc-org/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE - -OPENSHIFT_VERSION=$(grep 'OPENSHIFT_VERSION' ${FILE_MAKEFILE} | - head -n1 | awk '{print $3}') - -OKD_VERSION=$(grep 'OKD_VERSION' ${FILE_MAKEFILE} | - head -n1 | awk '{print $3}') - -PODMAN_VERSION=$(grep 'PODMAN_VERSION' ${FILE_MAKEFILE} | - head -n1 | awk '{print $3}') - -WRITE_KEY=$(grep '$(REPOPATH)/pkg/crc/segment.WriteKey' ${FILE_MAKEFILE} | - head -n1 | awk '{print $4}' | sed -e 's/$(REPOPATH)\/pkg\/crc\/segment.WriteKey=//g') - -sed -i "s|version = \".*\"|version = \"${CRC_VERSION:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix - -sed -i "s|gitCommit = \".*\"|gitCommit = \"${CRC_COMMIT:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix - -sed -i "s|gitHash = \".*\"|gitHash = \"${CRC_GIT_HASH}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix - -sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix - -sed -i "s|okdVersion = \".*\"|okdVersion = \"${OKD_VERSION:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix - -sed -i "s|podmanVersion = \".*\"|podmanVersion = \"${PODMAN_VERSION:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix - -sed -i "s|writeKey = \".*\"|writeKey = \"${WRITE_KEY:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix new file mode 100644 index 000000000000..1acca4d0e101 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; + sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; + sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix new file mode 100644 index 000000000000..00bc1476306d --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -0,0 +1,14 @@ +{ + k3sVersion = "1.29.0+k3s1"; + k3sCommit = "3190a5faa28d7a0d428c756d67adcab7eb11e6a5"; + k3sRepoSha256 = "1g75a7kz9nnv0vagzhggkw0zqigykimdwsmibgssa8vyjpg7idda"; + k3sVendorHash = "sha256-iHmPVjYR/ZLH9UZ5yNEApyuGQsEwtxVbQw7Pu7WrpaQ="; + chartVersions = import ./chart-versions.nix; + k3sRootVersion = "0.12.2"; + k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; + k3sCNIVersion = "1.3.0-k3s1"; + k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; + containerdVersion = "1.7.11-k3s2"; + containerdSha256 = "0279sil02wz7310xhrgmdbc0r2qibj9lafy0i9k24jdrh74icmib"; + criCtlVersion = "1.29.0-k3s1"; +} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 9611f3770e09..934f5a3691cd 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -25,4 +25,9 @@ in k3s_1_28 = common ((import ./1_28/versions.nix) // { updateScript = [ ./update-script.sh "28" ]; }) extraArgs; + + # 1_29 can be built with the same builder as 1_26 + k3s_1_29 = common ((import ./1_29/versions.nix) // { + updateScript = [ ./update-script.sh "29" ]; + }) extraArgs; } diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index b77e382b58f2..191f499c9d0f 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.30.7"; + version = "0.30.8"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-Ztdhb5AEZwlC7K7CUixb13eAD3Yp3EERJDPnmMuaCAA="; + hash = "sha256-RIk3e/rySYev5n0NLN6ZYHIx3ssfdUXnzBJ2y6Y/n5U="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 49697b777141..c205b8431a2a 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.14.7"; - sha256 = "0mrnyb98h4614aa3i3ki3gz3rsp60qy038phgmp3x9s0gq11bd23"; + version = "2.14.8"; + sha256 = "1iag3j3wr3q9sx85rj5nhzs4ygknx2xyazs5kd0vq2l8vb1ihbnn"; vendorHash = "sha256-bGl8IZppwLDS6cRO4HmflwIOhH3rOhE/9slJATe+onI="; } diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index c7a5e8e9e2b9..960598302d85 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -5,20 +5,20 @@ let in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-RchpdIS5RKe6Ck2kYQHeq5Dl+ZBWdO/+ZHuFyfYmyMc="; + sha256 = "sha256-i3R1w2SBBa5hGorvyjEfkuZVN3bE7aHcpoIrtSuS4dA="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-AUDTPFRntxk84o9f4wfai04tBMFM2ItNGc3W9lcZ1as="; + cargoHash = "sha256-aJDhLwzOgOVpH/JIrv1aczv5lvJrUlR6Oxj71XeYpSI="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 59966f01d892..9578b11fdfa6 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "wavebox"; - version = "10.119.8-2"; + version = "10.120.10-2"; src = fetchurl { url = "https://download.wavebox.app/stable/linux/tar/Wavebox_${version}.tar.gz"; - sha256 = "sha256-5xgDY/tLa1ZjlVH9ytcHa2ryw4GuvACevPfb9uFfvPE="; + sha256 = "sha256-9kA3nJUNlNHbWYkIy0iEnWCrmIYTjULdMAGGnO4JCkg="; }; # don't remove runtime deps diff --git a/pkgs/applications/networking/mailreaders/bluemail/default.nix b/pkgs/applications/networking/mailreaders/bluemail/default.nix index 50dec500870a..66874705810b 100644 --- a/pkgs/applications/networking/mailreaders/bluemail/default.nix +++ b/pkgs/applications/networking/mailreaders/bluemail/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "bluemail"; - version = "1.131.4-1795"; + version = "1.136.21-1884"; # Taking a snapshot of the DEB release because there are no tagged version releases. # For new versions, download the upstream release, extract it and check for the version string. # In case there's a new version, create a snapshot of it on https://archive.org before updating it here. src = fetchurl { - url = "https://web.archive.org/web/20220921124548/https://download.bluemail.me/BlueMail/deb/BlueMail.deb"; - sha256 = "sha256-deO+D9HSfj1YEDSO5Io0MA7H8ZK9iFSRwB/e+8GkgOU="; + url = "https://archive.org/download/blue-mail-1.136.21-1884/BlueMail.deb"; + hash = "sha256-L9mCUjsEcalVxzl80P3QzVclCKa75So2sBG7KjjBVIc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index e33af52e45e5..030450404928 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -54,7 +54,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.2.0"; + version = "4.2.1"; outputs = [ "out" "dev" ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-0ny2x5sGG/T7q8RehCKVH/vrSihWytvUDVYiMnfhh9s="; + hash = "sha256-iqRlJTkyXhgLQ1hX01RTPcWAKaUDao7OoQ74GBY5ciw="; }; patches = [ |