diff options
Diffstat (limited to 'pkgs/applications/networking')
6 files changed, 17 insertions, 20 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index acf1e6a7ee67..7d54db22fa8a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -106,7 +106,7 @@ let versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - ungoogled-version = (importJSON ./upstream-info.json).ungoogled.version; + ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version; in if versionAtLeast ungoogled-version upto-version then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." result @@ -152,8 +152,12 @@ let patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags - # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) - ]; + # ++ optional (versionRange "68" "72") (githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000") + ] ++ optional (versionRange "89" "90") (githubPatch + # To fix the build of chromiumBeta: + "b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs + "1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x" + ); postPatch = '' # remove unused third-party diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 51ae1202a378..f2071494f168 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.13.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "1hlj7i7pjyvrf9cpx6s41sdn7wjwfk7c0akx45kw662vrxcqcgf2"; + sha256 = "sha256-sUeXzmgSOkpqzqrX9+wNGj2X7gcf5QSpavXK4MJe8qE="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index e0a6cd48d6ea..ef85494bd140 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -1,22 +1,15 @@ { lib, python3 }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - tornado = super.tornado_5; - }; - }; -in with python.pkgs; buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "luigi"; version = "3.0.2"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; - propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ]; + propagatedBuildInputs = with python3.pkgs; [ dateutil tornado python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 995070066e0f..d52d00f9a056 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jmeter"; - version = "5.4"; + version = "5.4.1"; src = fetchurl { url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz"; - sha256 = "1hbyvh0hrvfvrsf7wpnwqsry5gaziac632s0bwb5zbq6y5b0z41a"; + sha256 = "sha256-TtrpmIHRzbUEiYesy9ArPzza3qShCNFtB/sVJe9hLPM="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 5caaa9ce6e1e..48a212b4ffb1 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ optional sslSupport "--enable-ssl"; meta = { - homepage = "http://sylpheed.sraoss.jp/en/"; + homepage = "https://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index 366ed9408ef2..b65ba8d94cf1 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.9.6"; + version = "1.10.1"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-TIXckwesu6BTPr3GBRTgegLplwTKHtmjv3yl1c0nvbY="; + sha256 = "sha256-hMI6zq176p7MI4cjMSeQ8T8UvibJW60lzsPmeAOi3ow="; }; vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc="; |