diff options
Diffstat (limited to 'pkgs/applications/networking')
69 files changed, 91 insertions, 101 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 45c125985120..a3645e97e255 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -150,21 +150,11 @@ let ] ++ optionals (useVaapi) [ # source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi ./patches/chromium-vaapi.patch - ] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [ - ( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" ) - ] ++ optional stdenv.isAarch64 - (if (versionOlder version "71") then - fetchpatch { - url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; - sha256 = "0dkchqair8cy2f5a5p5vi24r9b4d28pgn2bfvm1568lypbjw6iab"; - } - else - fetchpatch { - url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; - postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64"; - sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s"; - } - ); + ] ++ optional stdenv.isAarch64 (fetchpatch { + url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; + postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64"; + sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s"; + }); postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix index 2334dc6a71e4..6dff17c69ddb 100644 --- a/pkgs/applications/networking/browsers/chromium/update.nix +++ b/pkgs/applications/networking/browsers/chromium/update.nix @@ -35,7 +35,7 @@ let "http://repo.fdzh.org/chrome/deb/pool/main/g" ]; -in rec { +in { getChannel = channel: let chanAttrs = builtins.getAttr channel sources; in { diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 4f4741ce0bdf..da6a7bc47155 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -10,7 +10,7 @@ assert enableGuile -> guile != null; assert enablePython -> python != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "elinks-0.12pre6"; src = fetchurl { diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index dea752874ddb..537a30c01a2e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -58,8 +58,8 @@ let inherit (generated) version sources; mozillaPlatforms = { - "i686-linux" = "linux-i686"; - "x86_64-linux" = "linux-x86_64"; + i686-linux = "linux-i686"; + x86_64-linux = "linux-x86_64"; }; arch = mozillaPlatforms.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 20509439d2fb..c74ac2f8dab6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -159,7 +159,7 @@ rec { }; }); -in rec { +in { icecat = iccommon rec { ffversion = "60.3.0"; @@ -249,7 +249,7 @@ in rec { in rec { - tor-browser-7-5 = (tbcommon rec { + tor-browser-7-5 = (tbcommon { ffversion = "52.9.0esr"; tbversion = "7.5.6"; @@ -265,7 +265,7 @@ in rec { gtk3Support = false; }; - tor-browser-8-5 = tbcommon rec { + tor-browser-8-5 = tbcommon { ffversion = "60.8.0esr"; tbversion = "8.5.4"; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 977b40e4a7e3..9f49925b2672 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -64,7 +64,7 @@ let suffix = if channel != "stable" then "-" + channel else ""; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; name = "google-chrome${suffix}-${version}"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 2d2d2a691006..c603dc6cf9f0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -48,7 +48,7 @@ , debug ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "flashplayer-standalone"; version = "32.0.0.238"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index fa455eb0b7a4..10ae0eb1da60 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -9,7 +9,7 @@ let url="http://nspluginwrapper.org/download/nspluginwrapper-1.4.4.tar.gz"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (srcData) name version; src = fetchurl{ diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index fc3cc2e89a91..c0cb85eb1777 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -94,7 +94,7 @@ let lang = "en-US"; srcs = { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { urls = [ "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" @@ -102,7 +102,7 @@ let sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z"; }; - "i686-linux" = fetchurl { + i686-linux = fetchurl { urls = [ "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { pname = "tor-browser-bundle-bin"; inherit version; - src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index f15bf165e826..7ff099853e29 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -71,7 +71,7 @@ let ffmpeg ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tor-browser-bundle"; version = tor-browser-unwrapped.version; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 136c14d34d48..373fa43c72c3 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -15,7 +15,7 @@ assert mouseSupport -> gpm-ncurses != null; with stdenv.lib; let - mktable = buildPackages.stdenv.mkDerivation rec { + mktable = buildPackages.stdenv.mkDerivation { name = "w3m-mktable"; inherit (w3m) src; nativeBuildInputs = [ pkgconfig boehmgc ]; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 09be379b2409..4c1f7ea77492 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -20,7 +20,7 @@ let startupNotify = "true"; }; - in stdenv.mkDerivation rec { + in stdenv.mkDerivation { pname = "charles"; inherit version; @@ -54,7 +54,7 @@ let }; }; -in rec { +in { charles4 = (generic { version = "4.2.8"; sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080"; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 438fdfb2ebac..5fc35e6a0af1 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -65,7 +65,7 @@ let installPhase = "mv hadoop-dist/target/hadoop-${version} $out"; }; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "hadoop"; inherit version; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 982f36def691..89d06474509f 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -4,7 +4,7 @@ let # Cache schema as a package so network calls are not # necessary at runtime, allowing use in package builds - schema = std |