diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index c0b92a986c7c..709d8a6edd8f 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -9,10 +9,6 @@ on: pull_request_target: types: [closed, labeled] -concurrency: - group: backport-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }} - cancel-in-progress: true - permissions: contents: read issues: write diff --git a/ci/labels/labels.cjs b/ci/labels/labels.cjs index 5527059f6e45..809dc4581bb8 100644 --- a/ci/labels/labels.cjs +++ b/ci/labels/labels.cjs @@ -235,7 +235,7 @@ module.exports = async function ({ github, context, core, dry }) { const itemLabels = {} - if (item.pull_request) { + if (item.pull_request || context.payload.pull_request) { stats.prs++ Object.assign(itemLabels, await handlePullRequest(item)) } else { diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 6f0aba9c12f6..65fab8648614 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -782,7 +782,7 @@ in ) "k3s: Images are only imported on nodes with an enabled agent, they will be ignored by this node") ++ (lib.optional ( cfg.role == "agent" && cfg.configPath == null && cfg.serverAddr == "" - ) "k3s: ServerAddr or configPath (with 'server' key) should be set if role is 'agent'") + ) "k3s: serverAddr or configPath (with 'server' key) should be set if role is 'agent'") ++ (lib.optional (cfg.role == "agent" && cfg.configPath == null && cfg.tokenFile == null && cfg.token == "") "k3s: Token or tokenFile or configPath (with 'token' or 'token-file' keys) should be set if role is 'agent'" diff --git a/nixos/modules/services/networking/r53-ddns.nix b/nixos/modules/services/networking/r53-ddns.nix index 6ca8499fe7e6..425b8cb84ca3 100644 --- a/nixos/modules/services/networking/r53-ddns.nix +++ b/nixos/modules/services/networking/r53-ddns.nix @@ -41,6 +41,11 @@ in ''; }; + ttl = mkOption { + type = types.int; + description = "The TTL for the generated record"; + }; + environmentFile = mkOption { type = types.str; description = '' @@ -68,7 +73,8 @@ in serviceConfig = { ExecStart = "${pkg}/bin/r53-ddns -zone-id ${cfg.zoneID} -domain ${cfg.domain}" - + lib.optionalString (cfg.hostname != null) " -hostname ${cfg.hostname}"; + + lib.optionalString (cfg.hostname != null) " -hostname ${cfg.hostname}" + + lib.optionalString (cfg.ttl != null) " -ttl ${toString cfg.ttl}"; EnvironmentFile = "${cfg.environmentFile}"; DynamicUser = true; }; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 97831f494d13..8b162f4f15ef 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -355,6 +355,7 @@ in jobClasses = lib.mkOption { type = listOf (enum [ "default" + "fasp" "push" "pull" "mailers" diff --git a/pkgs/applications/audio/mopidy/bandcamp.nix b/pkgs/applications/audio/mopidy/bandcamp.nix index 6e4e4e71f0bd..c389c1cad22e 100644 --- a/pkgs/applications/audio/mopidy/bandcamp.nix +++ b/pkgs/applications/audio/mopidy/bandcamp.nix @@ -1,24 +1,32 @@ { lib, - python3Packages, + pythonPackages, fetchPypi, mopidy, }: -python3Packages.buildPythonApplication rec { - pname = "Mopidy-Bandcamp"; +pythonPackages.buildPythonApplication rec { + pname = "mopidy-bandcamp"; version = "1.1.5"; - format = "setuptools"; + pyproject = true; + src = fetchPypi { - inherit pname version; + inherit version; + pname = "Mopidy-Bandcamp"; hash = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ="; }; - propagatedBuildInputs = with python3Packages; [ - mopidy - pykka + build-system = [ + pythonPackages.setuptools ]; + dependencies = [ + mopidy + pythonPackages.pykka + ]; + + pythonImportsCheck = [ "mopidy_bandcamp" ]; + meta = with lib; { description = "Mopidy extension for playing music from bandcamp"; homepage = "https://github.com/impliedchaos/mopidy-bandcamp"; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 902d2cd68161..7165c58740a4 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -1,33 +1,37 @@ { lib, - python3Packages, + pythonPackages, fetchPypi, mopidy, }: -python3Packages.buildPythonApplication rec { - pname = "Mopidy-Iris"; +pythonPackages.buildPythonApplication rec { + pname = "mopidy-iris"; version = "3.69.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit version; + pname = "Mopidy-Iris"; hash = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4="; }; - propagatedBuildInputs = - [ - mopidy - ] - ++ (with python3Packages; [ - configobj - requests - tornado - ]); + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ + mopidy + pythonPackages.configobj + pythonPackages.requests + pythonPackages.tornado + ]; # no tests implemented doCheck = false; + pythonImportsCheck = [ "mopidy_iris" ]; + meta = with lib; { homepage = "https://github.com/jaedb/Iris"; description = "Fully-functional Mopidy web client encompassing Spotify and many other backends"; diff --git a/pkgs/applications/audio/mopidy/jellyfin.nix b/pkgs/applications/audio/mopidy/jellyfin.nix index 556b8db53cd3..6c407dd3c02e 100644 --- a/pkgs/applications/audio/mopidy/jellyfin.nix +++ b/pkgs/applications/audio/mopidy/jellyfin.nix @@ -1,14 +1,14 @@ { lib, - python3Packages, + pythonPackages, fetchPypi, mopidy, }: -python3Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mopidy-jellyfin"; version = "1.0.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -16,10 +16,12 @@ python3Packages.buildPythonApplication rec { hash = "sha256-IKCPypMuluR0+mMALp8lB1oB1pSw4rN4rOl/eKn+Qvo="; }; - propagatedBuildInputs = [ + build-system = [ pythonPackages.setuptools ]; + + dependencies = [ mopidy - python3Packages.unidecode - python3Packages.websocket-client + pythonPackages.unidecode + pythonPackages.websocket-client ]; # no tests implemented diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index ca3af96f5589..ddb91a8c01ab 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -1,14 +1,14 @@ { lib, mopidy, - python3Packages, + pythonPackages, fetchPypi, }: -python3Packages.buildPythonApplication rec { - pname = "Mopidy-Local"; +pythonPackages.buildPythonApplication rec { + pname = "mopidy-local"; version = "3.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -16,15 +16,21 @@ python3Packages.buildPythonApplication rec { hash = "sha256-y6btbGk5UiVan178x7d9jq5OTnKMbuliHv0aRxuZK3o="; }; - propagatedBuildInputs = [ + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ mopidy - python3Packages.uritools + pythonPackages.uritools ]; nativeCheckInputs = [ - python3Packages.pytestCheckHook + pythonPackages.pytestCheckHook ]; + pythonImportsCheck = [ "mopidy_local" ]; + meta = with lib; { homepage = "https://github.com/mopidy/mopidy-local"; description = "Mopidy extension for playing music from your local music archive"; diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index 6a6cbcdac100..21e8c5a1cd58 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -7,22 +7,28 @@ }: pythonPackages.buildPythonApplication rec { - pname = "Mopidy-Moped"; + pname = "mopidy-moped"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit version; + pname = "Mopidy-Moped"; sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4"; }; LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ mopidy ]; + + build-system = [ pythonPackages.setuptools ]; + + dependencies = [ mopidy ]; # no tests implemented doCheck = false; + pythonImportsCheck = [ "mopidy_moped" ]; + meta = with lib; { homepage = "https://github.com/martijnboland/moped"; description = "Web client for Mopidy"; diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index d6a98f1cf042..d4446a098ffa 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -14,13 +14,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy"; version = "3.4.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-2OFav2HaQq/RphmZxLyL1n3suwzt1Y/d4h33EdbStjk="; + tag = "v${version}"; + hash = "sha256-2OFav2HaQq/RphmZxLyL1n3suwzt1Y/d4h33EdbStjk="; }; nativeBuildInputs = [ wrapGAppsNoGuiHook ]; @@ -50,25 +50,26 @@ pythonPackages.buildPythonApplication rec { } )) ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) pipewire; - - propagatedBuildInputs = - [ gobject-introspection ] - ++ ( - with pythonPackages; - [ - gst-python - pygobject3 - pykka - requests - setuptools - tornado - ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python - ); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pipewire ]; propagatedNativeBuildInputs = [ gobject-introspection ]; + propagatedBuildInputs = [ gobject-introspection ]; + + build-system = [ pythonPackages.setuptools ]; + + dependencies = + with pythonPackages; + [ + gst-python + pygobject3 + pykka + requests + setuptools + tornado + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ dbus-python ]; + # There are no tests doCheck = false; diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index 7564c1a63ad3..5fc4a93ed6b7 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -6,23 +6,30 @@ }: pythonPackages.buildPythonApplication rec { - pname = "Mopidy-Mopify"; + pname = "mopidy-mopify"; version = "1.7.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit version; + pname = "Mopidy-Mopify"; hash = "sha256-RlCC+39zC+LeA/QDWPHYx5TrEwOgVrnvcH1Xg12qSLE="; }; - propagatedBuildInputs = with pythonPackages; [ + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ mopidy - configobj + pythonPackages.configobj ]; # no tests implemented doCheck = false; + pythonImportsCheck = [ "mopidy_mopify" ]; + meta = with lib; { homepage = "https://github.com/dirkgroenen/mopidy-mopify"; description = "Mopidy webclient based on the Spotify webbased interface"; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index 3a49579d1dad..bcdac00f619b 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -1,21 +1,24 @@ { lib, - python3Packages, + pythonPackages, fetchPypi, mopidy, }: -python3Packages.buildPythonApplication rec { - pname = "Mopidy-MPD"; +pythonPackages.buildPythonApplication rec { + pname = "mopidy-mpd"; version = "3.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit version; + pname = "Mopidy-MPD"; hash = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; }; - propagatedBuildInputs = [ mopidy ]; + build-system = [ pythonPackages.setuptools ]; + + dependencies = [ mopidy ]; # no tests implemented doCheck = false; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 56cfbfc462e6..259a94fa18a3 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -1,14 +1,14 @@ { lib, - python3Packages, + pythonPackages, fetchPypi, mopidy, }: -python3Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mopidy-mpris"; version = "3.0.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -16,13 +16,19 @@ python3Packages.buildPythonApplication rec { hash = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U="; }; - propagatedBuildInputs = [ + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ mopidy - python3Packages.pydbus + pythonPackages.pydbus ]; doCheck = false; + pythonImportsCheck = [ "mopidy_mpris" ]; + meta = with lib; { homepage = "https://www.mopidy.com/"; description = "Mopidy extension for controlling Mopidy through D-Bus using the MPRIS specification"; diff --git a/pkgs/applications/audio/mopidy/muse.nix b/pkgs/applications/audio/mopidy/muse.nix index 24f4e5ad06fe..28bddda5fd51 100644 --- a/pkgs/applications/audio/mopidy/muse.nix +++ b/pkgs/applications/audio/mopidy/muse.nix @@ -8,7 +8,7 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-muse"; version = "0.0.33"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -16,7 +16,11 @@ pythonPackages.buildPythonApplication rec { hash = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs="; }; - propagatedBuildInputs = [ + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ mopidy pythonPackages.pykka ]; diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index 53d70fac4768..62ab22911d3b 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -8,16 +8,20 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-musicbox-webclient"; version = "3.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pimusicbox"; - repo = pname; - rev = "v${version}"; + repo = "mopidy-musicbox-webclient"; + tag = "v${version}"; sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9"; }; - propagatedBuildInputs = [ + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix index 26ad581b3263..ea989b951e49 100644 --- a/pkgs/applications/audio/mopidy/notify.nix +++ b/pkgs/applications/audio/mopidy/notify.nix @@ -6,16 +6,23 @@ }: pythonPackages.buildPythonApplication rec { - pname = "Mopidy-Notify"; + pname = "mopidy-notify"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit version; + pname = "Mopidy-Notify"; hash = "sha256-8FT4O4k0wEsdHA1vJaOW9UamJ3QLyO47HwL5XcSU3Pc="; }; - propagatedBuildInputs = [ + build-system = [ + pythonPackages.setuptools + ]; + + pythonRelaxDeps = [ "pykka" ]; + + dependencies = [ mopidy pythonPackages.pydbus ]; diff --git a/pkgs/applications/audio/mopidy/podcast.nix b/pkgs/applications/audio/mopidy/podcast.nix index 4ccc51f301aa..493e2a1f4bd2 100644 --- a/pkgs/applications/audio/mopidy/podcast.nix +++ b/pkgs/applications/audio/mopidy/podcast.nix @@ -1,14 +1,14 @@ { lib, - python3Packages, + pythonPackages, fetchPypi, mopidy, }: -python3Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mopidy-podcast"; version = "3.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -16,16 +16,22 @@ python3Packages.buildPythonApplication rec { hash = "sha256-grNPVEVM2PlpYhBXe6sabFjWVB9+q+apIRjcHUxH52A="; }; - propagatedBuildInputs = [ - mopidy - python3Packages.cachetools - python3Packages.uritools + build-system = [ + pythonPackages.setuptools ]; - nativeCheckInputs = with python3Packages; [ - pytestCheckHook + dependencies = [ + mopidy + pythonPackages.cachetools + pythonPackages.uritools ]; + nativeCheckInputs = [ + pythonPackages.pytestCheckHook + ]; + + pythonImportsCheck = [ "mopidy_podcast" ]; + meta = with lib; { homepage = "https://github.com/tkem/mopidy-podcast"; description = "Mopidy extension for browsing and playing podcasts"; diff --git a/pkgs/applications/audio/mopidy/scrobbler.nix b/pkgs/applications/audio/mopidy/scrobbler.nix index c45c31cb343b..e47f85beb1a4 100644 --- a/pkgs/applications/audio/mopidy/scrobbler.nix +++ b/pkgs/applications/audio/mopidy/scrobbler.nix @@ -1,23 +1,28 @@ { lib, - python3Packages, + pythonPackages, fetchPypi, mopidy, }: -python3Packages.buildPythonApplication rec { - pname = "Mopidy-Scrobbler"; +pythonPackages.buildPythonApplication rec { + pname = "mopidy-scrobbler"; version = "2.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit version; + pname = "Mopidy-Scrobbler"; sha256 = "11vxgax4xgkggnq4fr1rh2rcvzspkkimck5p3h4phdj3qpnj0680"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ mopidy - pylast + pythonPackages.pylast ]; # no tests implemented diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix index 9266b034919b..cda376c41281 100644 --- a/pkgs/applications/audio/mopidy/somafm.nix +++ b/pkgs/applications/audio/mopidy/somafm.nix @@ -1,14 +1,14 @@ { lib, - python3Packages, + pythonPackages, fetchPypi, mopidy, }: -python3Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mopidy-somafm"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -16,10 +16,18 @@ python3Packages.buildPythonApplication rec { sha256 = "DC0emxkoWfjGHih2C8nINBFByf521Xf+3Ks4JRxNPLM="; }; - propagatedBuildInputs = [ mopidy ]; + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ + mopidy + ]; doCheck = false; + pythonImportsCheck = [ "mopidy_somafm" ]; + meta = with lib; { homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from SomaFM"; diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index 2295b41d258d..61dbcc2aa640 100644 --- a/pkgs/applications/audio/mopidy/soundcloud.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -8,22 +8,28 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-soundcloud"; version = "3.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-soundcloud"; - rev = "v${version}"; + tag = "v${version}"; sha256 = "sha256-1Qqbfw6NZ+2K1w+abMBfWo0RAmIRbNyIErEmalmWJ0s="; }; - propagatedBuildInputs = [ + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ mopidy pythonPackages.beautifulsoup4 ]; doCheck = false; + pythonImportsCheck = [ "mopidy_soundcloud" ]; + meta = with lib; { description = "Mopidy extension for playing music from SoundCloud"; license = licenses.mit; diff --git a/pkgs/applications/audio/mopidy/subidy.nix b/pkgs/applications/audio/mopidy/subidy.nix index 618fd5e4242e..6050da53fb29 100644 --- a/pkgs/applications/audio/mopidy/subidy.nix +++ b/pkgs/applications/audio/mopidy/subidy.nix @@ -8,21 +8,29 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-subidy"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Prior99"; - repo = pname; - rev = version; + repo = "mopidy-subidy"; + tag = version; sha256 = "0c5ghhhrj5v3yp4zmll9ari6r5c6ha8c1izwqshvadn40b02q7xz"; }; - propagatedBuildInputs = [ + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ mopidy pythonPackages.py-sonic ]; - nativeCheckInputs = with pythonPackages; [ pytestCheckHook ]; + nativeCheckInputs = [ + pythonPackages.pytestCheckHook + ]; + + pythonImportsCheck = [ "mopidy_subidy" ]; meta = with lib; { homepage = "https://www.mopidy.com/"; diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index 778550beb0a1..a356e13e76e6 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -1,14 +1,14 @@ { lib, - python3Packages, + pythonPackages, fetchPypi, mopidy, }: -python3Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mopidy-tunein"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -16,7 +16,11 @@ python3Packages.buildPythonApplication rec { sha256 = "01y1asylscr73yqx071imhrzfzlg07wmqqzkdvpgm6r35marc2li"; }; - propagatedBuildInputs = [ + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index cd57667b427c..d10ac97b1975 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,44 +1,24 @@ { lib, fetchFromGitHub, - python3, + pythonPackages, mopidy, - yt-dlp, + pkgs, extraPkgs ? pkgs: [ ], }: -python3.pkgs.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mopidy-youtube"; version = "3.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "natumbri"; - repo = pname; - rev = "refs/tags/v${version}"; + repo = "mopidy-youtube"; + tag = "v${version}"; hash = "sha256-iFt7r8Ljymc+grNJiOClTHkZOeo7AcYpcNc8tLMPROk="; }; - propagatedBuildInputs = - with python3.pkgs; - [ - beautifulsoup4 - cachetools - pykka - requests - ytmusicapi - ] - ++ [ - mopidy - yt-dlp - ] - ++ extraPkgs pkgs; - - nativeCheckInputs = with python3.pkgs; [ - vcrpy - pytestCheckHook - ]; - postPatch = '' substituteInPlace mopidy_youtube/youtube.py \ --replace-fail 'youtube_dl_package = "youtube_dl"' 'youtube_dl_package = "yt_dlp"' @@ -49,6 +29,25 @@ python3.pkgs.buildPythonApplication rec { --replace-fail '"youtube_dl_package": "youtube_dl",' '"youtube_dl_package": "yt_dlp",' ''; + build-system = [ + pythonPackages.setuptools + ]; + + dependencies = [ + mopidy + pythonPackages.beautifulsoup4 + pythonPackages.cachetools + pythonPackages.pykka + pythonPackages.requests + pythonPackages.ytmusicapi + pythonPackages.yt-dlp + ] ++ extraPkgs pkgs; # should we remove this? If we do, don't forget to also change the docs! + + nativeCheckInputs = with pythonPackages; [ + vcrpy + pytestCheckHook + ]; + disabledTests = [ # Test requires a YouTube API key "test_get_default_config" diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index 4e69d743cd05..f9504220ef5a 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -3,8 +3,7 @@ buildPythonApplication, fetchFromGitHub, configargparse, - setuptools, - poetry-core, + hatchling, rbw, waylandSupport ? false, @@ -18,19 +17,18 @@ buildPythonApplication rec { pname = "rofi-rbw"; - version = "1.4.2"; + version = "1.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofi-rbw"; tag = version; - hash = "sha256-wUb89GkNB2lEfb42hMvcxpbjc1O+wx8AkFjq7aJwAko="; + hash = "sha256-Qdbz3UjWMCuJUzR6UMt/apt+OjMAr2U7uMtv9wxEZKE="; }; nativeBuildInputs = [ - setuptools - poetry-core + hatchling ]; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix index f4b3e1e046ab..ea56b90297f6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix @@ -1,1193 +1,1193 @@ { - version = "128.11.1esr"; + version = "140.0.1esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/af/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/af/thunderbird-140.0.1esr.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "4c5d8bfcfa05423efd1f4d0fd0848ff72ab9fd31ff3e9eb11f3685c5dfb68e04"; + sha256 = "06f915e75f3a2b5854ca5291b2996c6829044ba5c951b5e0589afba0cee3165c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ar/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ar/thunderbird-140.0.1esr.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "c40f9151efc1a580fd822ed0eaadb35ce56df7f9ec52941eb01252602f0f0d54"; + sha256 = "f9e977ea29c2323477e689dd245fea48b6986bbfc5cb5bf1c11ff1816129a6ec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ast/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ast/thunderbird-140.0.1esr.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "7a519cee82ec611073e8b0ae4b24ca59b21cccd46e795d699330fb87f65ed1eb"; + sha256 = "bfb135159eace51cebca93a67a04b26bb8193ca74380bf91925e44b8f5f35062"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/be/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/be/thunderbird-140.0.1esr.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "eca443f0501b7441c71c71f88b0710dc7c75e28e90819e74b2f920959b30c7bb"; + sha256 = "87e4805cb4d75c099933fe130b2e9e49cce6d4ffcae96a5db4e7063f15015c0e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/bg/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/bg/thunderbird-140.0.1esr.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "eb8a824f9dc96d6ad19b612969d6643a1f2e90e7898eaf0998bc95c97bc0a0d2"; + sha256 = "73070f8fd509855e168f9017e0a055c2fc82491672defc5254628493739bc172"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/br/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/br/thunderbird-140.0.1esr.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5f9fd740cacd732375a65d9afa85447f5ac6d1d3d24303ffd6f5d8c524aadb10"; + sha256 = "0bc1e74090f65343bb02693192dc2e089bbf794f24779260ec1e9b0b38bfaca2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ca/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ca/thunderbird-140.0.1esr.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "548b0a8d16cc7ef934974b71fc292f3b25dda8df187d24ad6325a3ec728159e9"; + sha256 = "165c01a14e5cb97ef930061c91b35359de51f34099726d4e41cf36daa01997c7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/cak/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cak/thunderbird-140.0.1esr.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b4c6a6ff1826481a6344eb02cd02de7b36c11741e36092e3067ec2f8611e8896"; + sha256 = "fe15b4171d98d5c4efc5fb3ec1900acb1a2b3e5d95352b16f6447845fe346d7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/cs/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cs/thunderbird-140.0.1esr.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "5ed093659df290708a4c5491a735cfacd48b05c0c3ac12fb5b4866bafe88ed7f"; + sha256 = "6d352b072fc5c8a30c1bea470ece25f02e4e28819252beb3315d5a25310050a8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/cy/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cy/thunderbird-140.0.1esr.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "faaed9ba9c8c77d5746fb2281b909fead2a9c4bf22693228540fc706c5263d98"; + sha256 = "9850cab77ccb9f190e891d54b41870027f954fe0d7181125ed561fb8bd8a25c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/da/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/da/thunderbird-140.0.1esr.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "4f45cbc3ecff2e608c210ae2cb9ea1cdbd4a31a7133044b7e37e0fe3d51e1dd0"; + sha256 = "b5d83580e2a47f47294eb1c44b99e76ff3197a452c0bf0d6b43aa0b8a9304cec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/de/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/de/thunderbird-140.0.1esr.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "00f55afea34eace46798661c3f4fd15deb5fb23f6fce595af15a8628e81fce74"; + sha256 = "d2350a93bb8dee76c66b803938f03f26e090a6f0a8479cd3caaa6ce53cd971ed"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/dsb/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/dsb/thunderbird-140.0.1esr.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5cefcd091aaab2e2d7dff6215bb32cc750f59c245688b67908d8350ea4c6aa8f"; + sha256 = "22bd1b90d9f66935c36bd401fb26f06e4e9058efffd57b11497b562c64c33232"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/el/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/el/thunderbird-140.0.1esr.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "09fb56913dcf3b5a4a5aac77aec83d2981211dd12160382e6de6f8de08521419"; + sha256 = "d76b19a19955894a8c5e41c141462ee461777dc835f3f0521b0002b72a5e69ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/en-CA/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-CA/thunderbird-140.0.1esr.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "48c1fef2388352fed9a4aca79bf8b08e45a5de7bb8f0c14ce7024559f5ade487"; + sha256 = "9640f19005a7edab422d8f6ae8f30ff5972e7ba4d2ea3a4e33327af179ac3bb8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/en-GB/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-GB/thunderbird-140.0.1esr.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "7d58ff808050a56f3d15429926947909a85a08b918f5c998d1b3dbbb92fa20b6"; + sha256 = "aad201099bfc714adf49a2c48f6014d032aa0b769a5fc36a79b1c69d45e7214a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/en-US/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-US/thunderbird-140.0.1esr.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a9ce7e6d976fcb6f666ac8bbda0341eb88325de92d46cbf650402014cc94cc1d"; + sha256 = "80cf82ad997397830e740dd9d9434251339ac070330bf733117b465b659151f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/es-AR/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-AR/thunderbird-140.0.1esr.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "4a0d95b1eed90999ab1a991cb485004955d6fa657f0606cde3836bda436f624b"; + sha256 = "d08a3bcd79614df769d394ab26adca2aa2af9555b81cc21907e5427a06688998"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/es-ES/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-ES/thunderbird-140.0.1esr.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f566a2f28b45d7babac97c1fd5e91ecd613493f62a6bb27e6f28f2f63dd05b83"; + sha256 = "e5c869674940aa0d250709e3e7f863c63fc16441fb3d42b2eb4748700407c1c9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/es-MX/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-MX/thunderbird-140.0.1esr.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "aa579b2eb5106ed37cc7a80bb9a69cbed691e54bef0c154f350baf9024e96c66"; + sha256 = "56b7a598b06101368f30ff3e6af79f6a14fdeb42eb2f4480c4c01cdf586528e3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/et/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/et/thunderbird-140.0.1esr.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "0ec388dc71bb31a4729cc34b348f7ef6c1aa456e75958e18f0e1a0aa3487485c"; + sha256 = "c15efe7a3ee01ac382647f6fae52cda012e8164246eabe9ce70e099d3984de2d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/eu/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/eu/thunderbird-140.0.1esr.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c3a0a7a08eefa9b20c7eb0f00b380f3b59019585587ef7a7c7518376426eb717"; + sha256 = "6c6731ad5e8fb00495029d281063bb2d66f7a76fe4ff827019c2647ffe8da223"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/fi/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fi/thunderbird-140.0.1esr.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "48724600f5dbee5d8bf01025fd85fd8605ae3328cbba36a0cf66a5fb36f76215"; + sha256 = "d9f7a2c19e1982a043b8cdcdfff935541810744fda6128a2049bb1594dedfbae"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/fr/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fr/thunderbird-140.0.1esr.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9d046568bdb3914fb039ccd7ed9f7a6eb57ab8ec654be89c4e7a46e7b09e106b"; + sha256 = "369acae933d265958e9d5fcfdba0acffa7bd439ec37e7b5fb374653f2ad04522"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/fy-NL/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fy-NL/thunderbird-140.0.1esr.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "1928a51ce10f959ba5774d278e79fa65d3fa9518d9f51f6401bbf48ea9722192"; + sha256 = "046e818ec7a8beeaaaf09446f8d8696dd76ac2e8b77c81a64e5c1dac55253fef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ga-IE/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ga-IE/thunderbird-140.0.1esr.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "d3cb2ae096f89d4435df4f478b3fbd10a48fcb99dd53f3fd9e1ab63fb4fe2075"; + sha256 = "37c56eb7e5b5d954ff410195e215c2c0027a3bbec9a48a33385ec11d77cef8f1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/gd/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/gd/thunderbird-140.0.1esr.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ed52f16a9c754d7e12bdc7bc6bb5d3c3273352569ac075120426bc54c495d404"; + sha256 = "79f15b5de5d952bd8bcafa04bad730dcff9c9acbdec4ebf0bdadb8cffe6822f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/gl/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/gl/thunderbird-140.0.1esr.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b160144e23fb630f522fe0ddcb474c547f7f2c81c566611bd3139ac43cebdf9a"; + sha256 = "91ff57794a1c65c972568e15a1f9052b191ed326587043988199a4fa725fcd5e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/he/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/he/thunderbird-140.0.1esr.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "08088bd8e492ee0f0408bd1126b4f0bf1dc713bfea540d0fe646ec1813705e5a"; + sha256 = "3cbed1bb7a7b90badf41f54babc59303e8a3d63eb891a19a0e6c93199798404e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hr/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hr/thunderbird-140.0.1esr.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "30a797e5eda3b45cfaec58d4af61ec8ebedccfd8c7f7fcbd875bbb0f5bb1a2bd"; + sha256 = "5635413f7f86d8bf5ccec7ef98b5a72e724b96e41d7079851e1bac2cf57d8062"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hsb/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hsb/thunderbird-140.0.1esr.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "edec321ce22bbc1f23186acc526afddf7fe1f31542609f176550f2d064cff8c9"; + sha256 = "6aba8d1ebfa2fb886477a5250f4ce16bb216f7c475ab56faa1bcc2598e3e360c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hu/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hu/thunderbird-140.0.1esr.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b09425982fb5268104f41f6c9f4575c2a0c826c493131da48044f6916a53ff8d"; + sha256 = "97274a67e2632130a081f25836068ed1d629b0e24ef65a86b85e2f1dc50314a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hy-AM/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hy-AM/thunderbird-140.0.1esr.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "08db6f74f258e21a23a730a5dd9725c75d1e3125f164f41ba1023fa43bc2ba19"; + sha256 = "b3cc90a46dd5a0604ecc6dba3129dc999f6ccdafbf559dc6abad476b9f644ff6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/id/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/id/thunderbird-140.0.1esr.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "737bdcba6ada377cc8729fb4b5ad115062dca1398949cdffab12bcfbacbbeb09"; + sha256 = "015e2ac23a0129ee0bb4f8c078f6d604361b2b08cecb54e0ecd98e82f8c87606"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/is/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/is/thunderbird-140.0.1esr.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0b48d0b881d99e91ebb6a62763504fc3fcf941ae3a946b2cff5d557113baea29"; + sha256 = "5d74a5b1e80540e3bdc031752ba0f16257e46c196ba20f34575c900cc741e184"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/it/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/it/thunderbird-140.0.1esr.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "54d0a4980828e74ae8605bc3b61e919376e16c016e140667093b1959249061e4"; + sha256 = "36a257fe9b13ac7c95e64c2e16610e50e3faccce3d2e26d1b0c509d898360507"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ja/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ja/thunderbird-140.0.1esr.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ea466164a5b4a86667ae0b6f85b78f729a2ea548b65a84bbca2b8a8836cb21ca"; + sha256 = "ffa7cd70028112a691066b8dee3903a0404bf57c02751d687ef1bc8e906169f4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ka/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ka/thunderbird-140.0.1esr.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "93c584f654955026231c4e26c1d25734406044cf53c63d99e1da6ef00ea34c9d"; + sha256 = "2c70ef901bb85e4355a4a86cde4dc4dc3822f198fc39e9abfc47393e9909d813"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/kab/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/kab/thunderbird-140.0.1esr.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4d155a1e427611c9b7d2e90fa0c03751d45c5273b213b05ec2c3933060cd164a"; + sha256 = "ed4cf54f5673e2ad33942bb2125bed7aece909ec31d6ad9986ed584708b618ea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/kk/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/kk/thunderbird-140.0.1esr.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "37952480dd1db22937c026ec86353a3fe4d198ea599a8655531867531c26fb57"; + sha256 = "5f5381e871f17921d4978bbce055239bd2358da555a5d4e897b57bc5a47cc2de"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ko/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ko/thunderbird-140.0.1esr.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "2585c98466e0ab121a0218839b25a81933338e6c833d90b7f45a9977b0f5b5cf"; + sha256 = "34c1c3271dea3484d7c30bf61b2a5c5c6229dcb36f36a7aed48bd9264012bd77"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/lt/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/lt/thunderbird-140.0.1esr.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a8f17cd2ceeae6e8493bc1080a1df398a22606488100e92f9d09734f39f84fc3"; + sha256 = "b5399800a2963d2971ad6b2af9d6120c4360dd036bd615a8d9c6a49d6eb4287a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/lv/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/lv/thunderbird-140.0.1esr.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "85dfc8450b35967b78cb3c219d243ff03f3647465aeb255b94a4e7f3478dfc89"; + sha256 = "0d52d2b6fc148acba6e539af0b0341567cfcae88759778674838a964bac65755"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ms/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ms/thunderbird-140.0.1esr.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "bbf683df18e06900b76d05e9a0a6db60d6e8626817a2cb416d37028331343ad4"; + sha256 = "a6d87b019565474c1bae994ff194721d1e8c17edcf457b597480e0a8c499add0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/nb-NO/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nb-NO/thunderbird-140.0.1esr.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a0bc5dbe90b850510c070963ea21380ce65eb3f6926710d1bb012cb50d784132"; + sha256 = "83e87a53ac6ffca086a900d019a5665e956e80488f46696d61f81d895a80172d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/nl/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nl/thunderbird-140.0.1esr.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "fc89316092a335e53fdff912350a17369cfa653576979064f1fd1addd9dd38f4"; + sha256 = "eac0552dc429559d307b10e5013adcf1f1d0d1d0d71a97f027feabe71d29d76e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/nn-NO/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nn-NO/thunderbird-140.0.1esr.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "eb686ca02ebd3b2c018697b707763f7b80e0159c3756d1ac3181f5a7071d1cfc"; + sha256 = "6b3ed73a3d497f50b3fdf7c3f9b7152b9714763946626bea650066fd53145804"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pa-IN/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pa-IN/thunderbird-140.0.1esr.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "e26e3557f2348ddd3763566a2b5dc4897cfba7181c904807b37a73fceed8e3d6"; + sha256 = "0cd1f8377484fb87e63e73f449dd619d840b2cc7b0565e68b14603f6bda74131"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pl/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pl/thunderbird-140.0.1esr.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ffdd0668cc1f94ec3ee99dace3cebdc9143be05b7931e7b3d75a11134f410063"; + sha256 = "4931970272d598f0467ccfd3c657d69d10a001d24c0121dc499933adba3d803f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pt-BR/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pt-BR/thunderbird-140.0.1esr.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "994b3e8fa530b4d1d5333dec0497d393223b26774ec8e6794308a15240fc8a39"; + sha256 = "657d43ddbff163876149d16fd5bd5e0533f0d62a173b23a98b7460cdae97b43b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pt-PT/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pt-PT/thunderbird-140.0.1esr.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ead36dc368cbf288100e63c1a23a14eed9821ebaad5e53d485a96640cf8c9488"; + sha256 = "bf302b47797df158b7ca39ed1742449fbcfc11ad91142f4ffb6d6df07a1dcf00"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/rm/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/rm/thunderbird-140.0.1esr.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "32e966ffc3c1353369d498b4dd668726c92b05cd8fa875844b35c55eea24ffbd"; + sha256 = "983c2a44a00438316599d8b209a58d321203d85744b1988aeb291801f5b42cfe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ro/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ro/thunderbird-140.0.1esr.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d3e6ee59b0fc83d40e3eb7fc469ab3cd8fc9ad2607ff1177a54c3774c611399d"; + sha256 = "da1382badfe2064384e5b2d510188821e75de8395ec01a3ddc59498337af4219"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ru/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ru/thunderbird-140.0.1esr.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "23036342924ac4327e8e89236c3a9b5d72aa17bf6e6587995879781546ff3030"; + sha256 = "6bafdaf08f950c287abc3db13293066f9a3a5f98db8b4672b68d78ad672c4e48"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sk/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sk/thunderbird-140.0.1esr.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8531b07c52f9b3c4cc1595728101b541fb18f20ff57210d865bae13edc8f984e"; + sha256 = "2b6c7d5eb509fe7e5612845fe2c45ee5d2ef1d2b08dc0480318745f8a1cf4ad8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sl/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sl/thunderbird-140.0.1esr.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9a36d79fc11198001f6c9dd9dca78ab3985ed08cf34c1545f0f06aa7c4284ead"; + sha256 = "34f4ae90f269199af655b1b2a1952ae2f68daa42de3f2b25c4ab82f75ed4149c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sq/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sq/thunderbird-140.0.1esr.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e332752f37abb17e98a667400e0cd2728d11f1fd9a6798d0c4b03e54935c9f52"; + sha256 = "13a4006da9be23a80dc5d6ec89557f2b020995f2ffc632f4b6e1c7f8dff45f23"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sr/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sr/thunderbird-140.0.1esr.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0091e1363aaed53741b2ac684aeb09412cf43ddbd340989f2420148ddf72623b"; + sha256 = "415878b0a7f4c2502fac2ece43d9d49337b503614e7d95e260bd959fd165bbec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sv-SE/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sv-SE/thunderbird-140.0.1esr.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "92f0ed514b9946151ce7047f9afffdadb2f8724f468e435041f2841cb8052d95"; + sha256 = "6fd2dab46a7b9714b7f0610e200998a7fd200ff4f001dcae730fd91d683da2e5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/th/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/th/thunderbird-140.0.1esr.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "bbc0fd2e86cdc944930d059fc218fe55c96b8ee39f520a340af2afcc9902ef42"; + sha256 = "8569643967a75a6b1652d59a2123b51a01dd14f362d824b1729c2bb46c6ef016"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/tr/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/tr/thunderbird-140.0.1esr.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2c6e1bbd9804a3cd02381f93034420626cb09968c12d236426ac6823d89c8399"; + sha256 = "a3b1b7c06217902d7db6564ae026aadf834cbb6c5c5fd05666db2bca31b2cc9c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/uk/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/uk/thunderbird-140.0.1esr.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "1fec47b0bddcc4f40d0f4e098429f2ad2a8fc988cffd11d04277bdea320aa2d3"; + sha256 = "94c217a00eb176a590529b25acc57202dfe1062d8b2f265756848a14789ff76a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/uz/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/uz/thunderbird-140.0.1esr.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "dd6501bc49611667168aec9c4b5a01f41476308abde61c065fee786a3da11025"; + sha256 = "9f09d983e072cccf4368fcf9211ad15c0fdffe3d90b80dca7ecd4548d5241c94"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/vi/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/vi/thunderbird-140.0.1esr.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7d752d79dc29a79346a5faeb62ad792c83361813ab43230fc4024d0575ea4aef"; + sha256 = "c9e71aec1ef7189742c6ea7de163ccdc000d67b5bbe9eb8e3154775b4516a283"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/zh-CN/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/zh-CN/thunderbird-140.0.1esr.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "99e62f429e86e251229ba05874b2dd6fecbbc961d99b82467e39c4674253c31b"; + sha256 = "6a8e5d7a11bf0a590bbaa3ccfb4ca5fd05eb8d681a3bf954b3cac76d02ae30a6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/zh-TW/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/zh-TW/thunderbird-140.0.1esr.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b6454a0ad85263d3a4e211df5a2853367504dcc06323aede8f456b327f7ffc61"; + sha256 = "dd48a7ab83a0dac285d7bd3d5f933b14d5373957076d55d987562c05a05a6690"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/af/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/af/thunderbird-140.0.1esr.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "d0e5b10d52ad457c51cf7dad8a8e46df110c7637c74cc67f47da353a4a607402"; + sha256 = "143e125ad9ed1ca18bba8fab8297164715117287681f2cd2ea1b6ce554af90a0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ar/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ar/thunderbird-140.0.1esr.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "cae238cc797b4aacf015f866b11496423c7e6751ec3853076459e89a6735f07e"; + sha256 = "2d76124a2fe46ada9654195f4b2d496e7a26b703ed5fa5343bf85dc5942db033"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ast/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ast/thunderbird-140.0.1esr.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "6003bdefb99a650b0d7d6fddddc5f68e906de90913f77aa50386b3223e73e96e"; + sha256 = "dae431fb2da2f9cc4d7be363251c59475e3fb1701f0568fb84dd0241d1f41989"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/be/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/be/thunderbird-140.0.1esr.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "b840a0af87de630bacd4ce180aa9277ea4bd47d2fea423513095965b315cc71c"; + sha256 = "110e8a26ab3f753684587afddd21edaef554fa4b7d72147f86ae185eeed37a17"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/bg/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/bg/thunderbird-140.0.1esr.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "aeb40e4f78ab26ca930e83a4f3e8e17493167bacfa0c3dbfb07ae89208527039"; + sha256 = "3e12c93255d5baa3fe27688fa6c0fd2dcf7995745be02ddf8a5c400b258e216e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/br/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/br/thunderbird-140.0.1esr.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "e813f9086d8a72885a544108fd7c553517096470d3db9a8bd26796f728e92ee6"; + sha256 = "49c155f4c024df6481ee659e616a69754265ae1edc556ef1965d0de91f1e4443"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ca/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ca/thunderbird-140.0.1esr.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "260d795eb520f8e834bd829d9fd87cc4542978389589cbb75f7680533224534e"; + sha256 = "8cf4c59c12310f50b99c8df1a2ee75f4de7d40e199432e6f072966d07e63367b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/cak/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cak/thunderbird-140.0.1esr.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "485889bf966f5d3ee13bee4afa944786a20a06589cbe3c647e173e20bb866890"; + sha256 = "b88442ccb6d83e76dca13a8c8cafa23fcd3a7e08d5ff22f10a455c4b3cca2e80"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/cs/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cs/thunderbird-140.0.1esr.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "5ab583992354e7d228aee2921a8d957af5c68e35e2c6ec6021ce59907170999d"; + sha256 = "6a77983dc65c55f2b01a6ed2d748f98c62a7a65e0e084476718705a9e139c94a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/cy/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cy/thunderbird-140.0.1esr.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "60ea047453cf3c8a72b1fb00cd623c69ef2ebe5dfec07cac8864cd2372044728"; + sha256 = "5829ab3e5ea00e1e4a6e4eb99c48ce4aa1ba2ab57804ac0d3dab532c340ff5a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/da/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/da/thunderbird-140.0.1esr.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "d1c1f2989fde7fdd1cce600de24c9c4b07ffb1014bf86842162e295b588c6f79"; + sha256 = "9d7a91f3571d90ac5117d449f6f423ef055034407607a2d44e51bc649c2f2bdc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/de/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/de/thunderbird-140.0.1esr.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "8e3ac147b314d5ec4b5236dc1c58c3db9d48122d069ba366a8e48e459232d853"; + sha256 = "c79adc6a1524a2fcfd0d98aafb6a7428be0be24418ea1a607f36756a040d1594"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/dsb/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/dsb/thunderbird-140.0.1esr.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9097661bc5c121006fde36cd002bf26f1d6b3466552dae941cbc87a0463eb662"; + sha256 = "7696c03fd836ba11be4f0229f43d1400ca56e6b527bd522a89ac5638f9c16bb3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/el/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/el/thunderbird-140.0.1esr.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "2fe49f83343fd5aa6d7c65dfbde69edf1d80f3a44b0a3b20a108df2986db4ea7"; + sha256 = "3c52933ceda31577743d01f2aaca2439ffc6662d0448f2d6945e0ce88aff5ee9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/en-CA/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-CA/thunderbird-140.0.1esr.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9e9907b25631afc69d80fc14fd798f156177b0f6e012cb6293a38982b2cfed66"; + sha256 = "46fdc08166c617771130b51b82ccb231a23b5e962690c3a1ea91c42227269b4b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/en-GB/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-GB/thunderbird-140.0.1esr.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c66668a98f93e2e60a65908142721c40dd719ece1fd27bc9b12f098a36934a1b"; + sha256 = "192b445f7bd7188d931693a68dd21e39f27e57267f8b148ef8c2b5f88597b53d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/en-US/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-US/thunderbird-140.0.1esr.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "f11acab3c1b9b8bc0d000e79bb4aa627c8b982da6e867884fd38c018385336bd"; + sha256 = "d7bdc8f114f7024cafc1a771afc21d90b14b446e9f79eebadaa647ca4d138088"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/es-AR/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-AR/thunderbird-140.0.1esr.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5366b9cf55dbaecac231a870c37422513719d4b387baf1802537b6ed23b7c9b8"; + sha256 = "3ad413761708129505305bb1f066c88725871202df0715dc882c8992829e7205"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/es-ES/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-ES/thunderbird-140.0.1esr.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0a3c9e633e4563aa12f4a6b727bed4ca3c58b7e68df7d4736241e19c67913ed6"; + sha256 = "be4931a361054890dce062f72828a579d6021b0cac71bdd65cc02d3e53377b8b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/es-MX/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-MX/thunderbird-140.0.1esr.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9bdf1e3863e2eddbedcdaee4794fca3b7cc43ae28d1447adffa2bdb5521d2fa1"; + sha256 = "4d53d2eaec30078c36c38b7d623abb57110f574f2a094371d6bf0a3da5264d4a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/et/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/et/thunderbird-140.0.1esr.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "039c3c19263e262973a3bf97985675534698c824401ea2b03fcdf9efa2e98fbf"; + sha256 = "b385f7934ec821251128ff699bc665b8db7736c8be9b59b2945ce52297748039"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/eu/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/eu/thunderbird-140.0.1esr.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "0c556b10fd5d223cd484bff84e4edf9ee12f22662ef3643e00e25a723e29ca1e"; + sha256 = "908cb758760d5a1de57295846b2d31ef2dc6c5e1da9eea3ed1ee0c14fdb6908e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/fi/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fi/thunderbird-140.0.1esr.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "6cc6403a5aa5bf484d1d41d55e4d1d7587097a95b0ee8e9ccf972f65a9c4993b"; + sha256 = "f6c4df7c3d51bedde4ad2cc78285459a1dd720f6d7fdeb1f27008e5fee2cfa0c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/fr/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fr/thunderbird-140.0.1esr.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "e9e16cf3909a04eeb8beeeb6214534faa4fe71b31c9e7e62a06a3d5888ac93bc"; + sha256 = "964513460ddd7931b633936e1c6f391b2c4abdedd631be4798ba78f20021fa8d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/fy-NL/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fy-NL/thunderbird-140.0.1esr.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "bdedaf4080dd020b48c8146d7ca160f694c30c7ae3813573f14dfffa23c3a5a9"; + sha256 = "1b66630411b6f61df03ca4a798cdd685dff6555c9a18d4c804767308e20530a8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ga-IE/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ga-IE/thunderbird-140.0.1esr.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "8b977495fe24fc7a2692c099f4f36e11532e827242f27cc2e9dfb352d79b7ba8"; + sha256 = "0b4a6a69b9c523370295750836a9a28a27d285e60c08915dfe7bf9523c655a15"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/gd/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/gd/thunderbird-140.0.1esr.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "bab69a8e3283a9bf2a3e4893a3ee5a13fd7855e6c27c6bc888fb7099aa63c3a9"; + sha256 = "1126f7ab5793e277395fdad38d13ae80dacff108c0fb69c4aefde63ffc75cd71"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/gl/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/gl/thunderbird-140.0.1esr.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "0f1204117d3ac178b4256f6736bae0763e2d725f7f31d35d14c2fe81149983a4"; + sha256 = "cd032ca7c57c616a442f40595a7d77879a44929ab7dccca331b536215a896c3b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/he/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/he/thunderbird-140.0.1esr.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "b8f9776ee8c13945eb0fafddf35bfe15aebd624266cb7a59c3a35c295c30ca87"; + sha256 = "3a17bece9f535d164af2c8da64df4291408b6e8a1ba31d8561ee3b559e43d148"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hr/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hr/thunderbird-140.0.1esr.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "7ef80e9826a3c6f68d977d7f4d37e4e464bf3ed758f6a4bde55c25908bad1e5a"; + sha256 = "d4452b7da20056aa6d628464824ff33c4ce07ce2955475b8c23cdc10dca41e6c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hsb/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hsb/thunderbird-140.0.1esr.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "977c9dcf1c4a5415168d4d6ba8bfc678ffd8fc71fad57c4591b67d2c5b66bb40"; + sha256 = "394c0368199eaaf12457797158362fbaef05847c8de20052d47df3b66f4be403"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hu/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hu/thunderbird-140.0.1esr.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "50b063f5cdee1c3f34b335e1e69645c9d95217fd5e252a52cfb8da88655fafda"; + sha256 = "c7947f866700ecacdc75569ce906403d2c641bd70963bf1885aa78f1987e3a5f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hy-AM/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hy-AM/thunderbird-140.0.1esr.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a7634aaab27e184cff3e8c9abc0508c999c22370c9290e99c114e5e4585d0267"; + sha256 = "971c420bdd12abfcdb04b776f68083bb9074c1b19e9d42db84b8172ad1188948"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/id/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/id/thunderbird-140.0.1esr.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "c01eabdfd17451caa579caad715ae0fc401f8d782df1b4072523a930b85e19a3"; + sha256 = "bc3d8f898c6470b31cf5633c04d2f582f42732f3fd5bde14fe0f6b38215f57fa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/is/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/is/thunderbird-140.0.1esr.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "6159e093852e94ab37e2446bfbdda0a1c67dfe1d88b6eb37c82c1fa3a0adea30"; + sha256 = "623158002114770da3868e58a9c90d6e6cd8738ad2da0ebcb7b5b48c79e7d116"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/it/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/it/thunderbird-140.0.1esr.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "b91c6b9dae50ffe444b99737c8e3f645ba8ac126572295be10d32fd88efd521d"; + sha256 = "729ff0a4999e13deef4f275939719931db868e89c87947e7f189395ed96c61ab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ja/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ja/thunderbird-140.0.1esr.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "392a3568f390b6193a0f5236a88a9e3ed84557d74f440978797e26c027a85135"; + sha256 = "a06d34c19b166da06de2c807710e36547f09702f29fa35d1a67cc41f5ff8cf7e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ka/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ka/thunderbird-140.0.1esr.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "e96c43f4bfa370b60b9f447b82dcf48b5ce021b756fedd47013fc5ac7926bb67"; + sha256 = "f67a7115bbfc19e9b41b7dabfe32fb62ecc20e5884c0b3e9b443351dae66c1c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/kab/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/kab/thunderbird-140.0.1esr.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "cf1d16b6477b2b836d896fb3e5ac65c32799c21ffe76a986c085bafa08883f92"; + sha256 = "01d8c9170990e175cf2452a428dafea95f0fe77e0b73001d644ebcdfb164ea61"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/kk/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/kk/thunderbird-140.0.1esr.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "abe96a32627fa819f97438b0b65cde4b6d92f372cac0e21c3ac79f896fb2da11"; + sha256 = "885540419072b130288a05b7f7c199bb19a5fac31b6455e11a95f36fc3239c76"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ko/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ko/thunderbird-140.0.1esr.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "895ad3c0187367a3fbb4e04e846c1ab993458d38cdce5c7745778e8530f7893e"; + sha256 = "daf94b5f16730691736296457ca41d64d53fe93d910c72116db5393319b1b9d9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/lt/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/lt/thunderbird-140.0.1esr.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "efffe1bdf4b546e794d5085d7a1cf91d8634a679e6ebf2aaca9828814c73c581"; + sha256 = "d2bf636a9ad18e093f645f401bdc9d4b9cc972f3b096bc136f5893a26fe9dec9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/lv/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/lv/thunderbird-140.0.1esr.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "395fe93b274f19761037defe7d3b44248f6a53ce70b386bfcfa979bf2bc61f56"; + sha256 = "01f975e034eb580a7b754cc612a46814f6c54d85a8fe6193caf9f8df7028c2cd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ms/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ms/thunderbird-140.0.1esr.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "43b0260c9a74d76163cbbeba33de06dde61e084a1f241ae5d6c9bb5bad424c27"; + sha256 = "38f637dd2de942b1f679421bfac608abf502cbc95f5dba921307dda860c38fd7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/nb-NO/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nb-NO/thunderbird-140.0.1esr.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "41a214594554f40959f7d53ac09f6422d8cc06945ab91757e34c31cdf3303599"; + sha256 = "2e6ad92a8cc928dc05386051a373076fe3228e94705e79d5a3b5acc7a71dbbaa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/nl/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nl/thunderbird-140.0.1esr.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "517eb90659cdce2cd47c33d485dd205a2fecf05735cff999f500e66daaf32a88"; + sha256 = "7b3ff0bf8193e1d7624f9415e84e32a508a8a9d075a7ed44f0a818ff14bd86a8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/nn-NO/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nn-NO/thunderbird-140.0.1esr.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "55fc05dfdad632116c09683c4d7b13679114c8935dc4931723f4744240e0ca9c"; + sha256 = "78a602eff2211f403e1805d3afb2e8acf017a3c81270b07810387d97b697227d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pa-IN/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pa-IN/thunderbird-140.0.1esr.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f4526e30c386550a95128830464b1ea8f2ff0e68fd8ae6aeba40a9c76fb0883f"; + sha256 = "c83252f5d19c16a93e7e5017a2d1737d080d855f9fba011006f726828005e8dc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pl/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pl/thunderbird-140.0.1esr.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "be59a45e3866eec1e7034766cbbf7f40017e517763f96cf55dc028fde5a5e446"; + sha256 = "8b8aa69ddd5545aefd35cd15b6ee5d58306540ba72d347cef921fb12cf739249"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pt-BR/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pt-BR/thunderbird-140.0.1esr.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "1ef73fbba3104f5c71939974ceb1a231489bc0bfd1d079e8394f51c59dc66923"; + sha256 = "55f3c32096812e12dbe2b52c940b582f018a685c949f1e73bab9a0123ee56ec7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pt-PT/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pt-PT/thunderbird-140.0.1esr.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e8a28970d175427f75d61605fbef7cbff7fe39cf08d9427c3a3ea1f561b751b6"; + sha256 = "8f6063ab557b81853bebc335181bed3271f10df0cc212986f850e8bb65fa7534"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/rm/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/rm/thunderbird-140.0.1esr.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "6b48d31bfa44c4815a4c09821b19c9249c6d916ff15712d163e3d7f74883345e"; + sha256 = "99c2aeaec4b24f1b4622138196d2cb35fe32d4babe56557b5909331a262e6df2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ro/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ro/thunderbird-140.0.1esr.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "f12cd678b765d97f5ffa6aaaff007e7ec5c07ee4f95b78abaee83a19e3ab44a0"; + sha256 = "2043faa14a64ec209e753a7a28b718295bad75fe32c88760818400d6b62ab6e3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ru/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ru/thunderbird-140.0.1esr.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "686c8dd08600adf3bee7c32cf58cd575399e4cc7aa3e0905b0bd1613dfcd3358"; + sha256 = "d50ab6a8217ace9105bdc68694d748ebe5ac84053bd6bcf7608963e63ccb6875"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sk/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sk/thunderbird-140.0.1esr.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "0292c2f3343da364f29828dab5d24658fe31a707eb52bbc963b042f0f2501787"; + sha256 = "0353ffaef431ea0ad6c279be383078643689320ef429230f087d49b5f28a9fd2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sl/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sl/thunderbird-140.0.1esr.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "a4bd96ee63ad05fac5bd45c506e9038537dbd9a8ac88e17387f43c8f6d9e2423"; + sha256 = "6e812718af66575f3cfb6287d544935a22180aa02ff3e62e61a7dd7570e81c0d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sq/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sq/thunderbird-140.0.1esr.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "6b6614c7ac1a4a80725a146fdd5c2840228130b23d1abeb7e088a879d613b70d"; + sha256 = "288fa156ab80da4f2476970886fae43e349503e2f3125b4ec48118bacfc51ded"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sr/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sr/thunderbird-140.0.1esr.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "42ce92dcaf772e57d48cfcca18be0fc63a5aa3c76b6a257559ec5e003fd31451"; + sha256 = "61b39b6abbcff45c4f0b7816310c87377aba5cc6d30bf44659a7ee6fbd09d128"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sv-SE/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sv-SE/thunderbird-140.0.1esr.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ae88cd1e1b4123e308107e804a339d05141c696c1ad7ee6d1c9c942269a39001"; + sha256 = "3783d139fb9e9947852d173f2f6fe142a0a7ff337f8288f96f1506f099a41ef5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/th/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/th/thunderbird-140.0.1esr.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "a38e31d43db5cd6f67f1b40e72e8a93f21ea7e5492f50ff228677d66d9b1fb45"; + sha256 = "7cad4d217e5b9e82e9b841a71e96ca390f2b400086703f3bdbf0e09897757455"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/tr/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/tr/thunderbird-140.0.1esr.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "08e2ce8ba8e2960ba34bf3570a7d6bbe55d70b9f35aeb938c0c752fbffdc7131"; + sha256 = "f49f042d6e86bcc40b1edd73d4241a8bb73dbdf320c1a417a20c3ef282557933"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/uk/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/uk/thunderbird-140.0.1esr.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "de8b699e322488a765f354819d2f79baf530405ac0f4a6540ab5ac3b474f20d2"; + sha256 = "3058636ce20f2744413f23bfeb82206b265e7f625643b274ccb1dfebcfc03ec8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/uz/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/uz/thunderbird-140.0.1esr.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "2d969f62cf9c164a0623a769eebda1e3ff9790818cfce05978da3b49a630b726"; + sha256 = "9d26d9154909b30d7fd335e3ab9a1d7a5614064568e03a21d10004dfce22dcf2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/vi/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/vi/thunderbird-140.0.1esr.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "0e3585662595e365e54a4f4f8e06fc843729387f005607d6e78f4049db6c9657"; + sha256 = "0d50d6a2b8b7a7f0b7dfafa1e72c1187ca1fc195aae5736f8e4eda9ee84b66b9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/zh-CN/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/zh-CN/thunderbird-140.0.1esr.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7365a226c7f4e7771edf4f90602d14826240d3352c77d6b736765b762cd25434"; + sha256 = "7e2a01674ab8ef493f6a01aa4b5d5cc122b950bc0eca2bbd0ad6bf293b9fbc21"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/zh-TW/thunderbird-128.11.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/zh-TW/thunderbird-140.0.1esr.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f7c7afad8dbccdecc9c4e8a29f3450877e151512a931875a89521c8b39053837"; + sha256 = "bdcfa911639dc193d7f9b38cadda371b3599beddfcd30a0cbb8fe8540520b1b6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/af/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/af/Thunderbird%20140.0.1esr.dmg"; locale = "af"; arch = "mac"; - sha256 = "5044e23b78ec2c1f06dcbc938d8849516005577c78445ae8212930572b5a4530"; + sha256 = "95d5b1481ca80568c3229a9bfb0dfe9fa0eee09b5264e553e6e7588c7f2b4caa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ar/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ar/Thunderbird%20140.0.1esr.dmg"; locale = "ar"; arch = "mac"; - sha256 = "51a94e0f3b040b53aabccee293b1b8e4f5be12a3fae4bbe5ce50ce95649f1701"; + sha256 = "38fa8d2d6051c580aafb11442af3d6948a5444a2d21b52f5f14a4f641cd164a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ast/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ast/Thunderbird%20140.0.1esr.dmg"; locale = "ast"; arch = "mac"; - sha256 = "493626258864ece20d2357b5ee94aa921100f6d0e50de3187123260963b736d5"; + sha256 = "08a420005f06a040bd5aeb05548276eb3dc0cbeaeaae4797a4a085a72eb94e47"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/be/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/be/Thunderbird%20140.0.1esr.dmg"; locale = "be"; arch = "mac"; - sha256 = "4a1c3252264b101400fa5cddebdc85143a0486a93df7db52a05e796dbf447cac"; + sha256 = "37c2080dd55ad5c31c730d9be6bc1580c51ebc0482ab89d2a198fd14df2b136f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/bg/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/bg/Thunderbird%20140.0.1esr.dmg"; locale = "bg"; arch = "mac"; - sha256 = "62221accab70032a18e5014aebcb032acc964875b3b586cb7a1e8a6d2e785c7c"; + sha256 = "053765ee4d6b385de034fb65961df15f514621eee8b989211fae46bd19f34efb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/br/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/br/Thunderbird%20140.0.1esr.dmg"; locale = "br"; arch = "mac"; - sha256 = "1d75ebd1ce55ae195cd26b32c59689f6481cf68b7578151315d5006c669ed97b"; + sha256 = "77ee4106a4e5378a289a26a443698a8a19c5758af901c3d73ef75548d1428c25"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ca/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ca/Thunderbird%20140.0.1esr.dmg"; locale = "ca"; arch = "mac"; - sha256 = "2be38ab16c24f73ad88baae4ce37b7121397cd9e5406f510ffec2df5103ad0a8"; + sha256 = "a5eaa6152a22227fff0171825606fad9dfa2235526835d4a3479176fbdb5d420"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/cak/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cak/Thunderbird%20140.0.1esr.dmg"; locale = "cak"; arch = "mac"; - sha256 = "54728cb3b6128eceeab66d509c7b90cf244504455f5425cfcfb49c881f3c68d3"; + sha256 = "da81389041f93401ad3baad47fb96936b49fa32f59ab92d37e3d8c6ce7e9a88a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/cs/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cs/Thunderbird%20140.0.1esr.dmg"; locale = "cs"; arch = "mac"; - sha256 = "7a21159417b5fe4641155ae43e4d41effe94fbec0431fc0b5567484d7087c8c0"; + sha256 = "1a72eff467b93fe13f917c0a5c1e41057bf5e2ec1bc1897a0a1e58cf59389185"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/cy/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cy/Thunderbird%20140.0.1esr.dmg"; locale = "cy"; arch = "mac"; - sha256 = "4044f729e7b202d50110529df9592617fe0b948c8b1860b456b3f3d38c341599"; + sha256 = "b4c4eac9cbd977362fed93ef8378012e1c8db06c941fef58ea0f39712fbff5c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/da/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/da/Thunderbird%20140.0.1esr.dmg"; locale = "da"; arch = "mac"; - sha256 = "da7e5440d28bca85f7a4456e39556e2f8c357feb024163d763d61ca3261b58db"; + sha256 = "865cf7ae8bf2deaac3e80a91529321477202f749da03252e3a2cc3bb1e7fcedf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/de/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/de/Thunderbird%20140.0.1esr.dmg"; locale = "de"; arch = "mac"; - sha256 = "2036cb0ec75668a4a82b524b752ed3973195e0e721fec14b9b101a36277dd72e"; + sha256 = "ca21ea80983beec307b2e7cb1df443c60f5f44ccc956baa367f5793f638f7324"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/dsb/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/dsb/Thunderbird%20140.0.1esr.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "27404dc749bfc62b4153640a06421e77da13de6acca1867ea60623eea8a354af"; + sha256 = "cc93a1d5447ed0df64d89cdc28ef506458d53459a4f75f0126a018d3e6f125ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/el/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/el/Thunderbird%20140.0.1esr.dmg"; locale = "el"; arch = "mac"; - sha256 = "9ec737d7b1ad4f2b062a1a430ca7316a2c4fcedab43b0a034926356ceda336ec"; + sha256 = "7c9a536a8a3b92d955fb520f857b57f57890dc08870cc77de51e8733aad73b76"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/en-CA/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-CA/Thunderbird%20140.0.1esr.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "c55389c197313ea19c20a292fe52aba160185a7eb6ff6f47c21406f2b87de88e"; + sha256 = "bb674b60e80673d4460707dd4022949e457ad4d3915127872cc55bc1eb6d8e6b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/en-GB/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-GB/Thunderbird%20140.0.1esr.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "29e77840a36c3235d478e0d0b1843a7c9bbc6ed0fc2ca08e5302e4befe3f6784"; + sha256 = "43c1a3466df45aa98894c8d2f01488faabc1bfcc11a62d2c81dee951c48e9377"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/en-US/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-US/Thunderbird%20140.0.1esr.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "6aaeb32a4964b1bdee1322dbb2e0e17b54632a5cc5a4c8f8c2fa78bfdfed4365"; + sha256 = "0df7e445f71283e1f385d7920408ac0035baa937165d51e1b7d2f4c6515e8b80"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/es-AR/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-AR/Thunderbird%20140.0.1esr.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "006229fe8ed1e141b09a2c835125cee3ed273e84198eebadfa8e66186121acd9"; + sha256 = "a0865f3d19d212e79666d4e90b8a18516d0c44d35f7f320bbd631cc9845844cc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/es-ES/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-ES/Thunderbird%20140.0.1esr.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "643d80c431a4dc12760d492275797fb1b67f4edc699e731aeafec17e9f9d96e1"; + sha256 = "242afdcc031130e3b3c16413242cf0a95e2f1520e73c403c358f6d5fc2f1a46e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/es-MX/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-MX/Thunderbird%20140.0.1esr.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "b18b4f8e9ca142e2a46f52c7f67aabc10365314be07b438bd20cb631ad4d6bbb"; + sha256 = "61e58ababdd693de00fb404edea2e2a986180a49dd0a33ad3840700eb081bbed"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/et/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/et/Thunderbird%20140.0.1esr.dmg"; locale = "et"; arch = "mac"; - sha256 = "82d13921c5879939f35a3321e94fd6a67611da959806fd1795bb6442ec17c0cd"; + sha256 = "d68a7b08b4559e11efc5160c4f886f2174e108ac857e3ec41844c64dfe5ca1ca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/eu/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/eu/Thunderbird%20140.0.1esr.dmg"; locale = "eu"; arch = "mac"; - sha256 = "a84dd42a44ed2124a7372d89c4f469605ff8837e80b33dad433cdb5a46988425"; + sha256 = "e8083e2da49168c1e5e52392a8e8cf1ec6190b48797d47fddcc0e0310f1390a5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/fi/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fi/Thunderbird%20140.0.1esr.dmg"; locale = "fi"; arch = "mac"; - sha256 = "d2f5b3a691fd66eb2c5a062ab79e845d689f63b913daa4bebdea5c5d548276c6"; + sha256 = "1cab5d0c6a18a1975fb9010e3c83ad34abbe9888e592ca4e0b87a6b45e7266e8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/fr/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fr/Thunderbird%20140.0.1esr.dmg"; locale = "fr"; arch = "mac"; - sha256 = "305c169b9f254e695be9f35d8ade9ca72b225cd27220cc8858873d2f1b6f09ca"; + sha256 = "7c5bc6b3d2d797ed40ca89f96668a359fd00344219db9942ab3f64e9a06e8a74"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/fy-NL/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fy-NL/Thunderbird%20140.0.1esr.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "043043862111a5cac0c8411fc7884931e2546eff9f9ca84e4354d3b6858540f5"; + sha256 = "b20d55d3887f546131dbc2d7440f0bc68cd90662366f761b57ff59cfb3680401"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ga-IE/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ga-IE/Thunderbird%20140.0.1esr.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "8f1244fe456395030b0510fe4be3a81bfe9505a236b6c8ffd1d0e4da23424fbf"; + sha256 = "6500a32d0212883b059f7f8049c08534c346b271353f9c66e056b69f550501b9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/gd/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/gd/Thunderbird%20140.0.1esr.dmg"; locale = "gd"; arch = "mac"; - sha256 = "519466f56694b3256744ccbcfb9c070234e739c14c072c951a3082d2eb38af3d"; + sha256 = "f27079d598d662c9d46857a742ff6ea455d2b0cfc63f9f11b8c075e79713f1e1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/gl/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/gl/Thunderbird%20140.0.1esr.dmg"; locale = "gl"; arch = "mac"; - sha256 = "beba3e556dcd796bf4c97e581aa7a3350723abee9dec21bfa87f908b08029ca0"; + sha256 = "d29ad1cf5ec3b1b189c21a73fe689c01b21e60dd80fa6c6aad2dc04f77312fab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/he/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/he/Thunderbird%20140.0.1esr.dmg"; locale = "he"; arch = "mac"; - sha256 = "f28de27c4c326fcd9c2fbcdd06162c19a85d797a57171e14d8e9da9d6f5fca11"; + sha256 = "3c39fe2417ab58098b43ee07d9cb562254c529d9777d520852000e368baa1234"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hr/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hr/Thunderbird%20140.0.1esr.dmg"; locale = "hr"; arch = "mac"; - sha256 = "271cbd5738ada0ef82b104d58915517c449c8406dc60798580fb23930519a9d6"; + sha256 = "c13f505713795fb6df640ab080f52096735c7374ba0826e2d3cd3f6dbc0e9390"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hsb/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hsb/Thunderbird%20140.0.1esr.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "d0a0c1b967fd8bbc55d9e3c07463cbfc2fa00f71488b09a59551aa4607f4798c"; + sha256 = "46c80d63f7453876366db864ee14b80a9b52987a8af3bc8a24d8735d7691d3a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hu/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hu/Thunderbird%20140.0.1esr.dmg"; locale = "hu"; arch = "mac"; - sha256 = "3f04c03977715039a2eb3f7449a32b53a41b264e45c29d25315321c1c5277eef"; + sha256 = "6b48415df64d8c3ac80d8ce2b75712335948455f1d380ce1f3b4d38b7980a9d1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hy-AM/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hy-AM/Thunderbird%20140.0.1esr.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "53d33d183ae181bfac1fd721e105ba4142d6a0010be9cf5f3448cd46876a23da"; + sha256 = "4d342cfd00c5ffe34877600d6c475603fa961c6862bcc9b27f666aebb877a624"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/id/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/id/Thunderbird%20140.0.1esr.dmg"; locale = "id"; arch = "mac"; - sha256 = "c5c0e230a22e18356524eefe04c7590625d6e616901de4a1fd02439c32333d26"; + sha256 = "8fb14ee5415c8a7bf468e422c18b4dba35fdb0c78b57aae2058f50ad94fe386c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/is/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/is/Thunderbird%20140.0.1esr.dmg"; locale = "is"; arch = "mac"; - sha256 = "211762c3d1d400be1c3f2a568a0111c56338553ce57f5b938c25d369f9cd6e22"; + sha256 = "e34a22ee6896606ccb29e28d80da8ab30bb060804d210f4a3eafa0437846b297"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/it/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/it/Thunderbird%20140.0.1esr.dmg"; locale = "it"; arch = "mac"; - sha256 = "acc08c97b56f20df44483402071e11c63410646181bc49ed43a144a8aa76a523"; + sha256 = "1ec0efcf85cf0c277cd219a206e947ae970b6b3397b3a8da24beee96ac0d8d34"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ja-JP-mac/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ja-JP-mac/Thunderbird%20140.0.1esr.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "507c90c52b0f43df9eb08df40ce5b62fb132a00a561007d2d0b8759052419195"; + sha256 = "c583039cff073b0a6f94a73f120c26d6f43c86ab53fb0c545d66ab927ea76049"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ka/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ka/Thunderbird%20140.0.1esr.dmg"; locale = "ka"; arch = "mac"; - sha256 = "721adf949350e037c25cf8291c431c4ad1a1c973e3b5c7f8038c49d101bff42f"; + sha256 = "743c09456f1e37df56f642e4f25c432c02518250e3e675c2e59e44682f42e3cc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/kab/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/kab/Thunderbird%20140.0.1esr.dmg"; locale = "kab"; arch = "mac"; - sha256 = "5d80290a4450704ee98e14fe1ff5355838866f5bd02dd76b35d34340234e2fca"; + sha256 = "b2827daeb5582a8d7df1d0fd2a1263e306d2ffebec00f49f9bb7b36ec3f1f13e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/kk/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/kk/Thunderbird%20140.0.1esr.dmg"; locale = "kk"; arch = "mac"; - sha256 = "d2e06a4b9217647fb251f4923704cb2a328f2f6bd2cdec2dffa565f035256118"; + sha256 = "cda4811b48bc59a731b9db326385a6e24b5cde15170f67f7e66b035642ab6301"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ko/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ko/Thunderbird%20140.0.1esr.dmg"; locale = "ko"; arch = "mac"; - sha256 = "93be46780d45123071b98e3a502bd66a0e013173113328c5bb490348e0e95e3b"; + sha256 = "b66634a71ccf6010025e395326227d900e70f41ac6d4aefadb87ed863268be8b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/lt/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/lt/Thunderbird%20140.0.1esr.dmg"; locale = "lt"; arch = "mac"; - sha256 = "e7290fb83d7d599e19ba084ac0cea5e8766ac939a53536260566150ce0967888"; + sha256 = "344bfe5819f26f494243bee9051b2b6cef79e15377dcd3b0c3462feba09a4899"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/lv/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/lv/Thunderbird%20140.0.1esr.dmg"; locale = "lv"; arch = "mac"; - sha256 = "953833f44f8d18c645dc4581389e3c4e6620e7ecbb612223589b01a8b0f0c7b3"; + sha256 = "e9a5cc498ae57a76fd8e8dfe58e9f5faebbd7c50f53f50909b091f822dccc366"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ms/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ms/Thunderbird%20140.0.1esr.dmg"; locale = "ms"; arch = "mac"; - sha256 = "96cd6ceb2eeee23e41df9e85f66d972652eb883185dfe3ee467e3d339db89728"; + sha256 = "17e553a159ca6e020ee24cc4293f1d4ad144dc0b2dc505aefa7acac7a1b2874c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/nb-NO/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nb-NO/Thunderbird%20140.0.1esr.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "873acfd868eb4eb98fd89ed940a4f94106102d671906ed96aa5cbdc8adfd0aad"; + sha256 = "fba0b9ae7a9809e4ee8181c387c74a54dc3dd73e39b25931675d1f3251f5cba4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/nl/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nl/Thunderbird%20140.0.1esr.dmg"; locale = "nl"; arch = "mac"; - sha256 = "4eb57ac9ee74c73390f5e7d85c99974b39c8e029891c9264a59f7f4caf35189e"; + sha256 = "4c114373ca9760c588187d440301c9f5f5c3ba955f212ece78ffc6e095347d01"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/nn-NO/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nn-NO/Thunderbird%20140.0.1esr.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "7b460dc745f4216207cbbe31c22ca078097da98fc36608e30c801460b53e4175"; + sha256 = "46f358d2437f74f6feb7c508b844325cd15ef61c230bf0af3338a3e754c5ad99"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pa-IN/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pa-IN/Thunderbird%20140.0.1esr.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "ae6e070503490be4a20cfe88957c50bd2d5b61558e4e082e405dbb6c9af8d650"; + sha256 = "f5ae52be91e9e74a20a865603ab70650015cd052dd3524f40d547a725182514d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pl/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pl/Thunderbird%20140.0.1esr.dmg"; locale = "pl"; arch = "mac"; - sha256 = "8d7bef22f5ec018230675388f1e09f57ca1a56c14faf20625947ace6a63f1b4f"; + sha256 = "68c481bed5cdb529e294d6d6c4a96897f0f26205910e5f53cedbd28674042f04"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pt-BR/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pt-BR/Thunderbird%20140.0.1esr.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "8d07693400e2ce47f28e50063f754f5ecfe33bce80c20836e5964e58c30d808b"; + sha256 = "5d7df81759e99ba5c1ce321641450963443ebe8fa0dba62a1305cbc65228ad4c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pt-PT/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pt-PT/Thunderbird%20140.0.1esr.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "9807509c6214bfa50cc4da2d4e1182f398f5d2dc01527e946b6f3f3a62f2c5bf"; + sha256 = "ed4d5f4f0c3574cade3cc8df470cec5b41a63daa60cfefd18650f87bc1a5e857"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/rm/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/rm/Thunderbird%20140.0.1esr.dmg"; locale = "rm"; arch = "mac"; - sha256 = "02d138d8e70732f364b600f96e3d493025b0b30ad2f97c86c1de56a4ac396c21"; + sha256 = "e7cf689884d0a39f718bf17752600cb837d2cd88b1636c139c94aa98b080a8cd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ro/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ro/Thunderbird%20140.0.1esr.dmg"; locale = "ro"; arch = "mac"; - sha256 = "fc3a92974d3dd7c8ea9e253e15685e951a9378af81260a32bc981222ec9096ba"; + sha256 = "304c225dba0e4f4e6014ab791eb4950072a15b61bf88d0dc277e6eb2aaaa3531"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ru/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ru/Thunderbird%20140.0.1esr.dmg"; locale = "ru"; arch = "mac"; - sha256 = "ff86c68ca4fac2512ac16a7d46a93d9fb799f0cc7faed74bc11804d8945a6f24"; + sha256 = "d53d2c8ec5112d3e3f94391ffc8323451ed0f39abbc3f1548f29989eb1a94e7c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sk/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sk/Thunderbird%20140.0.1esr.dmg"; locale = "sk"; arch = "mac"; - sha256 = "2d41c7410469e0157c0856e1c615dc950b1b2773a889391afe96faebb064c56b"; + sha256 = "f7083412a1e2a067b37a0bbbf5366c40b558a8f0b04f3435caed1753f551e05b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sl/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sl/Thunderbird%20140.0.1esr.dmg"; locale = "sl"; arch = "mac"; - sha256 = "620044e83c647d4d59fe4bf04c0baad67ebd3e987962f46e5b3207319efff547"; + sha256 = "a2f163298c4653cbf5615cc77b32f7e05ec6f99b0448ddcdb2d0e4e326918c9e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sq/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sq/Thunderbird%20140.0.1esr.dmg"; locale = "sq"; arch = "mac"; - sha256 = "2053c3b73c6cc460ae19a16b68cc20847ae5c1ccaa257cf0f1bb94ceb5303a77"; + sha256 = "383328a54e6155e813d1e328658903cfc1836e640032182a40446455df52b00f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sr/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sr/Thunderbird%20140.0.1esr.dmg"; locale = "sr"; arch = "mac"; - sha256 = "97c49fcce28b8a3fbafa9c0ac0057269c738a02b599298891ed95cfc5f9c326e"; + sha256 = "5fd5564f871656f491b7a55b459ad22ad465f6d683ceec660e0c894bd059411e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sv-SE/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sv-SE/Thunderbird%20140.0.1esr.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "09b44ad55e36b02d907063f166ffa97a9405b7bed912e42917fdd4a662d257ba"; + sha256 = "a3bda6773dd565a4d613e97f78648bf461f44b6237b941ae1711cfd0e098d357"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/th/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/th/Thunderbird%20140.0.1esr.dmg"; locale = "th"; arch = "mac"; - sha256 = "e261fbd2bda8eac5044194412e872ee06e95ce9a1c6f8b03374b9d5bdb211a13"; + sha256 = "8d2b8dc11ce8532a09cda982f1625877e9a1d634678811760be5529500641bb1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/tr/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/tr/Thunderbird%20140.0.1esr.dmg"; locale = "tr"; arch = "mac"; - sha256 = "0998341bc976e2680424270866cc172987e6e6a0285fe9ae730a3dc693e7dd63"; + sha256 = "ee2848ad6bb3bd0c5d367cde7c5a010dce7e6f28b25b42b036297c199ff45ed7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/uk/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/uk/Thunderbird%20140.0.1esr.dmg"; locale = "uk"; arch = "mac"; - sha256 = "56e5bfddc16ad37931fd2d8fc13f0808ce49368840a1ef18e093f8a2cfb2a51c"; + sha256 = "65e3c31b51773f089266db704c2c128c222e05a5593088b8d0a0f6b3e65844a1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/uz/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/uz/Thunderbird%20140.0.1esr.dmg"; locale = "uz"; arch = "mac"; - sha256 = "a517ead8414d926f604903230fd1a987a5867c05f78dac18597201bae98f22bf"; + sha256 = "baa2ed186c708f03fa8df0dd60ba8c0ee1157661e7a871b48526541bfeaa1e7f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/vi/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/vi/Thunderbird%20140.0.1esr.dmg"; locale = "vi"; arch = "mac"; - sha256 = "b59993cbd972fe642be6a9f57c44cf75cfe6c31664b8daf81b1eede51b00eede"; + sha256 = "710a9b52e6343d27a9412cc6296b0f7fe2dd0b5fe322a25ff09ea7da5e6cc30f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/zh-CN/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/zh-CN/Thunderbird%20140.0.1esr.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "6030459cbef475ea9efabde5d2a7be84587871365a3a7f1b589168c39485b8e8"; + sha256 = "ea22275ae0bc0e0adce8228f798101ca699016577519a94a008ea409fa59497c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/zh-TW/Thunderbird%20128.11.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/zh-TW/Thunderbird%20140.0.1esr.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "cf9ab16f91e90662c1ac9b37cb08ba7d357179d8fd66b40e176847d341b99418"; + sha256 = "8fece4e313a472671567de0c2346db969d04aa870d7985a29c252848685bf2c6"; } ]; } diff --git a/pkgs/by-name/am/amqpcat/package.nix b/pkgs/by-name/am/amqpcat/package.nix index f34e594af1c8..db9595d2ba39 100644 --- a/pkgs/by-name/am/amqpcat/package.nix +++ b/pkgs/by-name/am/amqpcat/package.nix @@ -35,6 +35,6 @@ crystal.buildCrystalPackage rec { mainProgram = "amqpcat"; homepage = "https://github.com/cloudamqp/amqpcat"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 2914da7fcd46..44632ea8ab7b 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2025-03-19"; + version = "0-unstable-2025-07-06"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "99693d533a238c19915057f9cd5e541e6dbf57d9"; - hash = "sha256-dTGfOw2Cj4q3AiQswcyl9bWUw1qInyqap43r4j+qS1Y="; + rev = "339bee6f2de3de8e866c23b210baf6cabf153549"; + hash = "sha256-D/+/7NdfV8kHwYm5mJ6b7Vl3QCUdK2+NbZSefWTZt5k="; }; dontConfigure = true; diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index 5ba0bab1690c..261e63193d29 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -8,22 +8,26 @@ pkg-config, stdenv, installShellFiles, + nix-update-script, crates ? [ "attic-client" ], }: + let # Only the attic-client crate builds against the Nix C++ libs # This derivation is also used to build the server needNixInclude = lib.elem "attic-client" crates; + nix = nixVersions.nix_2_28; in + rustPlatform.buildRustPackage { pname = "attic"; - version = "0-unstable-2025-07-01"; + version = "0-unstable-2025-07-08"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "attic"; - rev = "896ad88fa57ad5dbcd267c0ac51f1b71ccfcb4dd"; - hash = "sha256-V0EPQNsQko1a8OqIWc2lLviLnMpR1m08Ej00z5RVTfs="; + rev = "07147da79388468ff85c2a650500d11ca0edd12e"; + hash = "sha256-pHsHcWQWGyzDh48YHnSw9YVKEnQ95QWnmHNFtvo7iu0="; }; nativeBuildInputs = [ @@ -31,21 +35,15 @@ rustPlatform.buildRustPackage { installShellFiles ]; - buildInputs = lib.optional needNixInclude nixVersions.nix_2_24 ++ [ - boost - ]; + buildInputs = lib.optional needNixInclude nix ++ [ boost ]; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; - cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM="; + cargoHash = "sha256-I5GS32dOCECYKSNMi2Xs2rBRxPLcvLEWHlIIWP/bMBU="; useFetchCargoVendor = true; - env = - { - ATTIC_DISTRIBUTOR = "nixpkgs"; - } - // lib.optionalAttrs needNixInclude { - NIX_INCLUDE_PATH = "${lib.getDev nixVersions.nix_2_24}/include"; - }; + env = { + ATTIC_DISTRIBUTOR = "nixpkgs"; + } // lib.optionalAttrs needNixInclude { NIX_INCLUDE_PATH = "${lib.getDev nix}/include"; }; # Attic interacts with Nix directly and its tests require trusted-user access # to nix-daemon to import NARs, which is not possible in the build sandbox. @@ -61,22 +59,21 @@ rustPlatform.buildRustPackage { ''; passthru = { - tests = { - inherit (nixosTests) atticd; - }; + tests = { inherit (nixosTests) atticd; }; - updateScript = ./update.sh; + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; }; - meta = with lib; { + meta = { description = "Multi-tenant Nix Binary Cache"; homepage = "https://github.com/zhaofengli/attic"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ zhaofengli aciceri + defelo ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "attic"; }; } diff --git a/pkgs/by-name/at/attic-client/update.sh b/pkgs/by-name/at/attic-client/update.sh deleted file mode 100755 index e6ec0ab1296b..000000000000 --- a/pkgs/by-name/at/attic-client/update.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p wget nix-prefetch-github jq coreutils - -# shellcheck shell=bash - -if [ -n "$GITHUB_TOKEN" ]; then - TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN") -fi - -if [[ $# -gt 1 || $1 == -* ]]; then - echo "Regenerates packaging data for attic." - echo "Usage: $0 [git commit]" - exit 1 -fi - -set -x - -cd "$(dirname "$0")" -rev="$1" - -set -euo pipefail - -if [ -z "$rev" ]; then - rev="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/zhaofengli/attic/commits?per_page=1" | jq -r '.[0].sha')" -fi - -date="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/zhaofengli/attic/commits/$rev" | jq -r '.commit.author.date' | cut -dT -f1)" - -version="0-unstable-$date" - -# Sources -src_hash=$(nix-prefetch-github zhaofengli attic --rev "$rev" | jq -r .hash) - -# Cargo.lock -src="https://raw.githubusercontent.com/zhaofengli/attic/$rev" -wget "${TOKEN_ARGS[@]}" "$src/Cargo.lock" -O Cargo.lock - -sed -i -E -e "s#version = \".*\"#version = \"$version\"#" package.nix -sed -i -E -e "s#rev = \".*\"#rev = \"$rev\"#" package.nix -sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" package.nix diff --git a/pkgs/by-name/ba/bats/libraries.nix b/pkgs/by-name/ba/bats/libraries.nix index cfd55ef64830..04ce140fd4f9 100644 --- a/pkgs/by-name/ba/bats/libraries.nix +++ b/pkgs/by-name/ba/bats/libraries.nix @@ -58,12 +58,12 @@ bats-detik = stdenv.mkDerivation (finalAttrs: { pname = "bats-detik"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-detik"; rev = "v${finalAttrs.version}"; - hash = "sha256-f8PN+VsUdUXrR9JiQgVuYDy2QgOtaxE8tkkxOUF0uC4="; + hash = "sha256-NM8/WDiTOJORC6+pAa6tYJC7wnuMH9OP5LBaatXyaYw="; }; dontBuild = true; installPhase = '' diff --git a/pkgs/by-name/br/brltty/package.nix b/pkgs/by-name/br/brltty/package.nix index 491cd8903e9a..53cc98decf21 100644 --- a/pkgs/by-name/br/brltty/package.nix +++ b/pkgs/by-name/br/brltty/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "brltty"; - version = "6.7"; + version = "6.8"; src = fetchurl { url = "https://brltty.app/archive/brltty-${version}.tar.gz"; - sha256 = "sha256-FsM9AeL1lnBziJlmB7EZAIgDKylT8D4Il81Fe1y9Yjg="; + sha256 = "sha256-MoDYjHU6aJY9e5cgjm9InOEDGCs+jvlEurMWg9wo4RY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/by/bypass-url-parser/package.nix b/pkgs/by-name/by/bypass-url-parser/package.nix new file mode 100644 index 000000000000..53d901f921aa --- /dev/null +++ b/pkgs/by-name/by/bypass-url-parser/package.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "bypass-url-parser"; + version = "0.4.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "laluka"; + repo = "bypass-url-parser"; + tag = "v${version}"; + hash = "sha256-h9+kM2LmfPaaM7MK6lK/ARrArwvRn6d+3BW+rNTkqzA="; + }; + + build-system = with python3.pkgs; [ pdm-backend ]; + + dependencies = with python3.pkgs; [ + coloredlogs + docopt + ]; + + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + + pythonImportsCheck = [ "bypass_url_parser" ]; + + preCheck = '' + # Some tests need the binary + export PATH=$out/bin:$PATH + ''; + + disabledTests = [ + # Tests require network access + "test_sample_usage" + "test_sample_cli_usage" + ]; + + meta = { + description = "Tool that tests URL bypasses to reach a 40X protected page"; + homepage = "https://github.com/laluka/bypass-url-parser"; + changelog = "https://github.com/laluka/bypass-url-parser/releases/tag/${src.tag}"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "bypass-url-parser"; + }; +} diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix index 184861961908..a59b1aa960fc 100644 --- a/pkgs/by-name/fa/fastly/package.nix +++ b/pkgs/by-name/fa/fastly/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "fastly"; - version = "11.3.0"; + version = "11.4.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${version}"; - hash = "sha256-SFBKu30C92BbbwSlmlRU/66mBywROktWUiw8fltFXoA="; + hash = "sha256-jfj37b3L3LcPODBYBAOTWq+mA0xrIr3r+6lu65gKyYI="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -34,7 +34,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-ypimv9xi3mKL6xmmkAYdUO+lspafXpJsP8StaniboE0="; + vendorHash = "sha256-souo+yksoZpUxWfY7flL4uLdRgAIrtZKRIlGK0p1hZs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix index 9541ab1c910b..132870f96951 100644 --- a/pkgs/by-name/ga/gapless/package.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -16,14 +16,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gapless"; - version = "4.4"; + version = "4.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-10AFaUmqVkL4q8xgewfosN2/SziNhat9p6x/+9mBdyU="; + hash = "sha256-P8hmywS/k+24KfFxpQdnBv0ArD+pKgUNcYk/Mnsx5jY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix index e9d7fde12444..98f36877b6d6 100644 --- a/pkgs/by-name/gd/gdevelop/darwin.nix +++ b/pkgs/by-name/gd/gdevelop/darwin.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip"; - hash = "sha256-R8RB88K8dymzQnfeZUypo24EkXzpDfcsosQg3gTo3WI="; + hash = "sha256-/0wqZN9bVCNXAe9LkGL8/dw2b/stffDbPPaZQrugEhQ="; }; sourceRoot = "."; diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix index aefa0d2a8235..a19c9f1c7eef 100644 --- a/pkgs/by-name/gd/gdevelop/linux.nix +++ b/pkgs/by-name/gd/gdevelop/linux.nix @@ -13,7 +13,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - hash = "sha256-ZVQ5e7Ghj/wZDE0RvoH264KNxaHP6x5fxSWEbbYsa88="; + hash = "sha256-+J0AURlpnZ7Do0ZRqzwwvdcyozZLdWGQKr+7OggOn1I="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index bfd24eea1908..16ac80ff921c 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -5,7 +5,7 @@ ... }: let - version = "5.5.233"; + version = "5.5.236"; pname = "gdevelop"; meta = { description = "Graphical Game Development Studio"; diff --git a/pkgs/by-name/gr/graphite-gtk-theme/package.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix index 9545941f2568..f6abb8cb8768 100644 --- a/pkgs/by-name/gr/graphite-gtk-theme/package.nix +++ b/pkgs/by-name/gr/graphite-gtk-theme/package.nix @@ -62,13 +62,13 @@ lib.checkListOfEnum "${pname}: theme variants" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-07-15"; + version = "2025-07-06"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "graphite-gtk-theme"; rev = version; - hash = "sha256-k93l/7DF0HSKPfiIxzBLz0mBflgbdYJyGLEmWZx3q7o="; + hash = "sha256-TOIpQTYg+1DX/Tq5BMygxbUC0NpzPWBGDtOnnT55c1w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix index 937d996eae83..1954d81f6289 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ha-mqtt-discoverable-cli"; - version = "0.19.2.1"; + version = "0.20.1"; pyproject = true; src = fetchFromGitHub { owner = "unixorn"; repo = "ha-mqtt-discoverable-cli"; tag = "v${version}"; - hash = "sha256-SPCbBqdhC+pgV3mQ+e3jkg2hWYegl1wE38Ac06R5uAA="; + hash = "sha256-4iQHpz09CbPuU+236HQdRNRDB3bcj9VZ0s/4BdxyB/8="; }; pythonRelaxDeps = [ "ha-mqtt-discoverable" ]; diff --git a/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch b/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch index 3d36c01d2ca4..eaf58f320ffb 100644 --- a/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch +++ b/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch @@ -1,8 +1,8 @@ diff --git a/pack.ts b/pack.ts -index aba98cc..03ce86a 100644 +index 0212d09..03ce86a 100644 --- a/pack.ts +++ b/pack.ts -@@ -75,33 +75,7 @@ const packageApp = async () => { +@@ -75,39 +75,7 @@ const packageApp = async () => { delete pJson.scripts.prepack; // We don't want to rebuild - all built code will be in the packed content await fs.writeJson(path.join(OUTPUT_DIR, 'package.json'), pJson); @@ -10,20 +10,26 @@ index aba98cc..03ce86a 100644 - - // Run build-release in this folder, for each platform. For each bundle, we copy in - // only the relevant platform-specific NSS files. -- console.log('Building for Linux'); +- console.log('Building for Linux x64'); - await fs.mkdir(path.join(OUTPUT_DIR, 'nss')); - await fs.copy(path.join(__dirname, 'nss', 'linux'), path.join(OUTPUT_DIR, 'nss', 'linux')); -- await spawn(buildScript, ['linux'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- await spawn(buildScript, ['linux', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); - -- console.log('Building for Darwin'); +- console.log('Building for Linux arm64'); +- await spawn(buildScript, ['linux', 'arm64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- +- console.log('Building for Darwin x64'); - await fs.remove(path.join(OUTPUT_DIR, 'nss', 'linux')); - await fs.copy(path.join(__dirname, 'nss', 'darwin'), path.join(OUTPUT_DIR, 'nss', 'darwin')); -- await spawn(buildScript, ['darwin'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- await spawn(buildScript, ['darwin', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- +- console.log('Building for Darwin arm64'); +- await spawn(buildScript, ['darwin', 'arm64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); - - console.log('Building for Win32'); - await fs.remove(path.join(OUTPUT_DIR, 'nss', 'darwin')); - await fs.copy(path.join(__dirname, 'nss', 'win32'), path.join(OUTPUT_DIR, 'nss', 'win32')); -- await spawn(buildScript, ['win32'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- await spawn(buildScript, ['win32', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); - - // Oclif builds a nodeless platform-agnostic bundle too (although in our case, nothing is - // really platform agnostic). Not necessary, probably won't work - drop it. diff --git a/pkgs/by-name/ht/httptoolkit-server/package.nix b/pkgs/by-name/ht/httptoolkit-server/package.nix index 64619776859d..440916a58b96 100644 --- a/pkgs/by-name/ht/httptoolkit-server/package.nix +++ b/pkgs/by-name/ht/httptoolkit-server/package.nix @@ -9,19 +9,20 @@ pkg-config, openssl, libdatachannel, + plog, }: let nodejs = nodejs_20; buildNpmPackage' = buildNpmPackage.override { inherit nodejs; }; - version = "1.19.3"; + version = "1.20.1"; src = fetchFromGitHub { owner = "httptoolkit"; repo = "httptoolkit-server"; rev = "refs/tags/v${version}"; - hash = "sha256-cIxpV155A76TCOXurJhBA0dQpwn63hTpokBRXMLBEUA="; + hash = "sha256-iEAYZX7WNk6TvZ44GAOgTqXOcW5oFn4gX+kzixZZbWA="; }; overridesNodeModules = buildNpmPackage' { @@ -29,7 +30,7 @@ let inherit version src; sourceRoot = "${src.name}/overrides/js"; - npmDepsHash = "sha256-GRN6ua3FY1AE61bB7PM2wgbKPZI/zJeXa5HOOh/2N2Y="; + npmDepsHash = "sha256-Uw7XbfwLMX+zbSrzFgvB8lw3hxUyw1eRKazCITrT/28="; dontBuild = true; @@ -41,20 +42,20 @@ let nodeDatachannel = buildNpmPackage' { pname = "node-datachannel"; - version = "0.4.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "murat-dogan"; repo = "node-datachannel"; rev = "refs/tags/v${nodeDatachannel.version}"; - hash = "sha256-BlfeocqSG+pqbK0onnCf0VKbQw8Qq4qMxhAcfGlFYR8="; + hash = "sha256-xjYja+e2Z7X5cU4sEuSsJzG0gtmTPl3VrUf+ypd3zdw="; }; npmFlags = [ "--ignore-scripts" ]; makeCacheWritable = true; - npmDepsHash = "sha256-pgcOOjiuWKlpD+WJyPj/c9ZhDjYuEnybpLS/BPmzeFM="; + npmDepsHash = "sha256-Qhib9ZGulTXjoYcZIWunf3/BSd2SLXZuWEmMcstaphs="; nativeBuildInputs = [ cmake @@ -64,6 +65,7 @@ let buildInputs = [ openssl libdatachannel + plog ]; dontUseCmakeConfigure = true; @@ -73,10 +75,12 @@ let preBuild = '' # don't use static libs and don't use FetchContent + # don't try to link plog (it's headers-only) substituteInPlace CMakeLists.txt \ --replace-fail 'OPENSSL_USE_STATIC_LIBS TRUE' 'OPENSSL_USE_STATIC_LIBS FALSE' \ --replace-fail 'if(NOT libdatachannel)' 'if(false)' \ - --replace-fail 'datachannel-static' 'datachannel' + --replace-fail 'datachannel-static' 'datachannel' \ + --replace-fail 'plog::plog' "" # don't fetch node headers substituteInPlace node_modules/cmake-js/lib/dist.js \ @@ -98,7 +102,7 @@ buildNpmPackage' { patches = [ ./only-build-for-one-platform.patch ]; - npmDepsHash = "sha256-GZESwRDG1gEVhkclR+LBWwoUYaE1xS0z4EvPN7kYTrA="; + npmDepsHash = "sha256-gHXop4CTsQTSMrZ5mBHkMcmpOr2MIjVLrzjLLCfZ3As="; npmFlags = [ "--ignore-scripts" ]; diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index 6f954c2281fc..2ee5de0eefad 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -12,16 +12,18 @@ buildNpmPackage rec { pname = "httptoolkit"; - version = "1.19.4"; + version = "1.20.1"; src = fetchFromGitHub { owner = "httptoolkit"; repo = "httptoolkit-desktop"; tag = "v${version}"; - hash = "sha256-oDwAosyFY4ff9MP82O8q5o+mN/X6+J7hM3b7myfOq7k="; + hash = "sha256-1m4okGTNrboyj+QiMFPT7Z0/+FxZtxrqqAbuAobRgvU="; }; - npmDepsHash = "sha256-4kREJgw7OjKkOF/J1HpD3uPn+awtQIfUGWqJctwq3N0="; + npmDepsHash = "sha256-NH6Ppj6SsM0BXAgboMgp1ZPwN43ciLNBaHkz5yq8Ff8="; + + makeCacheWritable = true; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -40,7 +42,7 @@ buildNpmPackage rec { '"forceCodeSigning": true' \ '"forceCodeSigning": false' - cp -r ${electron.dist} electron-dist + cp -rL ${electron.dist} electron-dist chmod -R u+w electron-dist npm exec electron-builder -- \ diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix index 057a74a850eb..287b664d2456 100644 --- a/pkgs/by-name/ki/kitex/package.nix +++ b/pkgs/by-name/ki/kitex/package.nix @@ -40,7 +40,7 @@ buildGoModule (finalAttrs: { description = "High-performance and strong-extensibility Golang RPC framework"; homepage = "https://github.com/cloudwego/kitex"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "kitex"; }; }) diff --git a/pkgs/by-name/kr/krillinai/package.nix b/pkgs/by-name/kr/krillinai/package.nix index 458f51535a58..9718e3926900 100644 --- a/pkgs/by-name/kr/krillinai/package.nix +++ b/pkgs/by-name/kr/krillinai/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "krillinai"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "krillinai"; repo = "KlicStudio"; tag = "v${finalAttrs.version}"; - hash = "sha256-RHlQeTFeG23LjLwczSGIghH3XPFTR6ZVDFk2KlRQGoA="; + hash = "sha256-Cd+MrKXezcBKRSwmoRaD/2jiNT7r8R7IGweXHDZFhWE="; }; - vendorHash = "sha256-PN0ntMoPG24j3DrwuIiYHo71QmSU7u/A9iZ5OruIV/w="; + vendorHash = "sha256-bAKLNpt0K06egScyn7ImHV0csDsMQGUm92kU1PVQK+I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/libremines/default.nix b/pkgs/by-name/li/libremines/package.nix similarity index 66% rename from pkgs/games/libremines/default.nix rename to pkgs/by-name/li/libremines/package.nix index b3b7cda9d4c6..2023e5ca9e01 100644 --- a/pkgs/games/libremines/default.nix +++ b/pkgs/by-name/li/libremines/package.nix @@ -3,46 +3,45 @@ stdenv, fetchFromGitHub, cmake, - wrapQtAppsHook, - qtmultimedia, - qtwayland, + qt6, + qt6Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libremines"; version = "2.0.1"; src = fetchFromGitHub { owner = "Bollos00"; - repo = pname; - rev = "v${version}"; + repo = "libremines"; + tag = "v${finalAttrs.version}"; hash = "sha256-TQwjEgtqAvKnrpia6VloRgFwtq5TNDmxU+ZWjtEK/n8="; }; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qtmultimedia + qt6Packages.qtmultimedia ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland + qt6Packages.qtwayland ]; cmakeFlags = [ "-DUSE_QT6=TRUE" ]; - meta = with lib; { + meta = { description = "Qt based Minesweeper game"; mainProgram = "libremines"; longDescription = '' A Free/Libre and Open Source Software Qt based Minesweeper game available for GNU/Linux, FreeBSD and Windows systems. ''; homepage = "https://bollos00.github.io/LibreMines"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix index 5d987089f704..aec61329220f 100644 --- a/pkgs/by-name/li/libvirt/package.nix +++ b/pkgs/by-name/li/libvirt/package.nix @@ -115,14 +115,14 @@ assert enableZfs -> isLinux; stdenv.mkDerivation rec { pname = "libvirt"; # if you update, also bump and SysVirt in - version = "11.4.0"; + version = "11.5.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-0bOX95Ly8d1/XZan/EyxI6JaACJvOu9QsTkFNQTreqI="; + hash = "sha256-wp/igqlyGqJiMCxcXFmPQgVDarVhR87Qlvuct+Eb8zA="; }; patches = diff --git a/pkgs/by-name/ne/nekoray/package.nix b/pkgs/by-name/ne/nekoray/package.nix index 07c75a213e98..ba6d1084e792 100644 --- a/pkgs/by-name/ne/nekoray/package.nix +++ b/pkgs/by-name/ne/nekoray/package.nix @@ -4,17 +4,15 @@ buildGoModule, fetchFromGitHub, + fetchpatch, makeDesktopItem, cmake, copyDesktopItems, ninja, - libcpr, protobuf, qt6Packages, - yaml-cpp, - zxing-cpp, sing-geoip, sing-geosite, @@ -22,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nekoray"; - version = "4.3.5"; + version = "4.3.7"; src = fetchFromGitHub { owner = "Mahdi-zarei"; repo = "nekoray"; tag = finalAttrs.version; - hash = "sha256-dq3rBvCFEs+4+UadFObMnHhIiYeFlpvvLjTo0lcG8rE="; + hash = "sha256-oRoHu9mt4LiGJFe2OEATbPQ8buYT/6o9395BxYg1qKI="; }; strictDeps = true; @@ -41,12 +39,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libcpr protobuf qt6Packages.qtbase qt6Packages.qttools - yaml-cpp - zxing-cpp ]; cmakeFlags = [ @@ -106,9 +101,18 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # also check cap_net_admin so we don't have to set suid ./core-also-check-capabilities.patch + + # adds missing entries to the lockfile + # can be removed next update + (fetchpatch { + name = "fix-lockfile.patch"; + url = "https://github.com/Mahdi-zarei/nekoray/commit/6f9b2c69e21b0b86242fcc5731f21561373d0963.patch"; + stripLen = 2; + hash = "sha256-LDLgCQUXOqaV++6Z4/8r2IaBM+Kz/LckjVsvZn/0lLM="; + }) ]; - vendorHash = "sha256-hZiEIJ4/TcLUfT+pkqs6WfzjqppSTjKXEtQC+DS26Ug="; + vendorHash = "sha256-6Q6Qi3QQOmuLBaV4t/CEER6s1MUvL7ER6Hfm44sQk4M="; # ldflags and tags are taken from script/build_go.sh ldflags = [ diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index d25e41148db8..d63cd8434633 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -25,19 +25,23 @@ in py.pkgs.buildPythonApplication rec { pname = "oci-cli"; - version = "3.61.0"; - format = "setuptools"; + version = "3.62.1"; + pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; tag = "v${version}"; - hash = "sha256-/Dl7y4asXDJiqAF5uvffrCnVWlObQt2cemQ23OKL0Xc="; + hash = "sha256-Y1bkBdmgmaiHHizGJkBINXN/pL/DEcjIwFq8XjoK5Kc="; }; nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = with py.pkgs; [ + build-system = with py.pkgs; [ + setuptools + ]; + + dependencies = with py.pkgs; [ arrow certifi click @@ -55,6 +59,7 @@ py.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "click" "PyYAML" "cryptography" "oci" diff --git a/pkgs/by-name/on/onioncircuits/package.nix b/pkgs/by-name/on/onioncircuits/package.nix index 55810ea73698..99dc3e8f8b89 100644 --- a/pkgs/by-name/on/onioncircuits/package.nix +++ b/pkgs/by-name/on/onioncircuits/package.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; version = "0.8.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { domain = "gitlab.tails.boum.org"; @@ -25,10 +25,14 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection intltool wrapGAppsHook3 - python3.pkgs.distutils-extra ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + distutils-extra + ]; + + dependencies = with python3.pkgs; [ pygobject3 stem ]; diff --git a/pkgs/by-name/on/onlykey-cli/package.nix b/pkgs/by-name/on/onlykey-cli/package.nix index fdf0db934f92..a78d97de7c6e 100644 --- a/pkgs/by-name/on/onlykey-cli/package.nix +++ b/pkgs/by-name/on/onlykey-cli/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "onlykey-cli"; version = "1.2.10"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -16,10 +16,14 @@ python3Packages.buildPythonApplication rec { }; build-system = with python3Packages; [ - cython + setuptools ]; - propagatedBuildInputs = with python3Packages; [ + pythonRemoveDeps = [ + "Cython" # don't know why cython is listed as a runtime dependency, let's just remove it + ]; + + dependencies = with python3Packages; [ aenum ecdsa hidapi diff --git a/pkgs/by-name/op/opencloud-desktop/package.nix b/pkgs/by-name/op/opencloud-desktop/package.nix index 75603c122918..208765ebc128 100644 --- a/pkgs/by-name/op/opencloud-desktop/package.nix +++ b/pkgs/by-name/op/opencloud-desktop/package.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "opencloud-desktop"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-sGbjFPidPncCu9LqaeClrXoKQUzhbR1XbX8RoLuz+N8="; + hash = "sha256-NM9SspeMXu1q3tfpcFk4OuLapu/clbotJLu2u4nmAlY="; }; buildInputs = [ diff --git a/pkgs/by-name/op/opensnitch-ui/package.nix b/pkgs/by-name/op/opensnitch-ui/package.nix index d65d348d4ca9..0c9bdbdb1ca8 100644 --- a/pkgs/by-name/op/opensnitch-ui/package.nix +++ b/pkgs/by-name/op/opensnitch-ui/package.nix @@ -6,7 +6,7 @@ }: python3Packages.buildPythonApplication { - format = "setuptools"; + pyproject = true; pname = "opensnitch-ui"; inherit (opensnitch) src version; @@ -18,7 +18,6 @@ python3Packages.buildPythonApplication { ''; nativeBuildInputs = [ - python3Packages.pyqt5 qt5.wrapQtAppsHook ]; @@ -26,6 +25,11 @@ python3Packages.buildPythonApplication { qt5.qtwayland ]; + build-system = with python3Packages; [ + setuptools + pyqt5 + ]; + dependencies = with python3Packages; [ grpcio-tools notify2 @@ -59,6 +63,8 @@ python3Packages.buildPythonApplication { # All tests are sandbox-incompatible and disabled for now doCheck = false; + pythonImportsCheck = [ "opensnitch" ]; + meta = { description = "Application firewall"; mainProgram = "opensnitch-ui"; diff --git a/pkgs/by-name/op/opentimestamps-client/package.nix b/pkgs/by-name/op/opentimestamps-client/package.nix index 2b59a51f67b0..8ea2387a663a 100644 --- a/pkgs/by-name/op/opentimestamps-client/package.nix +++ b/pkgs/by-name/op/opentimestamps-client/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "opentimestamps-client"; version = "0.7.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "opentimestamps"; @@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-ny2svB8WcoUky8UfeilANo1DlS+f3o9RtV4YNmUwjJk="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ appdirs gitpython opentimestamps diff --git a/pkgs/by-name/ou/outputcheck/package.nix b/pkgs/by-name/ou/outputcheck/package.nix index 3b2f06857bd4..bd34f3be799c 100644 --- a/pkgs/by-name/ou/outputcheck/package.nix +++ b/pkgs/by-name/ou/outputcheck/package.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "outputcheck"; version = "0.4.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "stp"; @@ -23,16 +23,18 @@ python3.pkgs.buildPythonApplication rec { # - Fix version number cannot find error postPatch = '' substituteInPlace OutputCheck/Driver.py \ - --replace "argparse.FileType('rU')" "argparse.FileType('r')" + --replace-fail "argparse.FileType('rU')" "argparse.FileType('r')" substituteInPlace tests/invalid-regex-syntax.smt2 \ - --replace "unbalanced parenthesis" "missing ), unterminated subpattern" + --replace-fail "unbalanced parenthesis" "missing ), unterminated subpattern" echo ${version} > RELEASE-VERSION ''; nativeCheckInputs = [ lit ]; + build-system = with python3.pkgs; [ setuptools ]; + checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/pa/parsero/package.nix b/pkgs/by-name/pa/parsero/package.nix index 68725adaa077..02b931032a29 100644 --- a/pkgs/by-name/pa/parsero/package.nix +++ b/pkgs/by-name/pa/parsero/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication { pname = "parsero"; version = "0.81"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "behindthefirewalls"; @@ -16,7 +16,13 @@ python3Packages.buildPythonApplication { sha256 = "rqupeJxslL3AfQ+CzBWRb4ZS32VoYd8hlA+eACMKGPY="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + pythonRemoveDeps = [ + "pip" # this dependency is never actually used + ]; + + dependencies = with python3Packages; [ beautifulsoup4 urllib3 ]; diff --git a/pkgs/by-name/pa/pass-secret-service/package.nix b/pkgs/by-name/pa/pass-secret-service/package.nix index 63653fbfc658..4f9dd3538b6e 100644 --- a/pkgs/by-name/pa/pass-secret-service/package.nix +++ b/pkgs/by-name/pa/pass-secret-service/package.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication { # seemingly abandoned D-Bus package pydbus and started using maintained # dbus-next. So let's use latest from GitHub. version = "0-unstable-2023-12-16"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mdellweg"; @@ -28,14 +28,13 @@ python3.pkgs.buildPythonApplication { # /etc/ in check phase. postPatch = '' substituteInPlace Makefile \ - --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" \ - --replace '-p $(relpassstore)' '-p $(PASSWORD_STORE_DIR)' \ - --replace 'pytest-3' 'pytest' + --replace-fail "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" \ + --replace-fail '-p $(relpassstore)' '-p $(PASSWORD_STORE_DIR)' substituteInPlace systemd/org.freedesktop.secrets.service \ - --replace "/bin/false" "${coreutils}/bin/false" + --replace-fail "/bin/false" "${coreutils}/bin/false" substituteInPlace systemd/dbus-org.freedesktop.secrets.service \ - --replace "/usr/local" "$out" + --replace-fail "/usr/local" "$out" ''; postInstall = '' @@ -44,7 +43,11 @@ python3.pkgs.buildPythonApplication { cp systemd/dbus-org.freedesktop.secrets.service "$out/lib/systemd/user/" ''; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ click cryptography dbus-next @@ -67,6 +70,8 @@ python3.pkgs.buildPythonApplication { checkTarget = "test"; + pythonImportsCheck = [ "pass_secret_service" ]; + passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; diff --git a/pkgs/by-name/pa/patatt/package.nix b/pkgs/by-name/pa/patatt/package.nix index 18e27641b698..2f85a20adc51 100644 --- a/pkgs/by-name/pa/patatt/package.nix +++ b/pkgs/by-name/pa/patatt/package.nix @@ -7,17 +7,23 @@ python3Packages.buildPythonApplication rec { pname = "patatt"; version = "0.6.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-mAgm9lKdJXbCZ8ofVk1b7wRstH5UIVu1mO1sS5stCig="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ pynacl ]; + pythonImportsCheck = [ "patatt" ]; + meta = with lib; { homepage = "https://git.kernel.org/pub/scm/utils/patatt/patatt.git/about/"; license = licenses.mit0; diff --git a/pkgs/by-name/pa/patray/package.nix b/pkgs/by-name/pa/patray/package.nix index 31a1fe0fea22..efb4a2d9f404 100644 --- a/pkgs/by-name/pa/patray/package.nix +++ b/pkgs/by-name/pa/patray/package.nix @@ -8,7 +8,7 @@ python312.pkgs.buildPythonApplication rec { pname = "patray"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version pname; @@ -21,6 +21,8 @@ python312.pkgs.buildPythonApplication rec { sed -i '/pyside2/d' requirements/production.in ''; + build-system = with python312.pkgs; [ setuptools ]; + dependencies = with python312.pkgs; [ pulsectl loguru diff --git a/pkgs/by-name/pe/pentestgpt/package.nix b/pkgs/by-name/pe/pentestgpt/package.nix index d67ab642a20f..77f339398c32 100644 --- a/pkgs/by-name/pe/pentestgpt/package.nix +++ b/pkgs/by-name/pe/pentestgpt/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pentestgpt"; version = "unstable-2023-06-27"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "GreyDGL"; @@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-m0R/kMmbr5Ixuqvw6ZRoaAGCnI3j86Iwk4+TYqv0WbU="; }; + build-system = with python3.pkgs; [ setuptools ]; + pythonRelaxDeps = [ "playwright" ]; pythonRemoveDeps = [ "beautifulsoup4" @@ -23,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { "pytest" ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ beautifulsoup4 colorama google diff --git a/pkgs/by-name/pe/perfect-hash/package.nix b/pkgs/by-name/pe/perfect-hash/package.nix index 0e049f479493..dfeb04d1c22c 100644 --- a/pkgs/by-name/pe/perfect-hash/package.nix +++ b/pkgs/by-name/pe/perfect-hash/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "perfect-hash"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; # Archive on pypi does not contain examples, which are very helpful to # understand how to use this program, so we use git source. @@ -17,6 +17,8 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0gkc3n613hl0q4jknrh2nm1n96j97p36q9jjgarb9d8yii9q7792"; }; + build-system = with python3.pkgs; [ setuptools ]; + postInstall = '' mkdir -p $out/share/doc/perfect-hash cp README.md $out/share/doc/perfect-hash diff --git a/pkgs/by-name/pe/peru/package.nix b/pkgs/by-name/pe/peru/package.nix index 8e21f92c498c..32da97a9c703 100644 --- a/pkgs/by-name/pe/peru/package.nix +++ b/pkgs/by-name/pe/peru/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "peru"; version = "1.3.3"; - format = "setuptools"; + pyproject = true; disabled = python3Packages.pythonOlder "3.5"; @@ -18,7 +18,9 @@ python3Packages.buildPythonApplication rec { sha256 = "FCyR14jcFjI6epoFPNVyFZ4k1URZ1NraX1+ajVcCQ2A="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pyyaml docopt ]; @@ -26,6 +28,8 @@ python3Packages.buildPythonApplication rec { # No tests in archive doCheck = false; + pythonImportsCheck = [ "peru" ]; + meta = with lib; { homepage = "https://github.com/buildinspace/peru"; description = "Tool for including other people's code in your projects"; diff --git a/pkgs/by-name/pe/pew/package.nix b/pkgs/by-name/pe/pew/package.nix index 57f72abc51f2..a1fb12191648 100644 --- a/pkgs/by-name/pe/pew/package.nix +++ b/pkgs/by-name/pe/pew/package.nix @@ -4,22 +4,24 @@ fetchPypi, }: -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "pew"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; }; - propagatedBuildInputs = [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ virtualenv virtualenv-clone - setuptools + setuptools # pkg_resources is imported during runtime ]; # no tests are packaged diff --git a/pkgs/by-name/pg/pg_activity/package.nix b/pkgs/by-name/pg/pg_activity/package.nix index 0fdfe88e5cec..6905a0398bd8 100644 --- a/pkgs/by-name/pg/pg_activity/package.nix +++ b/pkgs/by-name/pg/pg_activity/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "pg_activity"; version = "3.6.0"; - format = "setuptools"; + pyproject = true; disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { @@ -17,7 +17,9 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-7nHtJl/b2pZqiJbpWArMS5jh7B8dv8V1esic6uFPV/0="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ attrs blessed humanize diff --git a/pkgs/by-name/ph/photocollage/package.nix b/pkgs/by-name/ph/photocollage/package.nix index ec2cc1281bd3..1262683c29c4 100644 --- a/pkgs/by-name/ph/photocollage/package.nix +++ b/pkgs/by-name/ph/photocollage/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "photocollage"; version = "1.4.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "adrienverge"; @@ -20,7 +20,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-jDb2mFsok8TNi9+A/FAieqo7YbAUsmrFRBGwdGv71Xg="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pillow pycairo pygobject3 @@ -50,6 +52,8 @@ python3Packages.buildPythonApplication rec { cp -r ./data/icons $out/share/icons ''; + pythonImportsCheck = [ "photocollage" ]; + meta = { description = "Graphical tool to make photo collage posters"; homepage = "https://github.com/adrienverge/PhotoCollage"; diff --git a/pkgs/by-name/pi/pianotrans/package.nix b/pkgs/by-name/pi/pianotrans/package.nix index 61b5af46512f..c53307ee33d3 100644 --- a/pkgs/by-name/pi/pianotrans/package.nix +++ b/pkgs/by-name/pi/pianotrans/package.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pianotrans"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "azuwis"; @@ -17,7 +17,9 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-gRbyUQmPtGvx5QKAyrmeJl0stp7hwLBWwjSbJajihdE="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ piano-transcription-inference resampy tkinter diff --git a/pkgs/by-name/pi/pick-colour-picker/package.nix b/pkgs/by-name/pi/pick-colour-picker/package.nix index 5b94c3d87780..f5a7964fcd58 100644 --- a/pkgs/by-name/pi/pick-colour-picker/package.nix +++ b/pkgs/by-name/pi/pick-colour-picker/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage { pname = "pick-colour-picker"; version = "unstable-2022-05-08"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "stuartlangridge"; @@ -31,6 +31,8 @@ python3Packages.buildPythonPackage { wrapGAppsHook3 ]; + build-system = with python3Packages; [ setuptools ]; + pythonPath = with python3Packages; [ pygobject3 pycairo @@ -41,6 +43,8 @@ python3Packages.buildPythonPackage { gtk3 ]; + pythonImportsCheck = [ "pick" ]; + meta = with lib; { homepage = "https://kryogenix.org/code/pick/"; license = licenses.mit; diff --git a/pkgs/by-name/pi/pifpaf/package.nix b/pkgs/by-name/pi/pifpaf/package.nix index 39875e9f5a5b..c72d6dfe763a 100644 --- a/pkgs/by-name/pi/pifpaf/package.nix +++ b/pkgs/by-name/pi/pifpaf/package.nix @@ -8,14 +8,19 @@ python3Packages.buildPythonApplication rec { pname = "pifpaf"; version = "3.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-xXkMj1sP1xXf6Ad/71BFbq8SHz/uHcaSqv6RQN0Ca1o="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + dependencies = with python3Packages; [ click daiquiri fixtures diff --git a/pkgs/by-name/pi/pipreqs/package.nix b/pkgs/by-name/pi/pipreqs/package.nix index 1e337bc60526..9bf0db09f054 100644 --- a/pkgs/by-name/pi/pipreqs/package.nix +++ b/pkgs/by-name/pi/pipreqs/package.nix @@ -4,19 +4,19 @@ fetchPypi, }: -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "pipreqs"; version = "0.4.13"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-oX8WeIC2khvjdTPOTIHdxuIrRlwQeq1VfbQ7Gt1WqZs="; }; - propagatedBuildInputs = [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ yarg docopt ]; @@ -24,6 +24,8 @@ buildPythonApplication rec { # Tests requires network access. Works fine without sandboxing doCheck = false; + pythonImportsCheck = [ "pipreqs" ]; + meta = with lib; { description = "Generate requirements.txt file for any project based on imports"; homepage = "https://github.com/bndr/pipreqs"; diff --git a/pkgs/by-name/pi/pirate-get/package.nix b/pkgs/by-name/pi/pirate-get/package.nix index ba00a9319978..1338a269282b 100644 --- a/pkgs/by-name/pi/pirate-get/package.nix +++ b/pkgs/by-name/pi/pirate-get/package.nix @@ -9,19 +9,23 @@ with python3Packages; buildPythonApplication rec { pname = "pirate-get"; version = "0.4.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-VtnVyJqrdGXTqcyzpHCOMUI9G7/BkXzihDrBrsxl7Eg="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = [ colorama veryprettytable pyperclip ]; + pythonImportsCheck = [ "pirate" ]; + meta = with lib; { description = "Command line interface for The Pirate Bay"; mainProgram = "pirate-get"; diff --git a/pkgs/by-name/pl/plakativ/package.nix b/pkgs/by-name/pl/plakativ/package.nix index 2d6999d90407..d7b14371f5fe 100644 --- a/pkgs/by-name/pl/plakativ/package.nix +++ b/pkgs/by-name/pl/plakativ/package.nix @@ -9,7 +9,7 @@ let version = "0.5.3"; in python3Packages.buildPythonApplication { - format = "setuptools"; + pyproject = true; inherit pname version; src = fetchPypi { @@ -17,13 +17,18 @@ python3Packages.buildPythonApplication { hash = "sha256-6TvMznd5obkn/gsQTyZ6Pc/dF55I53987EbuSNAlY58="; }; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ pymupdf + img2pdf ] ++ lib.optional guiSupport tkinter; + pythonImportsCheck = [ "plakativ" ]; + meta = { description = "Convert a PDF into a large poster that can be printed on multiple smaller pages"; mainProgram = "plakativ"; diff --git a/pkgs/by-name/pl/plecost/package.nix b/pkgs/by-name/pl/plecost/package.nix index 17cb418999d0..02a466722abb 100644 --- a/pkgs/by-name/pl/plecost/package.nix +++ b/pkgs/by-name/pl/plecost/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication { pname = "plecost"; version = "1.1.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "iniqua"; @@ -27,7 +27,9 @@ python3Packages.buildPythonApplication { }) ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ aiohttp async-timeout termcolor @@ -37,6 +39,8 @@ python3Packages.buildPythonApplication { # Project has no tests doCheck = false; + pythonImportsCheck = [ "plecost_lib" ]; + meta = with lib; { description = "Vulnerability fingerprinting and vulnerability finder for Wordpress blog engine"; mainProgram = "plecost"; diff --git a/pkgs/by-name/po/polygon-cli/package.nix b/pkgs/by-name/po/polygon-cli/package.nix index e69036f99311..32ac6c642d99 100644 --- a/pkgs/by-name/po/polygon-cli/package.nix +++ b/pkgs/by-name/po/polygon-cli/package.nix @@ -7,15 +7,16 @@ python3.pkgs.buildPythonPackage rec { pname = "polygon-cli"; version = "1.1.11"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-gEz3kcXbXj9dXnMCx0Q8TjCQemXvJne9EwFsPt14xV4="; }; - propagatedBuildInputs = with python3.pkgs; [ - setuptools + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ requests prettytable colorama @@ -24,6 +25,8 @@ python3.pkgs.buildPythonPackage rec { doCheck = false; + pythonImportsCheck = [ "polygon_cli" ]; + meta = { description = "Command-line tool for polygon.codeforces.com"; mainProgram = "polygon-cli"; diff --git a/pkgs/by-name/pq/pqos-wrapper/package.nix b/pkgs/by-name/pq/pqos-wrapper/package.nix index 77453a53810a..f89673951e28 100644 --- a/pkgs/by-name/pq/pqos-wrapper/package.nix +++ b/pkgs/by-name/pq/pqos-wrapper/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication { pname = "pqos-wrapper"; version = "unstable-2022-01-31"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { group = "sosy-lab"; @@ -17,8 +17,12 @@ python3.pkgs.buildPythonApplication { hash = "sha256-SaYr6lVucpJjVtGgxRbDGYbOoBwdfEDVKtvD+M1L0o4="; }; + build-system = with python3.pkgs; [ setuptools ]; + makeWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ intel-cmt-cat ]}" ]; + pythonImportsCheck = [ "pqos_wrapper" ]; + meta = with lib; { description = "Wrapper for Intel PQoS for the purpose of using it in BenchExec"; homepage = "https://gitlab.com/sosy-lab/software/pqos-wrapper"; diff --git a/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix b/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix index 46d477840186..0c142b9b10e9 100644 --- a/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix +++ b/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "pre-commit-hook-ensure-sops"; version = "1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "yuvipanda"; @@ -26,8 +26,12 @@ python3Packages.buildPythonApplication rec { }) ]; - propagatedBuildInputs = [ - python3Packages.ruamel-yaml + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + ruamel-yaml ]; pythonImportsCheck = [ diff --git a/pkgs/by-name/pr/precice-config-visualizer/package.nix b/pkgs/by-name/pr/precice-config-visualizer/package.nix index 73d2ba6178ca..7fda6b45eaa6 100644 --- a/pkgs/by-name/pr/precice-config-visualizer/package.nix +++ b/pkgs/by-name/pr/precice-config-visualizer/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication { pname = "config-visualizer"; version = "unstable-2022-02-23"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "precice"; @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication { hash = "sha256-2dnpkec9hN4oAqwu+1WmDJrfeu+JbfqZ6guv3bC4H1c="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ lxml pydot ]; diff --git a/pkgs/by-name/pr/present/package.nix b/pkgs/by-name/pr/present/package.nix index 8d0a9af73abc..190245e4db3e 100644 --- a/pkgs/by-name/pr/present/package.nix +++ b/pkgs/by-name/pr/present/package.nix @@ -18,14 +18,16 @@ in python3Packages.buildPythonPackage rec { pname = "present"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ click pyyaml pyfiglet diff --git a/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix b/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix index d5f11075b3e9..c92fb681a316 100644 --- a/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication { pname = "deluge-exporter"; version = "2.4.0-unstable-2024-06-02"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ibizaman"; @@ -16,7 +16,9 @@ python3.pkgs.buildPythonApplication { hash = "sha256-1brLWx6IEGffcvHPCkz10k9GCNQIXXJ9PYZuEzlKHTA="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ deluge-client loguru prometheus-client diff --git a/pkgs/by-name/pr/protocol/package.nix b/pkgs/by-name/pr/protocol/package.nix index 238667b71d80..a220c6edf95c 100644 --- a/pkgs/by-name/pr/protocol/package.nix +++ b/pkgs/by-name/pr/protocol/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication { pname = "protocol"; version = "unstable-2019-03-28"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "luismartingarcia"; @@ -18,9 +18,11 @@ python3.pkgs.buildPythonApplication { postPatch = '' substituteInPlace setup.py \ - --replace "scripts=['protocol', 'constants.py', 'specs.py']" "scripts=['protocol'], py_modules=['constants', 'specs']" + --replace-fail "scripts=['protocol', 'constants.py', 'specs.py']" "scripts=['protocol'], py_modules=['constants', 'specs']" ''; + build-system = with python3.pkgs; [ setuptools ]; + meta = with lib; { description = "ASCII Header Generator for Network Protocols"; homepage = "https://github.com/luismartingarcia/protocol"; diff --git a/pkgs/by-name/pr/proxmove/package.nix b/pkgs/by-name/pr/proxmove/package.nix index 8007f2a77874..53a081fff346 100644 --- a/pkgs/by-name/pr/proxmove/package.nix +++ b/pkgs/by-name/pr/proxmove/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "proxmove"; version = "1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ossobv"; @@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-8xzsmQsogoMrdpf8+mVZRWPGQt9BO0dBT0aKt7ygUe4="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ proxmoxer ]; diff --git a/pkgs/by-name/ps/ps_mem/package.nix b/pkgs/by-name/ps/ps_mem/package.nix index 3849ff6f53cc..9d360580ab65 100644 --- a/pkgs/by-name/ps/ps_mem/package.nix +++ b/pkgs/by-name/ps/ps_mem/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "ps_mem"; version = "3.14"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pixelb"; @@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-jCfPtPSky/QFk9Xo/tq3W7609Pie1yLC4iS4dqjCa+E="; }; + build-system = with python3Packages; [ setuptools ]; + + pythonImportsCheck = [ "ps_mem" ]; + meta = { description = "Utility to accurately report the in core memory usage for a program"; homepage = "https://github.com/pixelb/ps_mem"; diff --git a/pkgs/by-name/pu/pulsemeeter/package.nix b/pkgs/by-name/pu/pulsemeeter/package.nix index 137bb0ca5bfa..64211a9dbbd7 100644 --- a/pkgs/by-name/pu/pulsemeeter/package.nix +++ b/pkgs/by-name/pu/pulsemeeter/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { pname = "pulsemeeter"; version = "1.2.14"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "theRealCarneiro"; @@ -47,6 +47,8 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; + pythonImportsCheck = [ "pulsemeeter" ]; + passthru.tests.version = callPackage ./version-test.nix { inherit version; }; meta = { diff --git a/pkgs/by-name/pw/pwgen-secure/package.nix b/pkgs/by-name/pw/pwgen-secure/package.nix index cb390ad18690..b489f8afe028 100644 --- a/pkgs/by-name/pw/pwgen-secure/package.nix +++ b/pkgs/by-name/pw/pwgen-secure/package.nix @@ -11,7 +11,7 @@ in buildPythonApplication rec { pname = "pwgen-secure"; version = "0.9.1"; - format = "setuptools"; + pyproject = true; # it needs `secrets` which was introduced in 3.6 disabled = pythonOlder "3.6"; @@ -35,7 +35,9 @@ buildPythonApplication rec { --replace-fail "os.path.join(path, 'words.txt')" "os.path.join('$shareDir', 'words.txt')" ''; - propagatedBuildInputs = with python3Packages; [ docopt ]; + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ docopt ]; postInstall = '' install -Dm555 spwgen.py $out/bin/spwgen @@ -45,6 +47,8 @@ buildPythonApplication rec { # there are no checks doCheck = false; + pythonImportsCheck = [ "pwgen_secure" ]; + meta = with lib; { description = "Secure password generation library to replace pwgen"; homepage = "https://github.com/mjmunger/pwgen_secure/"; diff --git a/pkgs/by-name/py/pyCA/package.nix b/pkgs/by-name/py/pyCA/package.nix index bff6b4802f7c..491175e03036 100644 --- a/pkgs/by-name/py/pyCA/package.nix +++ b/pkgs/by-name/py/pyCA/package.nix @@ -49,7 +49,7 @@ in python3.pkgs.buildPythonApplication rec { pname = "pyca"; version = "4.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "opencast"; @@ -58,7 +58,9 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-cTkWkOmgxJZlddqaSYKva2wih4Mvsdrd7LD4NggxKQk="; }; - propagatedBuildInputs = with python.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python.pkgs; [ pycurl python-dateutil configobj @@ -73,6 +75,8 @@ python3.pkgs.buildPythonApplication rec { sed -i -e 's#static_folder=.*#static_folder="${frontend}/static")#' pyca/ui/__init__.py ''; + pythonImportsCheck = [ "pyca" ]; + passthru = { inherit frontend; }; diff --git a/pkgs/by-name/py/pyamlboot/package.nix b/pkgs/by-name/py/pyamlboot/package.nix index f458c519ad06..299585fd9a5f 100644 --- a/pkgs/by-name/py/pyamlboot/package.nix +++ b/pkgs/by-name/py/pyamlboot/package.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "pyamlboot"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "superna9999"; @@ -24,10 +24,11 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ pyusb - wheel - setuptools + setuptools # pkg_resources is imported during runtime ]; + pythonImportsCheck = [ "pyamlboot" ]; + passthru.tests.version = testers.testVersion { package = pyamlboot; command = "boot.py -v"; diff --git a/pkgs/by-name/py/pychess/package.nix b/pkgs/by-name/py/pychess/package.nix index e8b5d83d6453..ea52b105a179 100644 --- a/pkgs/by-name/py/pychess/package.nix +++ b/pkgs/by-name/py/pychess/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { pname = "pychess"; version = "1.0.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pychess"; @@ -36,7 +36,9 @@ python3Packages.buildPythonApplication rec { gtksourceview ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pygobject3 pycairo sqlalchemy @@ -65,6 +67,8 @@ python3Packages.buildPythonApplication rec { # No tests available. doCheck = false; + pythonImportsCheck = [ "pychess" ]; + meta = { description = "Advanced GTK chess client written in Python"; homepage = "https://pychess.github.io/"; diff --git a/pkgs/by-name/py/pydf/package.nix b/pkgs/by-name/py/pydf/package.nix index ed315fde8df2..5a5fe10d7bf3 100644 --- a/pkgs/by-name/py/pydf/package.nix +++ b/pkgs/by-name/py/pydf/package.nix @@ -7,13 +7,15 @@ python3Packages.buildPythonPackage rec { pname = "pydf"; version = "12"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "7f47a7c3abfceb1ac04fc009ded538df1ae449c31203962a1471a4eb3bf21439"; }; + build-system = with python3Packages; [ setuptools ]; + postInstall = '' mkdir -p $out/share/man/man1 $out/share/pydf install -t $out/share/pydf -m 444 pydfrc diff --git a/pkgs/by-name/py/pykickstart/package.nix b/pkgs/by-name/py/pykickstart/package.nix index b470cc2bdd21..8328f417d060 100644 --- a/pkgs/by-name/py/pykickstart/package.nix +++ b/pkgs/by-name/py/pykickstart/package.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "pykickstart"; version = "3.65"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pykickstart"; @@ -35,6 +35,8 @@ python3Packages.buildPythonApplication rec { # Can't package it and not really necessary so disable them. doCheck = false; + pythonImportsCheck = [ "pykickstart" ]; + meta = { description = "Python package to interact with Kickstart files commonly found in the RPM world"; homepage = "https://github.com/pykickstart/pykickstart"; diff --git a/pkgs/by-name/py/pylode/package.nix b/pkgs/by-name/py/pylode/package.nix index ca8ae3f243e9..d36e6939f145 100644 --- a/pkgs/by-name/py/pylode/package.nix +++ b/pkgs/by-name/py/pylode/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pylode"; version = "2.13.3"; - format = "setuptools"; + pyproject = true; disabled = python3.pythonOlder "3.6"; @@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-AtqkxnpEL+580S/iKCaRcsQO6LLYhkJxyNx6fi3atbE="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ beautifulsoup4 falcon jinja2 diff --git a/pkgs/by-name/py/pympress/package.nix b/pkgs/by-name/py/pympress/package.nix index 23175f261eb9..dcb12b5a0cb5 100644 --- a/pkgs/by-name/py/pympress/package.nix +++ b/pkgs/by-name/py/pympress/package.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { pname = "pympress"; version = "1.8.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cimbali"; @@ -64,6 +64,8 @@ python3Packages.buildPythonApplication rec { doCheck = false; # there are no tests + pythonImportsCheck = [ "pympress" ]; + meta = { description = "Simple yet powerful PDF reader designed for dual-screen presentations"; mainProgram = "pympress"; diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix index fe86671b6f6a..71851e81593d 100644 --- a/pkgs/by-name/py/pyradio/package.nix +++ b/pkgs/by-name/py/pyradio/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; version = "0.9.3.11.15"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "coderholic"; @@ -21,7 +21,9 @@ python3Packages.buildPythonApplication rec { installShellFiles ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ dnspython netifaces psutil diff --git a/pkgs/by-name/py/pyrseas/package.nix b/pkgs/by-name/py/pyrseas/package.nix index f46359552504..cffc9a7e7c87 100644 --- a/pkgs/by-name/py/pyrseas/package.nix +++ b/pkgs/by-name/py/pyrseas/package.nix @@ -8,7 +8,7 @@ let pgdbconn = python3Packages.buildPythonPackage rec { pname = "pgdbconn"; version = "0.8.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "perseas"; @@ -17,12 +17,13 @@ let sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z"; }; + build-system = with python3Packages; [ setuptools ]; + # The tests are impure (they try to access a PostgreSQL server) doCheck = false; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ psycopg2 - pytest ]; }; in @@ -30,7 +31,7 @@ in python3Packages.buildPythonApplication rec { pname = "pyrseas"; version = "0.9.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "perseas"; @@ -39,9 +40,10 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-+MxnxvbLMxK1Ak+qKpKe3GHbzzC+XHO0eR7rl4ON9H4="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ psycopg2 - pytest pyyaml pgdbconn ]; @@ -49,6 +51,8 @@ python3Packages.buildPythonApplication rec { # The tests are impure (they try to access a PostgreSQL server) doCheck = false; + pythonImportsCheck = [ "pyrseas" ]; + meta = { description = "Declarative language to describe PostgreSQL databases"; homepage = "https://perseas.github.io/"; diff --git a/pkgs/by-name/py/pytrainer/package.nix b/pkgs/by-name/py/pytrainer/package.nix index 7922483b17c0..5d0d474d717b 100644 --- a/pkgs/by-name/py/pytrainer/package.nix +++ b/pkgs/by-name/py/pytrainer/package.nix @@ -32,7 +32,7 @@ in python.pkgs.buildPythonApplication rec { pname = "pytrainer"; version = "2.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pytrainer"; @@ -41,12 +41,13 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0="; }; - propagatedBuildInputs = with python.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python.pkgs; [ sqlalchemy python-dateutil matplotlib lxml - setuptools requests gdal ]; @@ -88,7 +89,7 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pytrainer/platform.py \ - --replace 'sys.prefix' "\"$out\"" + --replace-fail 'sys.prefix' "\"$out\"" ''; checkPhase = '' diff --git a/pkgs/by-name/py/pywalfox-native/package.nix b/pkgs/by-name/py/pywalfox-native/package.nix index 74295809d5b5..aab3269eb136 100644 --- a/pkgs/by-name/py/pywalfox-native/package.nix +++ b/pkgs/by-name/py/pywalfox-native/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication { pname = "pywalfox-native"; version = "2.7.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Frewacom"; @@ -15,6 +15,8 @@ python3.pkgs.buildPythonApplication { hash = "sha256-i1DgdYmNVvG+mZiFiBmVHsQnFvfDFOFTGf0GEy81lpE="; }; + build-system = with python3.pkgs; [ setuptools ]; + pythonImportsCheck = [ "pywalfox" ]; meta = with lib; { diff --git a/pkgs/by-name/q-/q-text-as-data/package.nix b/pkgs/by-name/q-/q-text-as-data/package.nix index 48331a879bce..4c4386b602ce 100644 --- a/pkgs/by-name/q-/q-text-as-data/package.nix +++ b/pkgs/by-name/q-/q-text-as-data/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "q-text-as-data"; version = "2.0.19"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "harelba"; @@ -16,8 +16,11 @@ python3Packages.buildPythonApplication rec { sha256 = "18cwyfjgxxavclyd08bmb943c8bvzp1gnqp4klkq5xlgqwivr4sv"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools + ]; + + dependencies = with python3Packages; [ six ]; @@ -28,7 +31,7 @@ python3Packages.buildPythonApplication rec { rm bin/qtextasdata.py # not considered good practice pinning in install_requires - substituteInPlace setup.py --replace 'six==' 'six>=' + substituteInPlace setup.py --replace-fail 'six==' 'six>=' ''; meta = with lib; { diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix index 9619b242fe47..3feacb01b699 100644 --- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix +++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix @@ -7,13 +7,13 @@ (qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec { pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox"; - version = "5.1.0.11"; + version = "5.1.2.10"; src = fetchFromGitHub { owner = "c0re100"; repo = "qBittorrent-Enhanced-Edition"; rev = "release-${version}"; - hash = "sha256-LY79Y7sG6EHGOh1hRujAOMRK3MKSAblJ+FFuGlj13iQ="; + hash = "sha256-Q3gipRgZCzihKUQZZmETT65AUSEUfgj9dFxZFybq258="; }; meta = old.meta // { diff --git a/pkgs/by-name/qu/quisk/package.nix b/pkgs/by-name/qu/quisk/package.nix index a48d2d414e90..b2db75f7f036 100644 --- a/pkgs/by-name/qu/quisk/package.nix +++ b/pkgs/by-name/qu/quisk/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; version = "4.2.42"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -23,13 +23,19 @@ python3.pkgs.buildPythonApplication rec { pulseaudio ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ pyusb wxpython ]; doCheck = false; + pythonImportsCheck = [ "quisk" ]; + meta = with lib; { description = "SDR transceiver for radios that use the Hermes protocol"; longDescription = '' diff --git a/pkgs/by-name/r5/r53-ddns/package.nix b/pkgs/by-name/r5/r53-ddns/package.nix index 548f5c062886..7689d1b02417 100644 --- a/pkgs/by-name/r5/r53-ddns/package.nix +++ b/pkgs/by-name/r5/r53-ddns/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "r53-ddns"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "fleaz"; repo = "r53-ddns"; rev = "v${version}"; - sha256 = "sha256-KJAPhSGaC3upWLfo2eeSD3Vit9Blmbol7s8y3f849N4="; + sha256 = "sha256-+vJrcRxckAISYjab6kVT2mpChra1D3NflOqNWCch15I="; }; - vendorHash = "sha256-KkyMd94cejWkgg/RJudy1lm/M3lsEJXFGqVTzGIX3qM="; + vendorHash = "sha256-ImV/jxCYIWObN+jCSbXhuzR4TuRc/EgQ8SIV6x+wEpA="; meta = with lib; { license = licenses.mit; diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 320acf3b0cdc..b4e78b219325 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2025-06-16"; + version = "0-unstable-2025-07-08"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "65232f0be8d171650e050690ade02c50755241c4"; - hash = "sha256-v/RzEXRie3O37DVVY7bX09rnXMLH7L99o8sWPOPnDOw="; + rev = "9c75757b1de9e1bd93d1b1de5d516a65c481b026"; + hash = "sha256-m3v/HQKDHhfmk7vjbSGxZiyAK2/5b8FVszJjNDHQj2Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/by-name/sd/sdrangel/package.nix similarity index 81% rename from pkgs/applications/radio/sdrangel/default.nix rename to pkgs/by-name/sd/sdrangel/package.nix index aad4b36ed8ad..5e157e279093 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -30,25 +30,14 @@ ninja, opencv4, pkg-config, - qt5compat, - qtcharts, - qtdeclarative, - qtlocation, - qtmultimedia, - qtscxml, - qtserialport, - qtspeech, - qttools, - qtwayland, - qtwebsockets, - qtwebengine, + qt6, + qt6Packages, rtl-sdr, serialdv, sdrplay, sgp4, soapysdr-with-plugins, uhd, - wrapQtAppsHook, zlib, withSDRplay ? false, }: @@ -60,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ymDKHGJNoCOMa1zzFvjTzFa34wP1+iKSfJZZi7Sk/GM="; }; @@ -68,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = @@ -96,17 +85,17 @@ stdenv.mkDerivation (finalAttrs: { limesuite mbelib opencv4 - qt5compat - qtcharts - qtdeclarative - qtlocation - qtmultimedia - qtscxml - qtserialport - qtspeech - qttools - qtwebsockets - qtwebengine + qt6Packages.qt5compat + qt6Packages.qtcharts + qt6Packages.qtdeclarative + qt6Packages.qtlocation + qt6Packages.qtmultimedia + qt6Packages.qtscxml + qt6Packages.qtserialport + qt6Packages.qtspeech + qt6Packages.qttools + qt6Packages.qtwebsockets + qt6Packages.qtwebengine rtl-sdr serialdv sgp4 @@ -114,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { uhd zlib ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] ++ lib.optionals withSDRplay [ sdrplay ]; diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index 3c61ab703de1..4af072e02a88 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -24,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.74.1"; + version = "0.76.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZMi+/d051CS7TcWVZnVItNpok0ac+vAvvZL/buNrtL0="; + hash = "sha256-8V+q28hv7LDsS3SdH27PVHtnAneB55xYqFkhRapkcOI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pRMFWJSRjhZYfX7dmOQXK3BjhJKzPR1Pg+TZzTfPnd4="; + cargoHash = "sha256-z8PbpE+kID+kOmlimuvxTrzoWpbWTKpP6HHnhZDATWM="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-9x1oCzZLBeX0AN+R4qcyBNwsJ/AY6mebCEEfQ5JKpl8="; + hash = "sha256-/DL3sQeeZO4l16/rx7BrWEUGUIAdHft+gO3oJ1WQJUE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 9045fb74a423..1dcee4bb8c21 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -52,13 +52,13 @@ let ''; }); - version = "7.59.0"; + version = "7.61.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-Brvr4SQ2TzAqrvXm9C7a1ejaP4kviJoQhgRBP3R3dIg="; + hash = "sha256-foMzSKm2BROZ8ATCdYx/0sl+4tQfhgoPA4AWSHEKL0Y="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -120,15 +120,15 @@ stdenv.mkDerivation (finalAttrs: { ; hash = if withAppleEmojis then - "sha256-mVC7dOsBcBrOEuz7t4xMv1QX2ZgfA5EjnRYunZEx73E=" + "sha256-ry7s9fbKx4e1LR8DlI2LIJY9GQrxmU7JQt+3apJGw/M=" else - "sha256-9hvqLZGSrzJD5vMTdHoIpDeRM6fu2JSRNdHgyeSWmDY="; + "sha256-AkrfugpNvk4KgesRLQbso8p5b96Dg174R9/xuP4JtJg="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1750885921; + SOURCE_DATE_EPOCH = 1752109090; }; preBuild = '' diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index 21bc6cd536d6..084bf8c0cee2 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.53.0"; + version = "2.54.1"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-JxEeE5r/qQGfTBP0szpChRdPuUl4PMK1km84N/8Dozg="; + hash = "sha256-T8oI04DOnTHFs7xlJ1wJbK64zqgJ2dM4Plz+C26DWEg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qOBjSj1MErB0SajScicVPEn2pqAY+kWq7TS4Wiu4oxI="; + cargoHash = "sha256-KTPZ/1rDqxYxgUfgVTnNg7nLNxwCWGXDf+uJAhmpB3g="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index 5896f815331f..56eaf7261468 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -1,10 +1,10 @@ { "src": { "args": { - "hash": "sha256-laPkmf87ujO0dmQ6LqGSnvajeE2D0i5hL95RxN+SdNA=", + "hash": "sha256-ErUR9Xg69X5PEPoDw65BU2Tcpo7+JC2Pc+pYIxEGzNA=", "owner": "signalapp", "repo": "webrtc", - "tag": "7103d" + "tag": "7103e" }, "fetcher": "fetchFromGitHub" }, diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix index 335f6c5ae2c1..65098121e719 100644 --- a/pkgs/by-name/sk/skopeo/package.nix +++ b/pkgs/by-name/sk/skopeo/package.nix @@ -51,17 +51,28 @@ buildGoModule rec { btrfs-progs ]; - buildPhase = '' - runHook preBuild - patchShebangs . - make bin/skopeo completions docs - runHook postBuild - ''; + buildPhase = + '' + runHook preBuild + patchShebangs . + make bin/skopeo docs + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + make completions + '' + + '' + runHook postBuild + ''; installPhase = '' runHook preInstall - PREFIX=${placeholder "out"} make install-binary install-completions install-docs + PREFIX=${placeholder "out"} make install-binary install-docs + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + PREFIX=${placeholder "out"} make install-completions + '' + + '' install ${passthru.policy}/default-policy.json -Dt $out/etc/containers '' + lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix index 9aaeac88954e..d767cea4fde8 100644 --- a/pkgs/by-name/sn/snazy/package.nix +++ b/pkgs/by-name/sn/snazy/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.56.0"; + version = "0.57.1"; src = fetchFromGitHub { owner = "chmouel"; repo = "snazy"; rev = version; - hash = "sha256-VR4IRMmSQCF/CXgKfJ5OEFbXg9o/40lBonupOF38lFg="; + hash = "sha256-W9Bb9a9oeZF89mopKOY/E44tqj981I6z9EMRHgFb0Eo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tZYAIlQW1IsQSpMF4BmiiCo1CVYjM2GNXcEXT3gCoPA="; + cargoHash = "sha256-yvRZjNY3RRdMm9KuZAwgt4JzvaNwPdia7vQhR7uFNs4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/st/starc/package.nix b/pkgs/by-name/st/starc/package.nix index e9401e32e89d..0c1cb0e656b1 100644 --- a/pkgs/by-name/st/starc/package.nix +++ b/pkgs/by-name/st/starc/package.nix @@ -1,47 +1,34 @@ { - stdenvNoCC, lib, fetchurl, appimageTools, makeWrapper, }: - -stdenvNoCC.mkDerivation (finalAttrs: { +let pname = "starc"; version = "0.7.7"; - src = fetchurl { - url = "https://github.com/story-apps/starc/releases/download/v${finalAttrs.version}/starc-setup.AppImage"; + url = "https://github.com/story-apps/starc/releases/download/v${version}/starc-setup.AppImage"; hash = "sha256-jjas5vx+emdc4OUjXFAGYkKrR6cgb9BlabVv17KAaIQ="; }; - dontUnpack = true; - + appimageContents = appimageTools.extract { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; nativeBuildInputs = [ makeWrapper ]; - - installPhase = - let - appimageContents = appimageTools.extract { inherit (finalAttrs) pname version src; }; - starc-unwrapped = appimageTools.wrapType2 { inherit (finalAttrs) pname version src; }; - in - '' - runHook preInstall - - # Fixup desktop item icons - install -D ${appimageContents}/starc.desktop -t $out/share/applications/ - - substituteInPlace $out/share/applications/starc.desktop \ + extraInstallCommands = '' + # Fixup desktop item icons + install -D ${appimageContents}/starc.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/starc.desktop \ --replace-fail "Icon=starc" "${'' Icon=dev.storyapps.starc StartupWMClass=Story Architect''}" + cp -r ${appimageContents}/share/* $out/share/ - cp -r ${appimageContents}/share/* $out/share/ - - makeWrapper ${starc-unwrapped}/bin/starc $out/bin/starc \ - --unset QT_PLUGIN_PATH - - runHook postInstall - ''; + wrapProgram $out/bin/starc \ + --unset QT_PLUGIN_PATH + ''; meta = { description = "Intuitive screenwriting app that streamlines the writing process"; @@ -51,4 +38,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ pancaek ]; platforms = [ "x86_64-linux" ]; }; -}) +} diff --git a/pkgs/by-name/tm/tmc-cli/package.nix b/pkgs/by-name/tm/tmc-cli/package.nix index 03ec3a00e500..21d407b6729a 100644 --- a/pkgs/by-name/tm/tmc-cli/package.nix +++ b/pkgs/by-name/tm/tmc-cli/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, rustPlatform, writableTmpDirAsHomeHook, @@ -23,6 +24,16 @@ rustPlatform.buildRustPackage (finalAttrs: { writableTmpDirAsHomeHook ]; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # When sandboxing, "Attempted to create a NULL object." + # https://github.com/mullvad/system-configuration-rs/pull/59 may fix. + "--skip=commands::courses::tests::list_courses_with_client_test" + # Same + "--skip=all_integration_tests" + # When sandboxing, "Lazy instance has previously been poisoned." + "--skip=commands::exercises::tests::list_exercises_with_client_test" + ]; + nativeInstallCheckInputs = [ versionCheckHook ]; @@ -30,6 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; versionCheckProgramArg = "--version"; + __darwinAllowLocalNetworking = true; + meta = { description = "CLI for using the TestMyCode programming assignment evaluator"; homepage = "https://github.com/rage/tmc-cli-rust"; diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 4ca2f3657fc2..b0452059e350 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.4.13"; + version = "0.4.25"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-DYr9RtWV2Fs1YGQ5V00eACLerJSsm34mPYdmVWRKXSQ="; + hash = "sha256-EVr4qybyLtGgNde0uuNoQYv2jugNGJups5HUcs7n4KI="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-JyYA/Bu1gcj7s5hxx9LOcrN28Klhz3Qy1SbGoWEiwnA="; + cargoHash = "sha256-vtaif74fYBCP0AAL1NFXxHJ/casZGwTJsmwZLiWqY64="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index da905c47a5fb..001a8d05779f 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "walker"; - version = "0.12.28"; + version = "0.12.31"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-OHBhSYWZ11wEMIwHlh6tK1AM/0JWV5PcoMC783uOUVs="; + hash = "sha256-G55itZe9xAlEq1x4IsE6Pm17t0c7A4obmOTRXjChs+o="; }; - vendorHash = "sha256-SG1JTl/Al9bRyDkzN7xliuZIAMifQJZdIeC5fr0WpWw="; + vendorHash = "sha256-250HPwSkcT7pOulhqAtmuoWOJUakF0S1bpZ8FMsp7bU="; subPackages = [ "cmd/walker.go" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wp/wpprobe/package.nix b/pkgs/by-name/wp/wpprobe/package.nix new file mode 100644 index 000000000000..866956db428b --- /dev/null +++ b/pkgs/by-name/wp/wpprobe/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + writableTmpDirAsHomeHook, +}: + +buildGoModule (finalAttrs: { + pname = "wpprobe"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "Chocapikk"; + repo = "wpprobe"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6aL1hK9oZYcBVQbfualIOsYrbMWTA1uV+fEKbOFaSHU="; + }; + + vendorHash = "sha256-KV6Ss0fN3xwm5Id7MAHMUjq9TsQbaInLjd5xcLKGX6U="; + + nativeCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + + ldflags = [ + "-s" + "-w" + "-X=github.com/Chocapikk/wpprobe/internal/utils.Version=v${finalAttrs.version}" + ]; + + doInstallCheck = true; + + checkFlags = [ + # Test requires network access + "-skip=TestUpdateWordfence" + ]; + + meta = { + description = "WordPress plugin enumeration tool"; + homepage = "https://github.com/Chocapikk/wpprobe"; + changelog = "https://github.com/Chocapikk/wpprobe/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "wpprobe"; + }; +}) diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index b2d6986e776c..e4c82953310f 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -8,7 +8,7 @@ ORBit2, libxml2, polkit, - python3, + python312, intltool, }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool - python3 + python312 glib ]; diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json index cbbe122dc72f..806afbd4ba85 100644 --- a/pkgs/development/compilers/flutter/versions/3_32/data.json +++ b/pkgs/development/compilers/flutter/versions/3_32/data.json @@ -1,17 +1,17 @@ { - "version": "3.32.5", - "engineVersion": "dd93de6fb1776398bf586cbd477deade1391c7e4", + "version": "3.32.6", + "engineVersion": "72f2b18bb094f92f62a3113a8075240ebb59affa", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-IUvraWqQxNba63OI4AVJNerMt6zdq5D5W8SKVMaDRLc=", - "x86_64-linux": "sha256-IUvraWqQxNba63OI4AVJNerMt6zdq5D5W8SKVMaDRLc=" + "aarch64-linux": "sha256-MjWz+aveIDXygAejZiNGFZluR0gjpS62h16UcFGz7FA=", + "x86_64-linux": "sha256-MjWz+aveIDXygAejZiNGFZluR0gjpS62h16UcFGz7FA=" }, "x86_64-linux": { - "aarch64-linux": "sha256-f1GZHMH6LJRSlgT1CSOGscwrkcV3EOxc61KctAXgZcM=", - "x86_64-linux": "sha256-f1GZHMH6LJRSlgT1CSOGscwrkcV3EOxc61KctAXgZcM=" + "aarch64-linux": "sha256-jWM+egf2tZVR8bnBXSHiXOG0CbkEjxEqxwPnaR7tJKk=", + "x86_64-linux": "sha256-jWM+egf2tZVR8bnBXSHiXOG0CbkEjxEqxwPnaR7tJKk=" } }, "dartVersion": "3.8.1", @@ -21,53 +21,53 @@ "x86_64-darwin": "sha256-S3iGDVLollApke2SnXAcV919qsDTVmz5Gf9fTletr00=", "aarch64-darwin": "sha256-haHQks9N1mBIqRsYg9sOLw7ra7gC708gsTWfKxvIK1c=" }, - "flutterHash": "sha256-qiFYbKUVdRNc2RV6uJAayQ7PrMZWNziAgI8++KEMpxA=", + "flutterHash": "sha256-YxApWMp6Ax1ZNOH/7kgeXgiaBcXN7Ves4TFUImFtd3s=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-JBBlXNXcBbygs7GNCcTYmeSuKOjTKHMZsiuSHiuWWM4=", - "aarch64-linux": "sha256-72mofJFv9hVFaPK3sj57fqcF7NvcDgLHD0QILZ6TM7M=", - "x86_64-darwin": "sha256-JBBlXNXcBbygs7GNCcTYmeSuKOjTKHMZsiuSHiuWWM4=", - "x86_64-linux": "sha256-72mofJFv9hVFaPK3sj57fqcF7NvcDgLHD0QILZ6TM7M=" + "aarch64-darwin": "sha256-thfXrVn6nWlQg23yDHiNAx6XebQkV80tkckONwmfjaU=", + "aarch64-linux": "sha256-fM90NqMpD4SkrjZfDXvHjMNdGiaDqX2T+A4cNNZkplk=", + "x86_64-darwin": "sha256-thfXrVn6nWlQg23yDHiNAx6XebQkV80tkckONwmfjaU=", + "x86_64-linux": "sha256-fM90NqMpD4SkrjZfDXvHjMNdGiaDqX2T+A4cNNZkplk=" }, "fuchsia": { - "aarch64-darwin": "sha256-aJmLxwEBV8VronlVcPazczpcVxl30A+y2v6LtpXQ+ug=", - "aarch64-linux": "sha256-aJmLxwEBV8VronlVcPazczpcVxl30A+y2v6LtpXQ+ug=", - "x86_64-darwin": "sha256-aJmLxwEBV8VronlVcPazczpcVxl30A+y2v6LtpXQ+ug=", - "x86_64-linux": "sha256-aJmLxwEBV8VronlVcPazczpcVxl30A+y2v6LtpXQ+ug=" + "aarch64-darwin": "sha256-Lh6z51v14kZIGxriaKDdOn5fAKyANm8FAzIozoOiAZg=", + "aarch64-linux": "sha256-Lh6z51v14kZIGxriaKDdOn5fAKyANm8FAzIozoOiAZg=", + "x86_64-darwin": "sha256-Lh6z51v14kZIGxriaKDdOn5fAKyANm8FAzIozoOiAZg=", + "x86_64-linux": "sha256-Lh6z51v14kZIGxriaKDdOn5fAKyANm8FAzIozoOiAZg=" }, "ios": { - "aarch64-darwin": "sha256-6rI+Pxqqg7K2qcXZSH9/DhwJoJgEJ9+QkoyiAr0CyUo=", - "aarch64-linux": "sha256-6rI+Pxqqg7K2qcXZSH9/DhwJoJgEJ9+QkoyiAr0CyUo=", - "x86_64-darwin": "sha256-6rI+Pxqqg7K2qcXZSH9/DhwJoJgEJ9+QkoyiAr0CyUo=", - "x86_64-linux": "sha256-6rI+Pxqqg7K2qcXZSH9/DhwJoJgEJ9+QkoyiAr0CyUo=" + "aarch64-darwin": "sha256-zCR8wt7QZHl9UFOhkU8KFkyRbaUitXJHTiMLOe+M5/g=", + "aarch64-linux": "sha256-zCR8wt7QZHl9UFOhkU8KFkyRbaUitXJHTiMLOe+M5/g=", + "x86_64-darwin": "sha256-zCR8wt7QZHl9UFOhkU8KFkyRbaUitXJHTiMLOe+M5/g=", + "x86_64-linux": "sha256-zCR8wt7QZHl9UFOhkU8KFkyRbaUitXJHTiMLOe+M5/g=" }, "linux": { - "aarch64-darwin": "sha256-/GxeyrWsQdEX5cmFrGiRMKpPt7Hr7CgQf3eSjdcifvI=", - "aarch64-linux": "sha256-/GxeyrWsQdEX5cmFrGiRMKpPt7Hr7CgQf3eSjdcifvI=", - "x86_64-darwin": "sha256-y6yHQfiWq6G9Nc0qD8ptgqPjYWRyIEu4onwlW/AXSB0=", - "x86_64-linux": "sha256-y6yHQfiWq6G9Nc0qD8ptgqPjYWRyIEu4onwlW/AXSB0=" + "aarch64-darwin": "sha256-dSXB6GFQZjHoyiDStAnohYtzFIrVWmD3DfQ0b+cGwcU=", + "aarch64-linux": "sha256-dSXB6GFQZjHoyiDStAnohYtzFIrVWmD3DfQ0b+cGwcU=", + "x86_64-darwin": "sha256-9ds2C7XBIvnzbgwcBPwJhaF/l/t+uZQEiuwQg2WIVkE=", + "x86_64-linux": "sha256-9ds2C7XBIvnzbgwcBPwJhaF/l/t+uZQEiuwQg2WIVkE=" }, "macos": { - "aarch64-darwin": "sha256-80OvLcvTZ9YxgodTEPo6GF+DrFyQ9tbzAF/6AyDVqIA=", - "aarch64-linux": "sha256-80OvLcvTZ9YxgodTEPo6GF+DrFyQ9tbzAF/6AyDVqIA=", - "x86_64-darwin": "sha256-80OvLcvTZ9YxgodTEPo6GF+DrFyQ9tbzAF/6AyDVqIA=", - "x86_64-linux": "sha256-80OvLcvTZ9YxgodTEPo6GF+DrFyQ9tbzAF/6AyDVqIA=" + "aarch64-darwin": "sha256-Qybdtwy8MfPEsCJUHxlV62fZyEAClOHM4thsEw4nmvg=", + "aarch64-linux": "sha256-Qybdtwy8MfPEsCJUHxlV62fZyEAClOHM4thsEw4nmvg=", + "x86_64-darwin": "sha256-Qybdtwy8MfPEsCJUHxlV62fZyEAClOHM4thsEw4nmvg=", + "x86_64-linux": "sha256-Qybdtwy8MfPEsCJUHxlV62fZyEAClOHM4thsEw4nmvg=" }, "universal": { - "aarch64-darwin": "sha256-MbKydBhX2pT/H5E0sif/aqvMjHSB3ch8e7aiO90daIU=", - "aarch64-linux": "sha256-UHb2USyHW1zjC8lDW/NbJEIm+UWvvdl4lRp1s5tSA+c=", - "x86_64-darwin": "sha256-iFQbCFOLkD920F4gCrZDAl3cr7o+IXr3EWp5z/wj2OU=", - "x86_64-linux": "sha256-zzUQlYs+o/irWlUIZyXJ2+qFRXhhtPQNI+VPcp7uD78=" + "aarch64-darwin": "sha256-37CxKej4SB4Qm3aJVkf3SK0uiimLYSGJBAOwqWStmEY=", + "aarch64-linux": "sha256-7p4CTx///0ND5xUpb9uGbBgaLeClt/aGoSm6mE56ySk=", + "x86_64-darwin": "sha256-sjrzv4jJ28RViNaC7jG4utnerBj3521kXfT8CAgGOLI=", + "x86_64-linux": "sha256-B9gqS5lfLy8pYjP7N52jLqZmroukuAS/ed0xP5xspeg=" }, "web": { - "aarch64-darwin": "sha256-xaJtvj3UJFnMVe+CLDriQ3BqISlrIflpYXdtNuTlB3g=", - "aarch64-linux": "sha256-xaJtvj3UJFnMVe+CLDriQ3BqISlrIflpYXdtNuTlB3g=", - "x86_64-darwin": "sha256-xaJtvj3UJFnMVe+CLDriQ3BqISlrIflpYXdtNuTlB3g=", - "x86_64-linux": "sha256-xaJtvj3UJFnMVe+CLDriQ3BqISlrIflpYXdtNuTlB3g=" + "aarch64-darwin": "sha256-iLAX0UCh+ZTsSggKj29cUm+8CIEJfXj+iWiTV1ndfrU=", + "aarch64-linux": "sha256-iLAX0UCh+ZTsSggKj29cUm+8CIEJfXj+iWiTV1ndfrU=", + "x86_64-darwin": "sha256-iLAX0UCh+ZTsSggKj29cUm+8CIEJfXj+iWiTV1ndfrU=", + "x86_64-linux": "sha256-iLAX0UCh+ZTsSggKj29cUm+8CIEJfXj+iWiTV1ndfrU=" }, "windows": { - "x86_64-darwin": "sha256-fgM3VMvwTGs4MVndmJmjkr3+bpS/sNcyDAnt6EBDzAM=", - "x86_64-linux": "sha256-fgM3VMvwTGs4MVndmJmjkr3+bpS/sNcyDAnt6EBDzAM=" + "x86_64-darwin": "sha256-7M6lLznB1FwQi4e4O6r5IWRxYFaXhfdkSx3rN2GZr5c=", + "x86_64-linux": "sha256-7M6lLznB1FwQi4e4O6r5IWRxYFaXhfdkSx3rN2GZr5c=" } }, "pubspecLock": { diff --git a/pkgs/development/coq-modules/Ordinal/default.nix b/pkgs/development/coq-modules/Ordinal/default.nix index 1a3571589d61..381f9fdab4e4 100644 --- a/pkgs/development/coq-modules/Ordinal/default.nix +++ b/pkgs/development/coq-modules/Ordinal/default.nix @@ -12,11 +12,12 @@ mkCoqDerivation { with lib.versions; lib.switch coq.version [ { - case = range "8.12" "8.18"; - out = "0.5.3"; + case = range "8.12" "8.20"; + out = "0.5.4"; } ] null; release = { + "0.5.4".sha256 = "sha256-PaEC71FzJzHVGYpf3J1jvb/JsJzzMio0L5d5dPwiXuc="; "0.5.3".sha256 = "sha256-Myxwy749ZCBpqia6bf91cMTyJn0nRzXskD7Ue8kc37c="; "0.5.2".sha256 = "sha256-jf16EyLAnKm+42K+gTTHVFJqeOVQfIY2ozbxIs5x5DE="; "0.5.1".sha256 = "sha256-ThJ+jXmtkAd3jElpQZqfzqqc3EfoKY0eMpTHnbrracY="; diff --git a/pkgs/development/python-modules/doubleratchet/default.nix b/pkgs/development/python-modules/doubleratchet/default.nix index 8b4340fb7557..83abc30b3ee1 100644 --- a/pkgs/development/python-modules/doubleratchet/default.nix +++ b/pkgs/development/python-modules/doubleratchet/default.nix @@ -8,18 +8,19 @@ typing-extensions, pytestCheckHook, pytest-asyncio, + pytest-cov-stub, }: buildPythonPackage rec { pname = "doubleratchet"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Syndace"; repo = "python-doubleratchet"; tag = "v${version}"; - hash = "sha256-yoph3u7LjGjSPi1hFlXzWmSNkCXvY/ocTt2MKa+F1fs="; + hash = "sha256-TgkRityDMSzyF6ihM63lAGCSrCHCHrsbCyGYUaObvDU="; }; strictDeps = true; @@ -37,6 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-asyncio + pytest-cov-stub ]; pythonImportsCheck = [ "doubleratchet" ]; diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 90b63e1e487e..21ba08cf7142 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "1.6.1"; + version = "1.6.3"; pyproject = true; src = fetchFromGitHub { owner = "h5netcdf"; repo = "h5netcdf"; tag = "v${version}"; - hash = "sha256-DQ4zGtX0+HvSuayyaCwO6NVSQWj8JRzYS/BfBtspZxI="; + hash = "sha256-frKnnUh5OFeQGAhf/y5idMWGb0ufHznz4u5A8FRJSuA="; }; build-system = [ diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 9e0d9c582981..8eabbccc815c 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ha-mqtt-discoverable"; - version = "0.20.0"; + version = "0.20.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "unixorn"; repo = "ha-mqtt-discoverable"; tag = "v${version}"; - hash = "sha256-1kI07OalbzxQ5zeDgT9cnFEr86epKYjPhHaUZfshwrk="; + hash = "sha256-XaaL5O6WHIs+9vNq/IqolPUsL04l6PCKTZNBTYH1z4g="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 891965e2e941..143f3581cc3e 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "libvirt"; - version = "11.4.0"; + version = "11.5.0"; pyproject = true; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; tag = "v${version}"; - hash = "sha256-jI14/lBuqSqI8mnTa7dqa+B+6tU2erW6wlT8E0eTgtY="; + hash = "sha256-8VW5MDHmGnR1DM6e9o72iQ5pFBZQQ50v2q3ansAf8g0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llama-cloud-services/default.nix b/pkgs/development/python-modules/llama-cloud-services/default.nix index 4ac8dd594d5e..4314adb729dc 100644 --- a/pkgs/development/python-modules/llama-cloud-services/default.nix +++ b/pkgs/development/python-modules/llama-cloud-services/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "llama-cloud-services"; - version = "0.6.41"; + version = "0.6.46"; pyproject = true; src = fetchFromGitHub { owner = "run-llama"; repo = "llama_cloud_services"; tag = "v${version}"; - hash = "sha256-TNcBUW0pJa6WoK7rNGHitm9xbdie4JV/ZmOc169/XzY="; + hash = "sha256-GRMoRRmAvtcaNFyPHEbiuCohmYji1j9shlPbriJqfIM="; }; pythonRelaxDeps = [ "llama-cloud" ]; diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index c0468d9d5979..55fca3af0578 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.29"; + version = "0.1.33"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-aZWUPtTx0f5lT36l0BlwYRxdxwYC3q+TeGt/lUXnDx4="; + hash = "sha256-oLuQDVpuhvjHZ7SGhsUlNnmtfKG1dhLcObB2fletPXg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index bc80353ca4a3..a7b7ca7ed607 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.4.9"; + version = "0.4.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-FTzA9J3KoMxEeV4tPqIO+33RJRNowNdwSm4mqsZhHJ0="; + hash = "sha256-0v5T/rac/kV1LttzKL8NJfapBxs8BWeH5mG5Plt0iig="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index d5c2e61913fa..64e8f8d4d8ec 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-2ugYOhBVG72JaGuU7SlKbPRGM8PdYoXE+ZHIUDG3pV8="; + hash = "sha256-w68M8eKn5e9E0Lrlqo6IcrVMXda3Ma+66fE//rSZe+A="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 1884be89b303..3109f18373b7 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.12.44"; + version = "0.12.46"; pyproject = true; disabled = pythonOlder "3.9"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; tag = "v${version}"; - hash = "sha256-i/aH/PU2e03jy6dWYhrn2QhTrc4UMr7cRGqhkbMbqug="; + hash = "sha256-B1i5zabacapc/ipPTQtQzLVZql5ifqxfFoDhaBR+eYc="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index e5052ea8a0a4..0372283f8d2a 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.7.7"; + version = "0.7.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-f9cwopZ9wg60Iq4vpAKLTPcCMRSlz621IyNVE3dUGG8="; + hash = "sha256-UyZ5B+I9j7y7l8epYXekFEbeGFUMpgMCdgkuc7RcqIA="; }; pythonRelaxDeps = [ "llama-cloud" ]; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index d8faea57cbad..ed3ba1adece5 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -2,6 +2,7 @@ lib, beautifulsoup4, buildPythonPackage, + defusedxml, fetchPypi, hatchling, llama-index-core, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.4.9"; + version = "0.4.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-twX9QqKHWvA9NDxmsoE4RxgAzROmfvzEiuKYOznYFsc="; + hash = "sha256-GyHLZteN1fYOhxZgfZpHzNgbs5EG1FlmW+HKd5npWXs="; }; pythonRelaxDeps = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { dependencies = [ beautifulsoup4 + defusedxml llama-index-core pymupdf pypdf diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 00fcd65b3d1b..d5cc82737303 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -2,16 +2,16 @@ lib, buildPythonPackage, fetchPypi, - llama-index-core, - qdrant-client, - poetry-core, grpcio, + hatchling, + llama-index-core, pythonOlder, + qdrant-client, }: buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,10 +19,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-8vBnEOX6Ob4cXxQofmuxJBZumxdFug88JhGt1UnuAGs="; + hash = "sha256-14hQ/MCrwf1tucVprPbo2mLRuBWaHI0S515sbNB3Q1I="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ grpcio diff --git a/pkgs/development/python-modules/llama-index-workflows/default.nix b/pkgs/development/python-modules/llama-index-workflows/default.nix index 78d738d83a71..225a1d0bcb34 100644 --- a/pkgs/development/python-modules/llama-index-workflows/default.nix +++ b/pkgs/development/python-modules/llama-index-workflows/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "llama-index-workflows"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; src = fetchPypi { pname = "llama_index_workflows"; inherit version; - hash = "sha256-B6aM9YBA1GmvjQX1YhdBiuZARVfwJUv/IqdIGYeBjj8="; + hash = "sha256-/wAdNiEAv8KjNTzF8lKKCttSJF5jIZGoa0vdrN5ytq8="; }; pythonRelaxDeps = [ "pydantic" ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 6a74e6fb123e..26e74400371f 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.6.37"; + version = "0.6.46"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-ZKeUdxHnnQns1j4MnKaHGvRbE6cFfd6BJGkT11bUZnQ="; + hash = "sha256-YFQ/90Es+9JwNSLlmtuJE+2pZr5+keOVvxFNY1T05e8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/nominal/default.nix b/pkgs/development/python-modules/nominal/default.nix index 72bed6396d8f..63d4679dd330 100644 --- a/pkgs/development/python-modules/nominal/default.nix +++ b/pkgs/development/python-modules/nominal/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "nominal"; - version = "1.59.0"; + version = "1.65.0"; pyproject = true; src = fetchFromGitHub { owner = "nominal-io"; repo = "nominal-client"; tag = "v${version}"; - hash = "sha256-wWy7i9lWZzDCx3cPyViLp7r7hSSDQbqdSUABX7L0LSE="; + hash = "sha256-MDIrKDMU4PgCXxaraVYKeRwgn84UXdwxNeyoJvMHiuE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 21e2018a5815..5269e2bf612e 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.7.1"; + version = "1.7.2"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-gM67iOMxCIfThsiC+JSxN6N3A1VhoGCZCP4tH1QrWIw="; + hash = "sha256-5gFBqEupP+v/W+tWe+x9wScejTJcvaplXtt1Gidoazo="; dist = "py3"; python = "py3"; }; diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix index c942e1383eb5..79562b005d65 100644 --- a/pkgs/development/python-modules/pyghmi/default.nix +++ b/pkgs/development/python-modules/pyghmi/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pyghmi"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-XS0QQhHLkld9swn4WYj6nnMkMO6BZZ5iG0oJgFOCC9k="; + hash = "sha256-VCgUWUiPaCSZnmSar7e7SkI6cEw/hwv2bh5sfvTMmA0="; }; build-system = [ diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 76af3b6373ed..752621713dd4 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; tag = version; - hash = "sha256-859+qKkOZBVU96QJI4YlQGXM9O81yjMmmwhAlxqO4QY="; + hash = "sha256-ayueOCgbn90vFtDfKtfOhFvWX5p3nsrg7sBQP0QBNaQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index 5b0084ee36a8..56d1d05a5579 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytransportnswv2"; - version = "0.8.0"; + version = "0.8.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyTransportNSWv2"; inherit version; - hash = "sha256-IQhapQzzrjvhB2pWxoIePEk7epiuC0IolO7SM3/QSWg="; + hash = "sha256-IjEc+fIlov0eOFhgq+k64aINqVVHq63pHEZrxAMUH+Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 15c1d7696b24..cda00704fac7 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.44.0"; + version = "2.50.0"; pyproject = true; src = fetchFromGitHub { owner = "openviess"; repo = "PyViCare"; tag = version; - hash = "sha256-R7GhMiE4gXCTQkew7meSkMBGSdZlTKd9X2A1zEgC8ng="; + hash = "sha256-RV82dsr3asZKlgURfUdcYoaLFqSvvvLJCvZiH0CYGpk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index 9f6bc15ad8ed..c4e7fa8a939a 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "translate-toolkit"; - version = "3.15.5"; + version = "3.15.6"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "translate"; repo = "translate"; tag = version; - hash = "sha256-VrnL9hD7NroXCyTydLIJlpBTGkUuCLKhrQJPWe3glAM="; + hash = "sha256-G6DzpOkyD2FiskHwOhOsgRrZCXQJ9ITjp6PVZd3j9f4="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 2c204a84c446..5a12457f8fba 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.6.4"; + version = "9.6.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; tag = version; - hash = "sha256-tl4kCTpehILfX5Fvk2+GWL0Lm6btkmxSO3VHXEK1uXo="; + hash = "sha256-zMVeqY7pr+4JfUVPUcfSQsKEB88+nH2dzKrkTP54vIE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 820cda2373bf..f7a06df6ebbc 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.5.0"; + version = "3.5.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mAuMJzuXxO00j0YqxZ21qk+HTAwBhPCws6DUhE9vIrs="; + hash = "sha256-FUITbL+FnscmZjZMlgh/dX4+tJR6MD0LoH5jDNisQkI="; }; build-system = [ diff --git a/pkgs/development/python-modules/xnatpy/default.nix b/pkgs/development/python-modules/xnatpy/default.nix index bd378229c9d3..c96b0f87fd63 100644 --- a/pkgs/development/python-modules/xnatpy/default.nix +++ b/pkgs/development/python-modules/xnatpy/default.nix @@ -3,48 +3,64 @@ buildPythonPackage, fetchPypi, pythonOlder, - setuptools, + hatchling, + versioningit, click, + click-option-group, + importlib-metadata, isodate, progressbar2, pydicom, + python-dateutil, + pyyaml, requests, }: buildPythonPackage rec { pname = "xnatpy"; - version = "0.5.1"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "0.7.2"; + pyproject = true; src = fetchPypi { pname = "xnat"; inherit version; - hash = "sha256-iOw9cVWP5Am4S9JQ0NTmtew38KZiKmau+19K2KG2aKQ="; + hash = "sha256-YbZJl6lvhuhpmeC+0LikZghIEsR2OYe0Om6IRxZcBwg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + hatchling + versioningit + ]; - propagatedBuildInputs = [ + dependencies = [ click + click-option-group + importlib-metadata isodate progressbar2 pydicom + python-dateutil + pyyaml requests ]; + pythonRelaxDeps = [ + "importlib-metadata" + "python-dateutil" + "pydicom" + ]; + # tests missing in PyPI dist and require network access and Docker container doCheck = false; pythonImportsCheck = [ "xnat" ]; - meta = with lib; { + meta = { homepage = "https://xnat.readthedocs.io"; description = "New XNAT client (distinct from pyxnat) that exposes XNAT objects/functions as Python objects/functions"; changelog = "https://gitlab.com/radiology/infrastructure/xnatpy/-/blob/${version}/CHANGELOG?ref_type=tags"; - license = licenses.asl20; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; mainProgram = "xnat"; }; } diff --git a/pkgs/development/tools/ceedling/Gemfile.lock b/pkgs/development/tools/ceedling/Gemfile.lock index 8bfdb142d5bc..e7a6b7c7082c 100644 --- a/pkgs/development/tools/ceedling/Gemfile.lock +++ b/pkgs/development/tools/ceedling/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - ceedling (1.0.0) + ceedling (1.0.1) constructor (~> 2) deep_merge (~> 1.2) diy (~> 1.1) @@ -26,4 +26,4 @@ DEPENDENCIES ceedling BUNDLED WITH - 2.5.22 + 2.5.9 diff --git a/pkgs/development/tools/ceedling/gemset.nix b/pkgs/development/tools/ceedling/gemset.nix index e1fc919025ba..6c5566eb12e7 100644 --- a/pkgs/development/tools/ceedling/gemset.nix +++ b/pkgs/development/tools/ceedling/gemset.nix @@ -12,10 +12,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c6f8gypc86rc7ww3c2lcqy0z08ksdzjdw0zkdd9whairx6flhvl"; + sha256 = "05iacl7p408b4p47khhvpp9hf00smb70x1qj8xmw50mdq2vng6gn"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; constructor = { groups = [ "default" ]; diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 80e901cf0670..a3ebc1d70688 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "jetify-com"; repo = pname; rev = version; - hash = "sha256-bnquJceB1zaW1ZWU5yOWP35fkpgZWW8QQA6wzsq+RKc="; + hash = "sha256-LAYGjpaHxlolzzpilD3DOvd+J0eNJ0p+VdRayGQvUWo="; }; ldflags = [ @@ -27,7 +27,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-zqkuq8MlUCELjo4Z/uJhs65XUYyH755/ohgz1Ao4UAQ="; + vendorHash = "sha256-cBRdJUviqtzX1W85/rZr23W51mdjoEPCwXxF754Dhqw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index cd036c46e4ee..22ae2b01ece1 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1366,7 +1366,7 @@ }, "src/electron": { "args": { - "hash": "sha256-Y6OnTmAleyYsmUn/F6kOFNkA4x+QQt00mx97UNWVIWU=", + "hash": "sha256-/5e0R3R3RRsRNcYYHqb/VJ8DIXc528baIccnQocoxwU=", "owner": "electron", "repo": "electron", "tag": "v36.7.1" diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 56b628ad9054..40ee58de2cf9 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gutenprint"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2"; - sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p"; + url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.xz"; + hash = "sha256-9an0feKFMLGuIGnPvGR6mmQbruq+gJuw7ys+xblmjXA="; }; strictDeps = true; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix index 2b8333298f98..bc495d386ad5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix @@ -2,12 +2,12 @@ grafanaPlugin { pname = "grafana-github-datasource"; - version = "1.9.0"; + version = "1.9.2"; zipHash = { - x86_64-linux = "sha256-DQKb8VKa41bL6D9DN8OpL3sqBIlRCa1zgIjduD6AcQc="; - aarch64-linux = "sha256-RHFURMnBF14QCZhVxZQO3JJ3OP6JXD2Hfef8IyVOgBs="; - x86_64-darwin = "sha256-UBwc8CZRRHsEKpzTgn5PNXjxLzETyWKGsDFtXZnkRW4="; - aarch64-darwin = "sha256-xgQ7s3QP7Sq8ni0n54NE/nYlyALIESfXNKncruAWty0="; + x86_64-linux = "sha256-gh+vdZ8vkG/0OosqJSoh54Gi3JQGGm7YF0YgQCXr0LY="; + aarch64-linux = "sha256-OEDT5N/AyL3xocl1nesV9hCcfA/a8XBPBoaOH4UTo+M="; + x86_64-darwin = "sha256-5WrWvZriXjQIId52Y6THAVg7RfQFl1CT5qhKr/m0vVk="; + aarch64-darwin = "sha256-4IowlmyDGjxHBHvBD/eqZvouuOEvlad0nW8L0n8hf+g"; }; meta = with lib; { description = "The GitHub datasource allows GitHub API data to be visually represented in Grafana dashboards."; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 17b4805878c3..145708bc4fdf 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -59,14 +59,14 @@ let in { nextcloud30 = generic { - version = "30.0.12"; - hash = "sha256-nhmyX0InPUNhIYQmtHYqdmvuQIz6aqghn4wn9yCVp6g="; + version = "30.0.13"; + hash = "sha256-viMmo689YHK08Uza05O5Y3qj3EDK9W/TgXXuo6j/j4Y="; packages = nextcloud30Packages; }; nextcloud31 = generic { - version = "31.0.6"; - hash = "sha256-pqvOG+hK5lCQYliV7leWxuYx/RDLF2RexNc/fZs3Jig="; + version = "31.0.7"; + hash = "sha256-ACpdA64Fp/DDBWlH1toLeaRNPXIPVyj+UVWgxaO07Gk="; packages = nextcloud31Packages; }; diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index b597f4aee9f8..eab872f3b7da 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -10,9 +10,9 @@ ] }, "bookmarks": { - "hash": "sha256-oXpTsmjD1zGjNoPoNVIVSVO4nHAoWy0YW3IT797XrRM=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.0/bookmarks-15.1.0.tar.gz", - "version": "15.1.0", + "hash": "sha256-NVe9eOL6dcL4hYYV7dsoR8ZKXFHkEGAo5sj9DXuDJEI=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.1/bookmarks-15.1.1.tar.gz", + "version": "15.1.1", "description": "- πŸ“‚ Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- πŸ“² Synchronize with all your browsers and devices\n- πŸ“” Store archived versions of your links in case they are depublished\n- πŸ” Full-text search on site contents\n- πŸ‘ͺ Share bookmarks with other users, groups and teams or via public links\n- βš› Generate RSS feeds of your collections\n- πŸ“ˆ Stats on how often you access which links\n- πŸ”’ Automatic backups of your bookmarks collection\n- πŸ’Ό Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-vsqyTtHDTjB4POwQyDtlAPnb8nBQw0ZTBnBUqP4Kw9A=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.2/calendar-v5.3.2.tar.gz", - "version": "5.3.2", + "hash": "sha256-Wm7RWDe/6jcOEGp2eR1k7x05ilB6kW1u1aRdN7HI4Wk=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.5/calendar-v5.3.5.tar.gz", + "version": "5.3.5", "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* πŸ™‹ **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* πŸ” **Search!** Find your events at ease\n* β˜‘οΈ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* πŸ”ˆ **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* πŸ“† **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* πŸ“Ž **Attachments!** Add, upload and view event attachments\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-uT1QOZpuKvsrnZWYbaQUhUdM49xdIivotFe6FAz330I=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.3/contacts-v7.1.3.tar.gz", - "version": "7.1.3", + "hash": "sha256-52FNlLIc4Xr/8mKzEJW8YJ7RbfaeSpMaIxGhBFp0WFc=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.5/contacts-v7.1.5.tar.gz", + "version": "7.1.5", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -130,9 +130,9 @@ ] }, "forms": { - "hash": "sha256-t4/1Rq99VH+g43zLcms5P714bSYv5h6RTaI4Q7jvD+Y=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.1.0/forms-v5.1.0.tar.gz", - "version": "5.1.0", + "hash": "sha256-WOLrsu/0CYPnthm+c6TELXUis91bnEclQJ5iOdBeszc=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.1.2/forms-v5.1.2.tar.gz", + "version": "5.1.2", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **πŸ“ Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **πŸ“Š View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **πŸ”’ Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **πŸ§‘β€πŸ’» Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **πŸ™‹ Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -150,10 +150,10 @@ ] }, "groupfolders": { - "hash": "sha256-xlxc4m0xxjrI3Pi+1L63Sm4wQCjJdkHD9JPorsrI5e0=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.2/groupfolders-v18.1.2.tar.gz", - "version": "18.1.2", - "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-FpGpZB5hv0gSXRDTYpCo0MPNOat27ZsyuXxVIYBs+pg=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.3/groupfolders-v18.1.3.tar.gz", + "version": "18.1.3", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -200,9 +200,9 @@ ] }, "mail": { - "hash": "sha256-P2LeJOjCR6ufq26gz4aK/Xy359vwnD2TZJodn/YfXcU=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.3/mail-v5.1.3.tar.gz", - "version": "5.1.3", + "hash": "sha256-FSpr/PVZlx4t+1cGmyoES/9i0c2nyRTPLTodLM2JP04=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.7/mail-v5.1.7.tar.gz", + "version": "5.1.7", "description": "**πŸ’Œ A mail app for Nextcloud**\n\n- **πŸš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **πŸ“₯ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **πŸ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **πŸ™ˆ We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **πŸ“¬ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟒/🟑/🟠/πŸ”΄\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -220,19 +220,19 @@ ] }, "music": { - "hash": "sha256-h83Xc292/NQPWOTRIbUSgqHUH/Sp4fYJ8GAHSiJWHP0=", - "url": "https://github.com/owncloud/music/releases/download/v2.1.4/music_2.1.4_for_nextcloud.tar.gz", - "version": "2.1.4", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard", + "hash": "sha256-8FQrQdoaSeJh4tnqvGOiuxN1YPQIJSwm6sTHOfc31cg=", + "url": "https://github.com/owncloud/music/releases/download/v2.2.0/music_2.2.0_for_nextcloud.tar.gz", + "version": "2.2.0", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" ] }, "news": { - "hash": "sha256-T/ZKL4YWw0ai7mZ9gm91BUl6Md6hyTakYgKsarSYO4k=", - "url": "https://github.com/nextcloud/news/releases/download/26.0.1/news.tar.gz", - "version": "26.0.1", + "hash": "sha256-Y1+hcRxewWyctG5nS7GjN+zWCBrxoroeb01HLzqAR08=", + "url": "https://github.com/nextcloud/news/releases/download/26.0.2/news.tar.gz", + "version": "26.0.2", "description": "πŸ“° A RSS/Atom Feed reader App for Nextcloud\n\n- πŸ“² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- πŸ”„ Automatic updates of your news feeds\n- πŸ†“ Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -290,10 +290,10 @@ ] }, "polls": { - "hash": "sha256-AJUC5UIz6xY75cEJHfNjhUm9K9HnXWMokt9gIOcq8vI=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.3/polls-v7.4.3.tar.gz", - "version": "7.4.3", - "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", + "hash": "sha256-j+Aq3Hu7i52o5HqMROTHeb/955N7Qw4TMFPEevR+bYQ=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.4/polls-v7.4.4.tar.gz", + "version": "7.4.4", + "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ "agpl" @@ -360,9 +360,9 @@ ] }, "spreed": { - "hash": "sha256-C3TLD6tZa++H6Kg0X5gz2kyJQVitXJoQ5rUccyX4N8w=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.7/spreed-v20.1.7.tar.gz", - "version": "20.1.7", + "hash": "sha256-McNUCYvP7bKwZHrfqKMq5w5aEvA4ulS+ifFqUIl4i48=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.8/spreed-v20.1.8.tar.gz", + "version": "20.1.8", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -400,9 +400,9 @@ ] }, "unroundedcorners": { - "hash": "sha256-ONOBDUciyWlKvi3Fd5+mWh3OLRfyW+PlKJKJWdMph0U=", - "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.4/unroundedcorners-v1.1.4.tar.gz", - "version": "1.1.4", + "hash": "sha256-0+fOJnPsuengy8TPzTKizDnDXTlZStalFDOv+dFlRgc=", + "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.5/unroundedcorners-v1.1.5.tar.gz", + "version": "1.1.5", "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.", "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners", "licenses": [ @@ -450,9 +450,9 @@ ] }, "whiteboard": { - "hash": "sha256-hz8nviBUakDWH5ThDILoRFxyBFVpzJgXM6dgqry13tc=", - "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.0.5/whiteboard-v1.0.5.tar.gz", - "version": "1.0.5", + "hash": "sha256-njiTDKDiwDeOH9biOohIQueAI8/pSijWy8EDXHoVeQo=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.2/whiteboard-v1.1.2.tar.gz", + "version": "1.1.2", "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- πŸ“ Real-time collaboration\n- πŸ–ΌοΈ Add images with drag and drop\n- πŸ“Š Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- πŸ“¦ Image export\n- πŸ’ͺ Strong foundation: We use Excalidraw as our base library", "homepage": "https://github.com/nextcloud/whiteboard", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json index 0503cc3a0d38..5d95983bad59 100644 --- a/pkgs/servers/nextcloud/packages/31.json +++ b/pkgs/servers/nextcloud/packages/31.json @@ -10,9 +10,9 @@ ] }, "bookmarks": { - "hash": "sha256-oXpTsmjD1zGjNoPoNVIVSVO4nHAoWy0YW3IT797XrRM=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.0/bookmarks-15.1.0.tar.gz", - "version": "15.1.0", + "hash": "sha256-NVe9eOL6dcL4hYYV7dsoR8ZKXFHkEGAo5sj9DXuDJEI=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.1/bookmarks-15.1.1.tar.gz", + "version": "15.1.1", "description": "- πŸ“‚ Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- πŸ“² Synchronize with all your browsers and devices\n- πŸ“” Store archived versions of your links in case they are depublished\n- πŸ” Full-text search on site contents\n- πŸ‘ͺ Share bookmarks with other users, groups and teams or via public links\n- βš› Generate RSS feeds of your collections\n- πŸ“ˆ Stats on how often you access which links\n- πŸ”’ Automatic backups of your bookmarks collection\n- πŸ’Ό Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-vsqyTtHDTjB4POwQyDtlAPnb8nBQw0ZTBnBUqP4Kw9A=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.2/calendar-v5.3.2.tar.gz", - "version": "5.3.2", + "hash": "sha256-Wm7RWDe/6jcOEGp2eR1k7x05ilB6kW1u1aRdN7HI4Wk=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.5/calendar-v5.3.5.tar.gz", + "version": "5.3.5", "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* πŸ™‹ **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* πŸ” **Search!** Find your events at ease\n* β˜‘οΈ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* πŸ”ˆ **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* πŸ“† **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* πŸ“Ž **Attachments!** Add, upload and view event attachments\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-uT1QOZpuKvsrnZWYbaQUhUdM49xdIivotFe6FAz330I=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.3/contacts-v7.1.3.tar.gz", - "version": "7.1.3", + "hash": "sha256-52FNlLIc4Xr/8mKzEJW8YJ7RbfaeSpMaIxGhBFp0WFc=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.5/contacts-v7.1.5.tar.gz", + "version": "7.1.5", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -130,9 +130,9 @@ ] }, "forms": { - "hash": "sha256-t4/1Rq99VH+g43zLcms5P714bSYv5h6RTaI4Q7jvD+Y=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.1.0/forms-v5.1.0.tar.gz", - "version": "5.1.0", + "hash": "sha256-WOLrsu/0CYPnthm+c6TELXUis91bnEclQJ5iOdBeszc=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.1.2/forms-v5.1.2.tar.gz", + "version": "5.1.2", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **πŸ“ Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **πŸ“Š View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **πŸ”’ Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **πŸ§‘β€πŸ’» Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **πŸ™‹ Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -150,10 +150,10 @@ ] }, "groupfolders": { - "hash": "sha256-GEM5Xw8J2xFOTf9AOlOttVXo25E/x4foT9493J9ZIf4=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.0/groupfolders-v19.1.0.tar.gz", - "version": "19.1.0", - "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-KqbPvcHOYJA8bjWbh6X/7RM78FGCqFJIOS8FgugJyJk=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.2/groupfolders-v19.1.2.tar.gz", + "version": "19.1.2", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -200,9 +200,9 @@ ] }, "mail": { - "hash": "sha256-P2LeJOjCR6ufq26gz4aK/Xy359vwnD2TZJodn/YfXcU=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.3/mail-v5.1.3.tar.gz", - "version": "5.1.3", + "hash": "sha256-FSpr/PVZlx4t+1cGmyoES/9i0c2nyRTPLTodLM2JP04=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.7/mail-v5.1.7.tar.gz", + "version": "5.1.7", "description": "**πŸ’Œ A mail app for Nextcloud**\n\n- **πŸš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **πŸ“₯ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **πŸ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **πŸ™ˆ We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **πŸ“¬ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟒/🟑/🟠/πŸ”΄\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -220,19 +220,19 @@ ] }, "music": { - "hash": "sha256-h83Xc292/NQPWOTRIbUSgqHUH/Sp4fYJ8GAHSiJWHP0=", - "url": "https://github.com/owncloud/music/releases/download/v2.1.4/music_2.1.4_for_nextcloud.tar.gz", - "version": "2.1.4", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard", + "hash": "sha256-8FQrQdoaSeJh4tnqvGOiuxN1YPQIJSwm6sTHOfc31cg=", + "url": "https://github.com/owncloud/music/releases/download/v2.2.0/music_2.2.0_for_nextcloud.tar.gz", + "version": "2.2.0", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" ] }, "news": { - "hash": "sha256-T/ZKL4YWw0ai7mZ9gm91BUl6Md6hyTakYgKsarSYO4k=", - "url": "https://github.com/nextcloud/news/releases/download/26.0.1/news.tar.gz", - "version": "26.0.1", + "hash": "sha256-Y1+hcRxewWyctG5nS7GjN+zWCBrxoroeb01HLzqAR08=", + "url": "https://github.com/nextcloud/news/releases/download/26.0.2/news.tar.gz", + "version": "26.0.2", "description": "πŸ“° A RSS/Atom Feed reader App for Nextcloud\n\n- πŸ“² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- πŸ”„ Automatic updates of your news feeds\n- πŸ†“ Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -290,10 +290,10 @@ ] }, "polls": { - "hash": "sha256-AJUC5UIz6xY75cEJHfNjhUm9K9HnXWMokt9gIOcq8vI=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.3/polls-v7.4.3.tar.gz", - "version": "7.4.3", - "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", + "hash": "sha256-iv3Jjx/p2uGhxYctaMaaB/5c3oroauE8iOEH2eWi4+A=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.0.6/polls-v8.0.6.tar.gz", + "version": "8.0.6", + "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ "agpl" @@ -340,9 +340,9 @@ ] }, "richdocuments": { - "hash": "sha256-3tCUe7mXgUpmWSWd1y7uYGc3yBk2C26QLPAOcfsUEjY=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.0/richdocuments-v8.7.0.tar.gz", - "version": "8.7.0", + "hash": "sha256-qJt7nkXhW3t0c8m+MHStWt2FnSNUNiMbDLeDOpU8VVA=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.1/richdocuments-v8.7.1.tar.gz", + "version": "8.7.1", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -360,9 +360,9 @@ ] }, "spreed": { - "hash": "sha256-DxwK3PMsLTxbdjyM10rX6wveRFCr8EoIGToKSkaMwYM=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.0/spreed-v21.1.0.tar.gz", - "version": "21.1.0", + "hash": "sha256-tumLEoJAGvcFgN8dQbmwxPofOQ825mySOa5qNg6wzgs=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.1/spreed-v21.1.1.tar.gz", + "version": "21.1.1", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -400,9 +400,9 @@ ] }, "unroundedcorners": { - "hash": "sha256-ONOBDUciyWlKvi3Fd5+mWh3OLRfyW+PlKJKJWdMph0U=", - "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.4/unroundedcorners-v1.1.4.tar.gz", - "version": "1.1.4", + "hash": "sha256-0+fOJnPsuengy8TPzTKizDnDXTlZStalFDOv+dFlRgc=", + "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.5/unroundedcorners-v1.1.5.tar.gz", + "version": "1.1.5", "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.", "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners", "licenses": [ @@ -450,9 +450,9 @@ ] }, "whiteboard": { - "hash": "sha256-hz8nviBUakDWH5ThDILoRFxyBFVpzJgXM6dgqry13tc=", - "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.0.5/whiteboard-v1.0.5.tar.gz", - "version": "1.0.5", + "hash": "sha256-njiTDKDiwDeOH9biOohIQueAI8/pSijWy8EDXHoVeQo=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.2/whiteboard-v1.1.2.tar.gz", + "version": "1.1.2", "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- πŸ“ Real-time collaboration\n- πŸ–ΌοΈ Add images with drag and drop\n- πŸ“Š Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- πŸ“¦ Image export\n- πŸ’ͺ Strong foundation: We use Excalidraw as our base library", "homepage": "https://github.com/nextcloud/whiteboard", "licenses": [ diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index cccb18aa8941..91f1e31d03d6 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { libbsd ] ++ optionals stdenv.hostPlatform.isLinux [ - #liburing # FIXME: better solution + liburing systemd ] ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ] diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix index 86fb2628866d..a730185d2e4d 100644 --- a/pkgs/tools/misc/kcollectd/default.nix +++ b/pkgs/tools/misc/kcollectd/default.nix @@ -1,7 +1,8 @@ { lib, fetchFromGitLab, - mkDerivation, + stdenv, + wrapQtAppsHook, qtbase, cmake, kconfig, @@ -17,14 +18,14 @@ breeze-icons, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kcollectd"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitLab { owner = "aerusso"; repo = pname; rev = "v${version}"; - hash = "sha256-bUVL5eRQ5UkSZo562pnyEcj0fVoSC5WHRq4BfN67jEM="; + hash = "sha256-35zb5Kx0tRP5l0hILdomCu2YSQfng02mbyyAClm4uZs="; }; postPatch = lib.optional (!lib.versionOlder rrdtool.version "1.9.0") '' @@ -32,6 +33,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ + wrapQtAppsHook cmake extra-cmake-modules shared-mime-info diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index d81fe2ef67b2..0e465f4f109f 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,16 +1,18 @@ { callPackage, - fetchurl, + fetchFromGitLab, }: let common = opts: callPackage (import ./common.nix opts) { }; in rec { - openconnect = common rec { - version = "9.12"; - src = fetchurl { - url = "ftp://ftp.infradead.org/pub/openconnect/openconnect-${version}.tar.gz"; - sha256 = "sha256-or7c46pN/nXjbkB+SOjovJHUbe9TNayVZPv5G9SyQT4="; + openconnect = common { + version = "9.12-unstable-2025-01-14"; + src = fetchFromGitLab { + owner = "openconnect"; + repo = "openconnect"; + rev = "f17fe20d337b400b476a73326de642a9f63b59c8"; + hash = "sha256-OBEojqOf7cmGtDa9ToPaJUHrmBhq19/CyZ5agbP7WUw="; }; }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c8960e60c5e7..c6848f76be1d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -210,14 +210,14 @@ lib.makeExtensible ( nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything; nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.30pre20250624_${lib.substring 0 8 src.rev}"; + version = "2.31pre20250712_${lib.substring 0 8 src.rev}"; inherit (self.nix_2_24.meta) maintainers teams; otherSplices = generateSplicesForNixComponents "nixComponents_git"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "448cfb71eafbb3f2932b025aa2600c80b6d383f1"; - hash = "sha256-tk1H8lOA5lIvhNP/izZ6JzT0EuDmCOX5RBhOeHdc2cM="; + rev = "b124512388378cd38c4e353ddb387905d296e877"; + hash = "sha256-asBUtSonedNfMO0/Z6HUi8RK/y/7I1qBDHv2UryichA="; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f7f058d077a..5f0f490a2900 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3573,7 +3573,7 @@ with pkgs; node2nix = nodePackages.node2nix; - kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd { }; + kcollectd = kdePackages.callPackage ../tools/misc/kcollectd { }; ktailctl = kdePackages.callPackage ../applications/networking/ktailctl { }; @@ -8655,8 +8655,6 @@ with pkgs; inherit (lomiri) cmake-extras; }; - libremines = qt6.callPackage ../games/libremines { }; - librepo = callPackage ../tools/package-management/librepo { }; libretranslate = with python3.pkgs; toPythonApplication libretranslate; @@ -11230,8 +11228,6 @@ with pkgs; sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { }; - sdrangel = qt6Packages.callPackage ../applications/radio/sdrangel { }; - sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { }; sgx-psw = callPackage ../os-specific/linux/sgx/psw {