diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking')
11 files changed, 35 insertions, 32 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index c77411b6c264..5542ca62b93a 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -7,6 +7,8 @@ , application ? "browser" , applicationName ? "Mozilla Firefox" , branding ? null +, requireSigning ? true +, allowAddonSideload ? false , src , unpackPhase ? null , extraPatches ? [] @@ -367,6 +369,8 @@ buildStdenv.mkDerivation { configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key") '' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) '' export MOZILLA_OFFICIAL=1 + '' + lib.optionalString (!requireSigning) '' + export MOZ_REQUIRE_SIGNING= '' + lib.optionalString stdenv.hostPlatform.isMusl '' # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator # TODO: Default vm.max_map_count has been increased, retest without this @@ -408,6 +412,7 @@ buildStdenv.mkDerivation { # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" ++ lib.optional (!drmSupport) "--disable-eme" + ++ lib.optional (allowAddonSideload) "--allow-addon-sideload" ++ [ (enableFeature alsaSupport "alsa") (enableFeature crashreporterSupport "crashreporter") diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index c4d59bc2c149..37777f92005d 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -56,10 +56,11 @@ }; }; - firefox-devedition = (buildMozillaMach rec { + firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; version = "120.0b9"; applicationName = "Mozilla Firefox Developer Edition"; + requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; @@ -84,9 +85,7 @@ versionSuffix = "b[0-9]*"; baseUrl = "https://archive.mozilla.org/pub/devedition/releases/"; }; - }).overrideAttrs (prev: { - env.MOZ_REQUIRE_SIGNING = ""; - }); + }; firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 68f547d1f95a..25c7ac5bb659 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -115,18 +115,15 @@ let nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions); - requiresSigning = browser ? MOZ_REQUIRE_SIGNING - -> toString browser.MOZ_REQUIRE_SIGNING != ""; - # Check that every extension has a unqiue .name attribute # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" - else if requiresSigning && !lib.hasSuffix "esr" browser.name then - throw "Nix addons are only supported without signature enforcement (eg. Firefox ESR)" + else if browser.requireSigning || !browser.allowAddonSideload then + throw "Nix addons are only supported with signature enforcement disabled and addon sideloading enabled (eg. LibreWolf)" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then - throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" + throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchFirefoxAddon" else a ) (lib.optionals usesNixExtensions nixExtensions); diff --git a/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix b/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix index ec00983663b4..004746c2166f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix @@ -3,12 +3,14 @@ let librewolf-src = callPackage ./librewolf.nix { }; in -((buildMozillaMach rec { +(buildMozillaMach rec { pname = "librewolf"; applicationName = "LibreWolf"; binaryName = "librewolf"; version = librewolf-src.packageVersion; src = librewolf-src.firefox; + requireSigning = false; + allowAddonSideload = true; inherit (librewolf-src) extraConfigureFlags extraPatches extraPostPatch extraPassthru; meta = { @@ -30,6 +32,4 @@ in }).override { crashreporterSupport = false; enableOfficialBranding = false; -}).overrideAttrs (prev: { - MOZ_REQUIRE_SIGNING = ""; -}) +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index e20ad8c68e51..1764bf610eb5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.8.5"; + version = "2.9.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-oYREaXUm60AkWO/2X6Cu55F+gCaPYpYqRigJW0ocDL0="; + hash = "sha256-5oSuExdkP+69AJD5U74yLD4e+5pvbFOY6T9mcKnJ5Jw="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-KzH4GmOeurcEMIDN3B8QSMZY1Fk+tNqy0SYzCXiRVlo="; + vendorHash = "sha256-/MmcWusqgEe8KEJcEBOqOkv1lJb06R3TKYFk4wvdWHk="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index 407b0c0dd9c1..ce52fdb6a355 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.15.14"; + version = "1.15.16"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-rQZOGM97mXKFFMQRw6+iiaDLugu0CM7OW2V7w0fgpDM="; + hash = "sha256-GsT9ffQdLDxckKyf9U0sWZBf388o6ee9clrUuLJT/bA="; }; - vendorHash = "sha256-51s+C4P8xKp52qjr6LK3zWKWzwnuEQyKxi/Wzpha9Fs="; + vendorHash = "sha256-/JliAQtUd8fbKThqkwC4u4XNawXhoZaV1XdJRciJxmw="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 638a3089033f..f559df2747d8 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.53.2"; + version = "0.53.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nolZ660rU7WisQdufswrH5vqAedKlA3Y0AQMul/+sTo="; + hash = "sha256-UPbiqo0HvBEIAimugNa7WwqwPsLk8C2gS0KqfgFMGQU="; }; - vendorHash = "sha256-1+ebqMqtil2/KrFjRIfCx60aWu8ByIFV1my8RiUrSNo="; + vendorHash = "sha256-h1rDXxvPhQfGUpxOmnksy3l8kMq93nxOQ9adJFyZnOY="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix b/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix index 3099df6e9f12..ca26ee1c4b3b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-bsUnwciJ+s3lkiVXD09xQx8EAhE964/JBeggVprwkTc="; + hash = "sha256-E/M0GliZwe8aDZDtuCea5II452Zy9pD+9MmYFSkmjE8="; }; - vendorHash = "sha256-Uu7U8tjpHe/OzbQREty0X6ik6JafzYdax2762BkGacw="; + vendorHash = "sha256-VmukCrEl2hldN0kBgDycp/junmXCZsH+utNJGNjodW0="; proxyVendor = true; preBuild = '' diff --git a/nixpkgs/pkgs/applications/networking/discordo/default.nix b/nixpkgs/pkgs/applications/networking/discordo/default.nix index 87f9c4bbc19e..50112238215d 100644 --- a/nixpkgs/pkgs/applications/networking/discordo/default.nix +++ b/nixpkgs/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "unstable-2023-10-22"; + version = "unstable-2023-11-14"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "afaa155b510881efae8a9c27d3453cedc3fbb3b5"; - hash = "sha256-9Ls8IF6DoLUbUqdwqD5ncp9p/HUnAl8eaYYjnIAJcw0="; + rev = "002e382c0de1d87e2ce7fd579346da4f339880ca"; + hash = "sha256-eOlPc2WDjc73UlFH9d6Kw4/nEbjhBv4xLopxdTnFTYk="; }; - vendorHash = "sha256-11dbOoajCXMonNy9bXy4RiT9FLH/Sga4+eH5mUFDlNA="; + vendorHash = "sha256-1evMzQECqZvKJzNUk9GjrQej9vmnHs9Fm4kXJ0i5gMw="; CGO_ENABLED = 0; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 4fd9a36b0f51..3d49f47f8163 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/uowuo/abaddon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ genericnerdyusername ]; - platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix index 62f0d3933a30..027564ae7a01 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix @@ -35,6 +35,7 @@ , enableCli ? true , installLib ? false , apparmorRulesFromClosure +, extraAppArmorPaths ? [] }: stdenv.mkDerivation (finalAttrs: { @@ -134,7 +135,8 @@ stdenv.mkDerivation (finalAttrs: { r @{PROC}/@{pid}/mounts, rwk /tmp/tr_session_id_*, - r $out/share/transmission/web/**, + r $out/share/transmission/public_html/**, + ${lib.strings.concatMapStrings (x: "r ${x},\n") extraAppArmorPaths} include <local/bin.transmission-daemon> } |