From 8a9ffb1b0bb94a31760b2443a08f8c0baa08c63f Mon Sep 17 00:00:00 2001 From: Andre-Patrick Bubel Date: Mon, 12 Sep 2022 00:09:45 +0200 Subject: [PATCH 01/46] nixosTests.paperless: check if /metadata/ can be accessed Detects issues like #190850, when gunicorn python version doesn't match that of paperless. --- nixos/tests/paperless.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix index 12883cd62c60..b97834835c2c 100644 --- a/nixos/tests/paperless.nix +++ b/nixos/tests/paperless.nix @@ -40,5 +40,13 @@ import ./make-test-python.nix ({ lib, ... }: { docs = json.loads(machine.succeed("curl -u admin:admin -fs localhost:28981/api/documents/"))['results'] assert "2005-10-16" in docs[0]['created'] assert "2005-10-16" in docs[1]['created'] + + # Detects gunicorn issues, see PR #190888 + with subtest("Document metadata can be accessed"): + metadata = json.loads(machine.succeed("curl -u admin:admin -fs localhost:28981/api/documents/1/metadata/")) + assert "original_checksum" in metadata + + metadata = json.loads(machine.succeed("curl -u admin:admin -fs localhost:28981/api/documents/2/metadata/")) + assert "original_checksum" in metadata ''; }) From b752a370b1f5911cd6f85fd4c501840c4d17082d Mon Sep 17 00:00:00 2001 From: ckie Date: Fri, 30 Sep 2022 01:55:46 +0300 Subject: [PATCH 02/46] synapse-admin: fix build after 7753a94a354 The update to nodejs v18 in 7753a94a354 broke this derivation with a error:0308010C:digital envelope routines::unsupported in react-scripts. This adds a workaround for now as I have not tried updating to see if upstream has fixed this. --- pkgs/tools/admin/synapse-admin/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/admin/synapse-admin/default.nix b/pkgs/tools/admin/synapse-admin/default.nix index 098cc57d97e7..2cde74ba4532 100644 --- a/pkgs/tools/admin/synapse-admin/default.nix +++ b/pkgs/tools/admin/synapse-admin/default.nix @@ -23,6 +23,9 @@ mkYarnPackage rec { NODE_ENV = "production"; ${if baseUrl != null then "REACT_APP_SERVER" else null} = baseUrl; + # error:0308010C:digital envelope routines::unsupported + NODE_OPTIONS = "--openssl-legacy-provider"; + buildPhase = '' runHook preBuild From da8579121945d7f6ce2d7cb816837cc52000a3b3 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sat, 3 Sep 2022 10:22:36 +0200 Subject: [PATCH 03/46] ihp-new: init at 0.20.0 --- pkgs/development/web/ihp-new/default.nix | 32 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/web/ihp-new/default.nix diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/development/web/ihp-new/default.nix new file mode 100644 index 000000000000..69e45f44eb85 --- /dev/null +++ b/pkgs/development/web/ihp-new/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, git, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "ihp-new"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "digitallyinduced"; + repo = "ihp"; + rev = "v${version}"; + sha256 = "sha256-fvFRBnMnFGsPleVv5aPfuoP1UzjnBel0NiNULFP+GkI="; + }; + + dontConfigure = true; + sourceRoot = "source/ProjectGenerator"; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm755 bin/ihp-new -t $out/bin + wrapProgram $out/bin/ihp-new \ + --suffix PATH ":" "${lib.makeBinPath [ git ]}"; + ''; + + meta = with lib; { + description = "Project generator for the IHP (Integrated Haskell Platform) web framework"; + homepage = "https://ihp.digitallyinduced.com"; + license = licenses.mit; + maintainers = [ maintainers.mpscholten ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bad8f1797a58..3d17629e8709 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16457,6 +16457,8 @@ with pkgs; insomnia = callPackage ../development/web/insomnia { }; + ihp-new = callPackage ../development/web/ihp-new { }; + iozone = callPackage ../development/tools/misc/iozone { }; itstool = callPackage ../development/tools/misc/itstool { }; From 49e9431c2af188836ba25b8127e281bdc06313b2 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 2 Sep 2022 17:29:04 +0800 Subject: [PATCH 04/46] guile-gcrypt: add make flags and tests --- pkgs/development/guile-modules/guile-gcrypt/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 73152fb9d2c3..7c7e11e3d2b1 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -20,11 +20,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; @@ -34,6 +29,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgcrypt ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + doCheck = true; meta = with lib; { description = "Bindings to Libgcrypt for GNU Guile"; From d4cf2b811e3c4af5a44803d7a6ca3b5192f4c073 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 4 Oct 2022 19:51:14 +0800 Subject: [PATCH 05/46] guile-json: add make flags and tests --- pkgs/development/guile-modules/guile-json/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index da15ca2d6ac4..c4d15503cb81 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -15,19 +15,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-xTSaI4D2fIphOps698mNITJdRDAjNp5vdhs2bpaUaEM="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/objdir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site/json%' json/Makefile; - sed -i '/objdir\s*=/s%=.*%=''${out}/share/guile/ccache/json%' json/Makefile; - ''; - nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ guile ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; meta = with lib; { description = "JSON Bindings for GNU Guile"; From 826fd7598402596f27548877f5689d2e83a5c783 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 4 Oct 2022 19:51:39 +0800 Subject: [PATCH 06/46] guile-git: add make flags and tests --- pkgs/development/guile-modules/guile-git/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index 0b3dfefcbe8c..5487116b53af 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -20,11 +20,6 @@ stdenv.mkDerivation rec { sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; @@ -34,9 +29,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgit2 scheme-bytestructures ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; enableParallelBuilding = true; + # Skipping proxy tests since it requires network access. + postConfigure = '' + sed -i -e '94i (test-skip 1)' ./tests/proxy.scm + ''; + meta = with lib; { description = "Bindings to Libgit2 for GNU Guile"; homepage = "https://gitlab.com/guile-git/guile-git"; From 10c02745ab7f9d324107ecfd557905677fd04322 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 4 Oct 2022 19:52:01 +0800 Subject: [PATCH 07/46] scheme-bytestructures: add make flags and tests --- .../scheme-modules/scheme-bytestructures/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 602b0d86f44b..1cbbdf0bf29d 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-Wvs288K8BVjUuWvvzpDGBwOxL7mAXjVtgIwJAsQd0L4="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -29,6 +24,9 @@ stdenv.mkDerivation rec { guile ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + meta = with lib; { description = "Structured access to bytevector contents"; homepage = "https://github.com/TaylanUB/scheme-bytestructures"; From 30b0c8fec939fd648be77aed5f155e4e5fbb0039 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 5 Oct 2022 20:04:31 -0700 Subject: [PATCH 08/46] pcb: use xorg.* packages directly instead of xlibsWrapper As recommended by https://github.com/NixOS/nixpkgs/issues/194054 Built outputs (`x86-linux`) are identical except for the `pcb` binary, which was manually reviewed with `vbindiff` to confirm that the only differences were self-$out path references. --- pkgs/applications/science/electronics/pcb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index d28f1d181215..f8623d9a7bf7 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -8,7 +8,8 @@ , netpbm , imagemagick , dbus -, xlibsWrapper +, freetype +, fontconfig , libGLU , libGL , shared-mime-info @@ -40,7 +41,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 dbus - xlibsWrapper + xorg.libXrender + freetype + fontconfig libGLU libGL tcl From ecaf6aed02da7cc72721567fe85387e4bdd9948d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 6 Oct 2022 11:26:13 +0200 Subject: [PATCH 09/46] nixos/privacyidea: add proper support for `privacyidea-token-janitor` `privacyidea-token-janitor`[1] is a tool which helps to automate maintenance of tokens. This is helpful to identify e.g. orphaned tokens, i.e. tokens of users that were removed or tokens that were unused for a longer period of time and apply actions to them (e.g. `disable` or `delete`). This patch adds two new things: * A wrapper for `privacyidea-token-janitor` to make sure it's executable from CLI. To achieve this, it does a `sudo(8)` into the `privacyidea`-user and sets up the environment to make sure the configuration file can be found. With that, administrators can directly invoke it from the CLI without additional steps. * An optional service is added which performs automatic cleanups of orphaned and/or unassigned tokens. Yes, the tool can do way more stuff, but I figured it's reasonable to have an automatic way to clean up tokens of users who were removed from the PI instance. Additional automation steps should probably be implemented in additional services (and are perhaps too custom to add them to this module). [1] https://privacyidea.readthedocs.io/en/v3.7/workflows_and_tools/tools/index.html --- .../modules/services/security/privacyidea.nix | 94 ++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index 5cd338ebf7fe..f8f97a88d2fc 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -61,6 +61,12 @@ let (flip mapAttrs cfg.ldap-proxy.settings (const (mapAttrs (const renderValue))))); + privacyidea-token-janitor = pkgs.writeShellScriptBin "privacyidea-token-janitor" '' + exec -a privacyidea-token-janitor \ + /run/wrappers/bin/sudo -u ${cfg.user} \ + env PRIVACYIDEA_CONFIGFILE=${cfg.stateDir}/privacyidea.cfg \ + ${penv}/bin/privacyidea-token-janitor $@ + ''; in { @@ -178,6 +184,42 @@ in description = lib.mdDoc "Group account under which PrivacyIDEA runs."; }; + tokenjanitor = { + enable = mkEnableOption "automatic runs of the token janitor"; + interval = mkOption { + default = "quarterly"; + type = types.str; + description = lib.mdDoc '' + Interval in which the cleanup program is supposed to run. + See {manpage}`systemd.time(7)` for further information. + ''; + }; + action = mkOption { + type = types.enum [ "delete" "mark" "disable" "unassign" ]; + description = lib.mdDoc '' + Which action to take for matching tokens. + ''; + }; + unassigned = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc '' + Whether to search for **unassigned** tokens + and apply [](#opt-services.privacyidea.tokenjanitor.action) + onto them. + ''; + }; + orphaned = mkOption { + default = true; + type = types.bool; + description = lib.mdDoc '' + Whether to search for **orphaned** tokens + and apply [](#opt-services.privacyidea.tokenjanitor.action) + onto them. + ''; + }; + }; + ldap-proxy = { enable = mkEnableOption (lib.mdDoc "PrivacyIDEA LDAP Proxy"); @@ -228,10 +270,60 @@ in (mkIf cfg.enable { - environment.systemPackages = [ pkgs.privacyidea ]; + assertions = [ + { + assertion = cfg.tokenjanitor.enable -> (cfg.tokenjanitor.orphaned || cfg.tokenjanitor.unassigned); + message = '' + privacyidea-token-janitor has no effect if neither orphaned nor unassigned tokens + are to be searched. + ''; + } + ]; + + environment.systemPackages = [ pkgs.privacyidea (hiPrio privacyidea-token-janitor) ]; services.postgresql.enable = mkDefault true; + systemd.services.privacyidea-tokenjanitor = mkIf cfg.tokenjanitor.enable { + environment.PRIVACYIDEA_CONFIGFILE = "${cfg.stateDir}/privacyidea.cfg"; + path = [ penv ]; + serviceConfig = { + CapabilityBoundingSet = [ "" ]; + ExecStart = "${pkgs.writeShellScript "pi-token-janitor" '' + ${optionalString cfg.tokenjanitor.orphaned '' + echo >&2 "Removing orphaned tokens..." + privacyidea-token-janitor find \ + --orphaned true \ + --action ${cfg.tokenjanitor.action} + ''} + ${optionalString cfg.tokenjanitor.unassigned '' + echo >&2 "Removing unassigned tokens..." + privacyidea-token-janitor find \ + --assigned false \ + --action ${cfg.tokenjanitor.action} + ''} + ''}"; + Group = cfg.group; + LockPersonality = true; + MemoryDenyWriteExecute = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + ReadWritePaths = cfg.stateDir; + Type = "oneshot"; + User = cfg.user; + WorkingDirectory = cfg.stateDir; + }; + }; + systemd.timers.privacyidea-tokenjanitor = mkIf cfg.tokenjanitor.enable { + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.tokenjanitor.interval; + timerConfig.Persistent = true; + }; + systemd.services.privacyidea = let piuwsgi = pkgs.writeText "uwsgi.json" (builtins.toJSON { uwsgi = { From 1c7728df2a46a783023779187f6573ca9a90ad9b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 6 Oct 2022 11:59:35 +0200 Subject: [PATCH 10/46] privacyidea: fix build Failing Hydra build: https://hydra.nixos.org/build/192932057 Just a small test error, workaround applied from upstream/master. --- pkgs/applications/misc/privacyidea/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index d7613b0c2a54..405d992576da 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cacert, openssl, nixosTests -, python39 +, python39, fetchpatch }: let @@ -107,6 +107,16 @@ python3'.pkgs.buildPythonPackage rec { pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt ]; + patches = [ + # Apply https://github.com/privacyidea/privacyidea/pull/3304, fixes + # `Exceeds the limit (4300) for integer string conversion` in the tests, + # see https://hydra.nixos.org/build/192932057 + (fetchpatch { + url = "https://github.com/privacyidea/privacyidea/commit/0e28f36c0b3291a361669f4a3a77c294f4564475.patch"; + sha256 = "sha256-QqcO8bkt+I2JKce/xk2ZhzEaLZ3E4uZ4x5W9Kk0pMQQ="; + }) + ]; + passthru.tests = { inherit (nixosTests) privacyidea; }; checkInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; From 15914eba855c306a397595b83810d9894c34f41b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 6 Oct 2022 13:50:31 +0200 Subject: [PATCH 11/46] nixos/privacyidea: fix manual build --- nixos/modules/services/security/privacyidea.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index f8f97a88d2fc..e446e606cad8 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -185,7 +185,7 @@ in }; tokenjanitor = { - enable = mkEnableOption "automatic runs of the token janitor"; + enable = mkEnableOption (lib.mdDoc "automatic runs of the token janitor"); interval = mkOption { default = "quarterly"; type = types.str; From 3d66e783dbf496ac7080155baf7e36a4d0fde66e Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 6 Oct 2022 16:24:23 -0400 Subject: [PATCH 12/46] rust-motd: 0.2.1 -> 1.0.0 --- pkgs/tools/misc/rust-motd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index bfd4db8ff882..a3ca6ddbbbe2 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-motd"; - version = "0.2.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rust-motd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iuADR7m+wdmsQ897o4CQHqDv9PmYu/vJgO5C6Dluao4="; + sha256 = "sha256-w984vvjjieSv4eM3jT8zJIIR7/7pmADhR3Esj+2dCTs="; }; - cargoSha256 = "sha256-kdSMcADoTpMU4w2XSv0pPQZC155rrQACQ4XTVyj7eeA="; + cargoSha256 = "sha256-L/QdFjSYm3PekKS3tdsUl8XBVyIBE044EHOIB+aEltI="; nativeBuildInputs = [ pkg-config ]; From 6b8eee90f0ca521ab1fedc48c24d81bd1c43155c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Oct 2022 03:21:48 +0000 Subject: [PATCH 13/46] vtm: 0.8.0 -> 0.9.2 --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 982f383da304..8335e37f6e02 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.8.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-Ty7DC4ap2F+mPzr1xaL8XeLSjQaQQVX0oGAcPpkoag4="; + sha256 = "sha256-TRuTvaCALQPxilkzSODdeI2P4FuxTGg8UTHkMDiuYTU="; }; nativeBuildInputs = [ cmake ]; From f598f3117947b3b0922626444b63ab03bdbe4a24 Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Fri, 7 Oct 2022 10:35:07 +0200 Subject: [PATCH 14/46] surf-display: unstable-2019-04-15 -> unstable-2022-10-07 --- pkgs/desktops/surf-display/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix index c1f5f7165095..918f715341a1 100644 --- a/pkgs/desktops/surf-display/default.nix +++ b/pkgs/desktops/surf-display/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "surf-display"; - version = "unstable-2019-04-15"; + version = "unstable-2022-10-07"; src = fetchgit { url = "https://code.it-zukunft-schule.de/cgit/surf-display"; - rev = "972d6c4b7c4503dbb63fa6c92cdc24d1e32064a4"; - sha256 = "03c68gg4kfmkri1gn5b7m1g8vh9ciawhajb29c17kkc7mn388hjm"; + rev = "ad0bd30642f8334d42bb08ea5c1b9dd03fccc4d1"; + hash = "sha256-wiyFh1te3afASIODn0cA5QXcqnrP/8Bk6hBAZYbKJQQ="; }; nativeBuildInputs = [ makeWrapper ]; From dfe88a09d1929f43fa296d113b9cc2ae93a0e744 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Oct 2022 13:14:25 +0200 Subject: [PATCH 15/46] rust-motd: modernize - add changelog to meta --- pkgs/tools/misc/rust-motd/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index a3ca6ddbbbe2..a2c7710984ea 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -15,20 +15,27 @@ rustPlatform.buildRustPackage rec { owner = "rust-motd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w984vvjjieSv4eM3jT8zJIIR7/7pmADhR3Esj+2dCTs="; + hash = "sha256-w984vvjjieSv4eM3jT8zJIIR7/7pmADhR3Esj+2dCTs="; }; - cargoSha256 = "sha256-L/QdFjSYm3PekKS3tdsUl8XBVyIBE044EHOIB+aEltI="; + cargoHash = "sha256-L/QdFjSYm3PekKS3tdsUl8XBVyIBE044EHOIB+aEltI="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ + openssl + ] ++ lib.optional stdenv.isDarwin [ + Security + ]; OPENSSL_NO_VENDOR = 1; meta = with lib; { description = "Beautiful, useful MOTD generation with zero runtime dependencies"; homepage = "https://github.com/rust-motd/rust-motd"; + changelog = "https://github.com/rust-motd/rust-motd/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; From d25c4975cf1ef5666d8b7e74d6631fa93d9c4f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 8 Oct 2022 10:34:49 +0200 Subject: [PATCH 16/46] thunderbird: 102.3.1 -> 102.3.2 https://www.thunderbird.net/en-US/thunderbird/102.3.2/releasenotes/ --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index aebb182dcb23..2e53260f08bd 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.3.1"; + version = "102.3.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "8a127958b35c1c14b8acaa3ac256f8a3a7e9bde89fc810299ae4036c80c41d0c0d45c85ed47099d6ec37e2774a6bdeefe0de6b0b4b8bceca8206c7e54c3f93c1"; + sha512 = "e10b0322293a723c5683231e4337b1c3a214c064bbcc7f569c111c4ace42e74ddc312f2f30a260020dac48e44662f093538fab935a78ee0f6fc4a2a70488f74a"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From e35e3836c5a935c6a14e810c2ec97df5986d76b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 8 Oct 2022 10:35:17 +0200 Subject: [PATCH 17/46] thunderbird-bin: 102.3.1 -> 102.3.2 https://www.thunderbird.net/en-US/thunderbird/102.3.2/releasenotes/ --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 65fb5458fa49..be8ba9c132a3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.3.1"; + version = "102.3.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/af/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/af/thunderbird-102.3.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "4e9ec93b6cadc5596aa61efbaaccb377b4666e48dc73237c6119f9a91478fdc9"; + sha256 = "be8247ed8d61d6a62958ec015e6e192b32dd897ba8fb1d1cdad00b992a65e838"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ar/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ar/thunderbird-102.3.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ab00353e8e55395525fdb85d5b2e824a144d52117e113ef88d5b120e99ebd506"; + sha256 = "98b8a0d748e1c3ea7f776c7a79e04d16c14eddd2a6b2bd68bea2440cda9c716e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ast/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ast/thunderbird-102.3.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2d7fc95f771cb315791d7b5558a05cd0b897e407b456d464235c593afa8c8dd6"; + sha256 = "cc7e318a00a4dc7ea1094f01fd876bcf38712a3cf2ff9662fdd01e7be0509d80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/be/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/be/thunderbird-102.3.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "091e1da27b7590cd3a667c3a380d59723b2807e66401834a2d54dbbced4f98ea"; + sha256 = "d2452c7a69509a8ec5043151f2ffdb3aa40ae51fafbc7343a902c56ee3da833d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/bg/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/bg/thunderbird-102.3.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "02cb218c8f9b0407f1c7da2b688d3ced64c4e05166e6b234d89b7ec3f35204c3"; + sha256 = "ab50997f169d11d54f3873be2d0a75debb1d66853cbeb2a0f6716e215798d558"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/br/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/br/thunderbird-102.3.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4257d1f808ff6c4559f5710e5f3ba03f28a2a6725a8d707d10baca133bc28c0a"; + sha256 = "3959465afba39a3c77e03fa9b2c9f74e455af2122cc91fce743767430f96462f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ca/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ca/thunderbird-102.3.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cc9deaa88c614ecf831cf7cebab21197f3f4eeae39934da474a60ce29b8e2ceb"; + sha256 = "c055af1ef096fd5b6269b230ccd37bc165172e6a21da1330d8b4ee6c3ff583d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cak/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/cak/thunderbird-102.3.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "917854ff9d323a2c827450e3c37dc8b1b0de3d666f91b400999f290dbca00ecb"; + sha256 = "65fbb4680513d04a12f0acb476e485cffaa8cea977e8f17abe0371c990e5aff8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cs/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/cs/thunderbird-102.3.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "9d785bb167ccdf14cffa6cefd78e40da6851c328ca898c332647639c79c2217e"; + sha256 = "0b21e350dba000535ca747207034c5b7665d9adc652905330adb3c0b2ed52025"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cy/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/cy/thunderbird-102.3.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "2a7cf8397ad73f8f9beddfffc93950336d6619bacf8e5e3baca0cb6ce934927a"; + sha256 = "a998fc9979a679220e5078945a3aadf3168ac89278f6063ae8af410fd9ba11db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/da/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/da/thunderbird-102.3.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "5cd15b8266e6f27e676bc268e44dcac15f24bb385443dcda60ce6493a3a9694f"; + sha256 = "4fdc6aadee7fb96408d39d3454e77c03f09efd2110fed03450cb4076fca0f127"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/de/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/de/thunderbird-102.3.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "f765a23938acd9d7a34c16bf578ed2992d81981f7425b3ae0971f8daf6567d86"; + sha256 = "6780d62564adb5ec21c85b85535e92a2116e34829b873787003c70eef0f0fae9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/dsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/dsb/thunderbird-102.3.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "71bd0e2685b76081aaae2d30ec30f787c58d6c22d191f91c968e0e8393c1accb"; + sha256 = "9eaaab1db1d64482693fd9fe8194aae2d0d8b84822e78ac9f5819042059a4fb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/el/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/el/thunderbird-102.3.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "9c6312b6c76c388bfe85edf0c23df474224db5db804298eea2623229f82ba6c0"; + sha256 = "9a5a7ba9c532fd91a781fca68146634987d0546e237703cad0a5d71ed33076c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-CA/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/en-CA/thunderbird-102.3.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cb0d81609be24e85454a7c52f05ef6f4557837e6ca63908376c6beefa4d6a7f5"; + sha256 = "ead8deb57af6f8fdee2a1cdb6ea19132ccc2c0a1c4fb87bb25ecc1c8992995e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-GB/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/en-GB/thunderbird-102.3.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8fce652d0f319812e1bcb485c011087a09034a81ebefc19d8e6bff6ce74897a0"; + sha256 = "3c7083ff11d817d7d29afb0fb144124ae33570eb1bb26a166e70d9a79f217cba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-US/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/en-US/thunderbird-102.3.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "23c48f5d92915d1ed823c2f47f3a611bf81dd6d69b9b1a5a0aeb939a405d7466"; + sha256 = "0cab200bb2acf7024f772a2762fcbc6b8a6d8cce4471cd95558b030e6b0547cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-AR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/es-AR/thunderbird-102.3.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ffb7f0e9d6df315f9fe18dc955d2d5394a8b2413727ae674fa81d72fae0d8a14"; + sha256 = "973d0a573181b17461e9dfc80cd3b4d2d38b9d489caff2fea43b2ca307b24cd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-ES/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/es-ES/thunderbird-102.3.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a0442f1146c6c455c4934834b8b6dabe42afc29512a48f9ccdb28467de0d8800"; + sha256 = "ea745ba8bb2db5e1b53a88b9436b0a49d0644c53cc379c84588b0db82603728d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-MX/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/es-MX/thunderbird-102.3.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "84f7b65736a7c872ec6ac7283ff53d1c0b9e36edb1469784b5094fa963b44d59"; + sha256 = "fe408a962b117eb768a2b83da65301286331642c6fdb30def84669ea659b7cf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/et/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/et/thunderbird-102.3.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6c2985ac3473f124b842daca57d97f584a58d1d5cd0864cbcc432e1af250e83d"; + sha256 = "419f37f72857d123594e2915571eefe91ff7a6b68c10c48b5efa7fc7d248ddd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/eu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/eu/thunderbird-102.3.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "adafa0ecbb2f8a8ee2d4f06b38744c9bec60d1d0bee386b9840a4d5e08f28cb1"; + sha256 = "8cfdaea3cfbdac4143becdf49166934fcc9f55a826b424282d7af2df40e35f55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/fi/thunderbird-102.3.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ab7e814fe7e45f49bc6cb9451ad388b3d220af33d02071c8d9358ad1949937c3"; + sha256 = "2a8d309a5eaf7c558fc2337612ff8c6aab7de9e8d1f8787b603cbc9a1cf46de3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/fr/thunderbird-102.3.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f2bc22c3a12fa32c8c13e50a3fe502d5966fa082e6b07c84d2867b043f7770fd"; + sha256 = "7dd70ae9161f0a360febd3df1cbd0eb2b4c0ebf3f372e64abe2762e1614be6c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fy-NL/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/fy-NL/thunderbird-102.3.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "eeba9b084a5cc818dd62f0bc60de98769c2a62923a121ed77b84f9b4409e60ae"; + sha256 = "5df8cd18f0cb1cbf8df3cc2377e9db499bab2615ef612fe6651e93b376cd03d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ga-IE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ga-IE/thunderbird-102.3.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6a86c5e24299ee5a24a573d5e598eb42686c4c5baf58798f487048bb18b9d892"; + sha256 = "7d65ee7e12ee587357b46b4f8cdf4941607e5c8166e0e9b70bb9ae0add8c762e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/gd/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/gd/thunderbird-102.3.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a53567a12afc89f3dbdc20976a098f085298414e9a2453e86608715e7500609b"; + sha256 = "5a9b6c76571dde94dcb8e17b375d0e294bed23c4805f08628b7d7261223efb47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/gl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/gl/thunderbird-102.3.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "fc47765f922e599b18903a9697493a3c939e5660b3efb19353c511876bc1e74e"; + sha256 = "78be935f676cfe736e0930eb5ce3fcc722ad3711bfda9b2e5d773c4407150867"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/he/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/he/thunderbird-102.3.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5ea02bf7572cf7568e508b42ebfc7dd8ceacc6675b80a609d6fb2448f99d111c"; + sha256 = "ad8ffd7c335c845826c477c59e6c830711d03a2420a1f1fe4931fe47c6673589"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hr/thunderbird-102.3.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "cc304fdd627e3eb6286ef919bdc0afa08c13c06b9586e058724a30a58e06bda5"; + sha256 = "fff30dcff80b6bef6330287534ed4823b3e3cfcddc1c1af522c81ce498ec0084"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hsb/thunderbird-102.3.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5b4daf66a885260f00d6142102830abe91cc3e4ba5f44dce89f9ea405edcb725"; + sha256 = "51e184549219cfa88f96b0d64e09aea00ffc6237fe658b899fdb17bacad52234"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hu/thunderbird-102.3.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "eff03ec8945cbe8378651d8847aeeaf395c3c5a6351f8f77586969db13cff90a"; + sha256 = "140fbeaadf1aadab59f941a0d2bbb7bf1d26b5e3e71aaf5f600ddcd6bcfa144f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hy-AM/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hy-AM/thunderbird-102.3.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e3e1d117ca12ab81c71ac412532691bac97488d4c4de0f2c6b3e04ad8842b8d5"; + sha256 = "abe9b2d0c3fcefd789e169a7dcb2ead15d55d6fa7638fa0dfa942a25dccf8ce8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/id/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/id/thunderbird-102.3.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "31783513a34d7c254bf256fece50303d19659d555ec9be6aa65d7c927331b613"; + sha256 = "600779207924004b413f8929337bad94749babf9881fff934fe22bad6b9653a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/is/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/is/thunderbird-102.3.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6872d041b88b3ef63c576545f290306002af052bddf836755983f1cc04e0d88e"; + sha256 = "a1a30d74a88331e16a9e607987702ff8c586e0c1125e53e76e3ce58b94c7066d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/it/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/it/thunderbird-102.3.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "62b3f417ce64feec22cad34bed2ceff9b148e1c70fa6c113a6ebdffa03176790"; + sha256 = "48cf2fc404a1957b3e788f1744bbe09fa0c43da8a48fe2f16e620dc7897c42e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ja/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ja/thunderbird-102.3.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d532ffe63954e34a1fabf0c4fd82650d47b6149ed24e721ec8a982e41151656d"; + sha256 = "92519bb0731fe2f7c4e5977153a297c8d00e59a7e74df974d5c97511cb0d24ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ka/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ka/thunderbird-102.3.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "34f6c534c1a1e0765beddab6f282a37a433019bf34c8f682b34bb2043ee50873"; + sha256 = "680e31023d639d4f040b6c7c64e81169d28ed8d57b30aa9e26b6bf1a4c7d76e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/kab/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/kab/thunderbird-102.3.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c8eb3166d1969e61092b360387cc36225a40dd6a6bd02fb1770fe9038737725f"; + sha256 = "0011c0b32afa890108133f9c5ca56c5cac521f76e1462497facf3bd56ef80c4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/kk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/kk/thunderbird-102.3.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1ac2a9fa3c8c4d81011bfaf7832f1b0e8e90eb5d5e6244090d72147d2e2b8fb7"; + sha256 = "95c95f06d61ab3090908e24e58d19da58ac7f5581f8fa414796ef493a1bcdd61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ko/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ko/thunderbird-102.3.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "cf93f79fa959c5bdf95b4c35c55db071825026d251ee877901864e875b28cc0f"; + sha256 = "9b80bedc6791f41acbff75794d3fda188f112b3c010ad9c1cf070624a07055d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/lt/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/lt/thunderbird-102.3.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ae27c62284aa6884daf2e798f150d2d23134dc1a9f94fa6af707436af2018c13"; + sha256 = "42aedde250458f5764b0d79c551feb0f2d06e40cf7214f83e8d61401a700ee5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/lv/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/lv/thunderbird-102.3.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1866d66a091e4b8126b70371631e5c97ce0a5868c77355b8e918678b1864e982"; + sha256 = "a3b2cf7a102cebea1ff3bbe9eaefddddfc800a0b7a8500209be71e191ffaf62d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ms/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ms/thunderbird-102.3.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "01b3960e8316292b7e76ff1c43784120d515ce9f1dde3698db3242fb1b06edf2"; + sha256 = "b20af066f049d1763ace7da37255a5383a2d441cb9ba9135906fdc1aa76fc479"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nb-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/nb-NO/thunderbird-102.3.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "98afda50d6fe63681e643d6580a773bffac167a6b074fc2523ddeaa99b34b791"; + sha256 = "0a570b14610cde2fcb4ab0fc4db9ed5a2eb468690d5adf0518487d45b6866643"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/nl/thunderbird-102.3.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "fa8e08b8ed82590db431527c75f407365b01da7a8bf445060eabd3b1cb433191"; + sha256 = "440ecc50c0c245494e4fd8f32aa3b927744a096b4aacbe4fd11c72c6ba466e60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nn-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/nn-NO/thunderbird-102.3.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b1696f0c18425096daba4cf42000b62fb3e520b670b96c716dad159dfd87ea8d"; + sha256 = "abe9de2a4ed8d11c5f8b5f51b39eec4814eda96ef601b4feb5236779c259d04e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pa-IN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pa-IN/thunderbird-102.3.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "64d1d93e474178e58ecbb6a320334fcf282768a6670d7a4b61a9868028a2b872"; + sha256 = "343689c4aa8970ab7fc6681a43b0bcc4bd69d63c900cfb4e4f62c4ccbdd93181"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pl/thunderbird-102.3.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "2944648239de42d63296117fd400f91f113f1abe43c07427d8bae171fc704178"; + sha256 = "d24b3718ebc598191f3ae650ecc6bbd800e6fc3725fcb8b6ef7fa7f63ef9eaea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pt-BR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pt-BR/thunderbird-102.3.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "8a90e2f181579f2f554323c0a517f39068261157fdb9c7a3e103b7e12bdaf85a"; + sha256 = "7cb226cbf2054aa34a27f2e9c033fd3f1fd5848d0737225da38f0fe22d2d9a01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pt-PT/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pt-PT/thunderbird-102.3.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "daf5b99316e61405a791d4c08934135578b89046b9364f59d8ff3c96ae2aad8c"; + sha256 = "1f65677e9e595b39962d0ae6a9cc0942b69c9fbf7b3e22c21a12830678ca8fab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/rm/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/rm/thunderbird-102.3.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "21293b3675a5cf775840a197278538132ce6072fcf05c9752658d7b8c1733507"; + sha256 = "cf07014796cd820061490c0fcd0be3c429f80a8edf9ecd712a5252420c8333f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ro/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ro/thunderbird-102.3.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a488e2de83e8a644dd4943ae1fb1ef7e573044d896d40174c057d85b5c572bdd"; + sha256 = "6691874f03e8a39c570e8b1b51eb0a4ae0c9b7b7ec6e10d955a82fb86dc5628c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ru/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ru/thunderbird-102.3.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "c442169025d3af45f6f17d93b4ee6b93a19dee8dc76aa3a86d05f909c7738f01"; + sha256 = "28cf9994e05d3ae6b6d740e73fe773486f4f80e94d9886ca356e22230a26f4a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sk/thunderbird-102.3.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ecdf233b3492989e4bfa8479603088bae5c01d91f803d0ef75217999727bfb96"; + sha256 = "9d07755c8471e85514c3b06a819b4acadaba1f5e19a83d64b6f33dc0e23ed4c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sl/thunderbird-102.3.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4a50de5e9e4d521fe82dac6975fc0524cda87982dbb408fc49020d444fe4a517"; + sha256 = "f7be5127b7e7f10dbf0587c1593ca7ed6c06c8ab7c6027ae6e3e02d01887f294"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sq/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sq/thunderbird-102.3.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "85374a718f1968852318320d39dee77b1377aab49e9d16457a1a92b8606f0390"; + sha256 = "ef624dc3078b216c2364bd409b1a34aa7b7bfa85571b47c6ceff1acde0232fe9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sr/thunderbird-102.3.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "1a2799e9821b1eb49ec90e6b50fc2b306e53738e192fbb8bcccba0ddaad90cc7"; + sha256 = "3dc3281d8395ea38c877a28e0d825a61466092b2b1206db219e14d2a7ae761f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sv-SE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sv-SE/thunderbird-102.3.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3f1d06d90214103104788f2f874b0ec7b915fda8f2a2c54155706f6c8b9455c7"; + sha256 = "2a72cfaef31debb488acc070365764e6478c8c437b76eddcd783c4c0af8764b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/th/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/th/thunderbird-102.3.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1d611eb6a2a1dfeea5e08bdc1d46a580df25f172169a9752d865b89e44bd673c"; + sha256 = "8a668f1bb70ea4b93f18e7c8e0667605bd3f97a175d6887adbb38a1cb5247452"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/tr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/tr/thunderbird-102.3.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3c9df11854ff3a775b9bafe57feeb585afd46e853e8be06b73f9fb5a06b21595"; + sha256 = "32dbd1790457f0224584115471366b09f1bc4a72a72467a3ec25c6cd4f1da520"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/uk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/uk/thunderbird-102.3.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "fa3a01b7a86a8885aa05fe9251ca8843b08268d338d73a4f26e790b76249e429"; + sha256 = "2f95ecb5ba9c725fed978f2a27d117cafa622eb3988ca3e0a3afd3bd38a1d529"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/uz/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/uz/thunderbird-102.3.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8e87c7f295216f70d861ced167970968db3926ddfc597613b51be82724793e19"; + sha256 = "44e1c9893960f43dd74b9fbfc2cce481538b1eac76944dd57f9e580b99027bb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/vi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/vi/thunderbird-102.3.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c8a75c6a87e5606037da51c57a9b0ca01cce95b9a6bf51f92645902be7fe666c"; + sha256 = "5fa13f379f064a7d070a32b4eeff8d8c80dae880ade4cea73ddd1d43bf3395df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/zh-CN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/zh-CN/thunderbird-102.3.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "679f176ab93c5afe107c9afad67216c86f3b85fd95051da8a194e3f28bbc9c24"; + sha256 = "0636cb784ae1d4c17a2c9f34293a1bd0def3ba11ac38114d0230bc807a0b5cc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/zh-TW/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/zh-TW/thunderbird-102.3.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d9dac3efd9f3b6f8b3de483fb895b21079f9cda9cee4247dcf605e7d1a15ed71"; + sha256 = "37e13e04ccf331da55467ba0aeed7ab8be837eeb48b64a46a8dd975955cb2b8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/af/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/af/thunderbird-102.3.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "448bba05f7fc7982e189cd0b012b83695a16b7912050919ae15ccff23ac0e9c1"; + sha256 = "9f63be2b52e9eeaf0d17a23287f406af72a15a3469f699f31c78c0065ddafc01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ar/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ar/thunderbird-102.3.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ce5d762c58ae99327e1b40bb0a2fa39e66391d620b09d156299c1240f3cd6214"; + sha256 = "b796db3c8f75a0a20ee74e264a08c35e8f77788fa539951d184f78843f35cfcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ast/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ast/thunderbird-102.3.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2bb16102cbbf2d5ecf8a4d0cf7e52abe59e0e77bab8b99955753ed2833c7c60b"; + sha256 = "ec8ba04578e0a04d55dbfd8c59e79a7c57b0c43e577b1c675463509f6defe155"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/be/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/be/thunderbird-102.3.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "77480fd5f82259c02107072cfe572d8c13611279fd9a6ffb2a9203db8cf1e233"; + sha256 = "687c2a8a79423ed5641592c09df5e93526da5b03c9f8e19fd5accd019ab31e3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/bg/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/bg/thunderbird-102.3.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "317909be58eb0718ee8a38e07ba22ef78fa912a75f18b547a1a65840214c52a7"; + sha256 = "b233d9f0a61fe08bd6781edb25da9ed272ff670ded5be133d0cb8750f478d5b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/br/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/br/thunderbird-102.3.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a6b8d5c4012c00cbcd03beedb87826fd3553497da09710517d07ab5f26347f92"; + sha256 = "413384529739c1b4d38766e307c950a77dfb9924da394ab27dfd815cc9bf0d43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ca/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ca/thunderbird-102.3.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "337d21f0927c21e54009d0a38744230145e7ab36710940da1180517a946bf06f"; + sha256 = "f861c426676cf903d4ffa54b95472da384a387e0639c70692ec3b7481fbfe77b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cak/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/cak/thunderbird-102.3.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d626cc58418c56a6505087e3ce1b8387cbf371c86653e5576b24421ef1be8cff"; + sha256 = "87679b7dcc550f1813085a7152e478eaca0e6f4a330d58d9d19281228049a054"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cs/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/cs/thunderbird-102.3.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "85422320690772a867f9128c77784f16270d739561e613505894ded2d5dea8bd"; + sha256 = "3c78f10ca1d7aa45f8267720ef3f6c6d7184f84103dd3fcf0445e05537528cba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cy/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/cy/thunderbird-102.3.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1b01874769ddcde6a5e520034131a42418f2f7cadb07d0aa9e815ebd0c59dbda"; + sha256 = "6505b99879b9c689f1b6c29adecb020c6dab72e13f4e8604862760d6eaf522a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/da/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/da/thunderbird-102.3.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6381065e3e8841a6113d2cfdc2ccb6d8082f68e977940040ee85af2ad59162a0"; + sha256 = "782422e9469deec492c38f6e004828c972341650b36c86b74d86f511789838d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/de/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/de/thunderbird-102.3.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ce9525f4d3df6336f01c526d095292490a3ef8c50752140899ef01dd5a4822cf"; + sha256 = "07077a1d02803a9c510bbba3bce2efc3d987ab1df654c6d638a9e8717e11fc79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/dsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/dsb/thunderbird-102.3.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "5597b4565df7f09e2a5682fe252076c1f689a3c7f139a38b9415c1e1ff6d3255"; + sha256 = "5ca4dab28f2f912a56fd0c2377d9537001bd07ae09b9ce20050afd338d0dd615"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/el/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/el/thunderbird-102.3.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "4b1a586b566482d4a0b333642f6a3f8d4b68c6eebb0a0620713af4e5cea97997"; + sha256 = "12c8883d711ff39876dd481f94e078508513d4dd3ac74cbccf33c44ddb0bc0ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-CA/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/en-CA/thunderbird-102.3.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d6f1602354ac05f3220f8f4dc95164d511530f3aeee50e5f24141a9807359320"; + sha256 = "c169a179d6bfd912cf3b44bb7491d43f572bcb8044100d7f395504fb3b031c99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-GB/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/en-GB/thunderbird-102.3.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "14432051534a87a677318885cebe3e1ecd0d8121426bdf378251da28f8c1a3a0"; + sha256 = "a4d2a36f571537310f92bc6f15a7ced0f65f22d6c5392384ed8d7a41302832d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-US/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/en-US/thunderbird-102.3.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "24b0bbb9eb51289daa6dd422dda05b044f1a5a791d9d5108ea6eeb711c44de76"; + sha256 = "69f5fde05bcbfddce4e11e7e18efe535fde0f79011fa5f51d5713d4b987e3c36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-AR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/es-AR/thunderbird-102.3.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b7624620c724a64b1d87f09bf685c26ce0a84d80b07ca6d9d3f784ad21967277"; + sha256 = "839318c257e33ea00be23d985f4ae59083e406fe08cbaa70853c8df762a98629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-ES/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/es-ES/thunderbird-102.3.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "dfecfa47b402b90456dc5d4ae623816cbeda9c80c4938f741bf151fae0793f47"; + sha256 = "b33fd34807fcc93f6fa2d82a0a8f4043929163045d884756abb9ec1f63ac7259"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-MX/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/es-MX/thunderbird-102.3.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8e6527ad6aad041262d85f514ecafd9d62814844a8a29d7ca1ae883e79cef50d"; + sha256 = "d0e87997410023ab0a17b8e1787846794d8db04d39b79af909cee47ee34977ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/et/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/et/thunderbird-102.3.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "8d18b241852707454ced76b234b242b3779b8d6e1443dac325379be06e688e9c"; + sha256 = "c1181432421d40855719720d0523dded01e9a6c5a5bcaef70ac46a101e0e322d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/eu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/eu/thunderbird-102.3.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b8aef6273a96f6e78ba194833fcfb31461fdc6bf6bba0fd6b2412fdf152ec53c"; + sha256 = "f9de976e9bc341963b7b74963a7c910a37072a4e9b873de488b058f3c43d6399"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/fi/thunderbird-102.3.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "001c89758fc323fa0adcc687d9a593a7cd37a02bff039028876cbe29cbc30c2e"; + sha256 = "229dfceb87668c8107748095ac8675473fbee621b1b330c306d80a78832a75cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/fr/thunderbird-102.3.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "736754863283dfb3c3a4fed93d75fca3e7c91e8b82b501569931c34fe75610a3"; + sha256 = "c280b145e31d954ad61d65bbe18651abd82e0de916508bdaf82986bf6c5c137c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fy-NL/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/fy-NL/thunderbird-102.3.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "99de0a63b7591e089fbe107c9054334dfba47a6c2b3fe5a1257dbdd6201d6ca2"; + sha256 = "9bd48a6794b2be0396a028ecf68d3a5ae3e36d758fb5459a28129a96aaa88ac6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ga-IE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ga-IE/thunderbird-102.3.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b7e2fdf11b027c6ebc8854b1dc88c8bd0f9d7fd79cf8a795aaa3e915201fec80"; + sha256 = "b9c1200b4342f03bdc3e37ef28f902310e89d200befeff2eac27c77a7a128ea5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/gd/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/gd/thunderbird-102.3.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "8e8c4c8fc100186085c7a6fbbf5aa051effae790a6616e0b9443dac25b635da4"; + sha256 = "22fd8a830e0c35288ff80e26dac73fa8761bc830e3d3ecb85a9b463481d695e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/gl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/gl/thunderbird-102.3.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6961cbf70431de590dfb00037bb78872086405f0e6b769f75ed3d053e4d12ace"; + sha256 = "3bf4cc4bb3861ae6145930b269fc5130bb51c482ddcac32db2af366428c44a79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/he/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/he/thunderbird-102.3.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "2b7c4b2fc9ef21cc303435ce65361314c9e7621259384205658ea06fa191f91a"; + sha256 = "a46292647a3edd4f98bd7a228523d62c398ecb08cc6c589a63db8b7b59ae34ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hr/thunderbird-102.3.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2e223e3830b8d7b4747633c2450f654d6c92b822d04c7c652d9c5e5431d19cca"; + sha256 = "5fabbf58c7ffd50959e35bcb35d7ede411185c6243331410849db34544117ef1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hsb/thunderbird-102.3.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "b8b49ac96522c1e0a44aa0341a272bbfac68bc3022bced753baba929c276fe7e"; + sha256 = "eb7000d604770fe4ae252a084b873bf4daa21e63ee61b8ce55b9ebbafe602e5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hu/thunderbird-102.3.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b3a5aefaac3a95d4dd1d809835cc024338fcf2ed6820808dac1007e74cb11c2b"; + sha256 = "7ce1406fa995ae3970256f589bd0cb66a650c35eda023dc8ff581e6529a5743d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hy-AM/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hy-AM/thunderbird-102.3.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "adc79864747e21dd293d46d91f57dae8a502964c5d6f952c010dc0f0a1d4c656"; + sha256 = "de6453eddbbae63e0336dba130fea7b3ea00cf7ffcafb3a24ab5ac42c5799411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/id/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/id/thunderbird-102.3.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a154337146c6a8d5a8acab2f332ca8da6572bafdc9c888ba062bc29bc7ef37fd"; + sha256 = "d2e952ee9e4ef37d5024bbff1ea3f1b9c88c7aa0df4f9feba440101900e24390"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/is/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/is/thunderbird-102.3.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "5799af2df9dd50b0c6694335b12cb77783ab0f622a8415ff82fbf15aca2822ad"; + sha256 = "2804654ca434fdc9f80d8b32c75bfcccad25747f9d67c54752d6f313ecb0ed93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/it/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/it/thunderbird-102.3.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "6c2e9dc4c6a805f919840c22a75fd6acd4bb3078a82a16b3b27e5ae1a63e21d3"; + sha256 = "0907217dcb9896d9bca6d0c7c62a557c897102b3b45c9142bc51d3c6b185cc70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ja/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ja/thunderbird-102.3.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9e67f40ceb46fd39f50cc0f8f5d83ea3c677bd91810dd84d225c636f6c20a290"; + sha256 = "049b550bb8d8a1dd274ef696dfedbb84602d2811c14e893c7dbcdbb38fb367f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ka/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ka/thunderbird-102.3.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "765c999714bb3b897dfaa0fa3e6743123ba7e3d7dc9e54eea9252dc10e5535cd"; + sha256 = "c609dc4eed2de0e0a4537a3f9640ddff41403672c787471ee09fb02a476f9047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/kab/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/kab/thunderbird-102.3.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "63380a855e8e68d5796d22c06beaf0c0021e5488cc8d408049126334e62fb70a"; + sha256 = "be17a41bd8d3b76d7cfe1d1f099efec944e2df53ec5a89ccc397217a258539c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/kk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/kk/thunderbird-102.3.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "694dfb86d441657d7fa3a5c9fb0aee04963fca34e6062278170b7ddb828bd6f4"; + sha256 = "289d699f0bddb51abd9df3628ec0a83990c0c15e434da471f3f3578c757a4630"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ko/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ko/thunderbird-102.3.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "533945ef9f5f4b47b8042e226a062fb0f406a70c89fd727c86360ff86ede56a8"; + sha256 = "494aa9bdf725a911f2494d33698daac3da429e653a89c0eaa33b6f833af6e5f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/lt/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/lt/thunderbird-102.3.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f59bc567e18f0a7bf6a8309ffd41d812196a4fb7328d0485ba01154b46b4bf89"; + sha256 = "68fe30d3246ef7de15cce1ee8c504759891dbbe70d7334ac5c30674083cdb114"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/lv/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/lv/thunderbird-102.3.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "48ba520948c2ca6e10e6a16bd7110538895780612fcd49eeb9485c6c77e6e43d"; + sha256 = "1fbb6f9f68053e4c321f4711f5aa21bb9367045f9468741cce43069ec891d6f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ms/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ms/thunderbird-102.3.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "9bdb1a669c831dc8a714d35adaaef8a25149462d7230efbee4daa1632b487425"; + sha256 = "f78b55d0319e53e1591e1a11982f51381e45a605849743f34091bb8413de4c45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nb-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/nb-NO/thunderbird-102.3.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "07016efab2eb7ed564cebcce06aa96842c2db9935e20627207ea81eb4febc583"; + sha256 = "481a74cb75fc088ddc47ebe4feda4148ff9ed826c7b2f8838c4fd6d2e34c8c03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/nl/thunderbird-102.3.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "6da0d6ddc98213620e9d9b20a008e1d419f9c183a379ce29a03113be3f168388"; + sha256 = "10ddf93f44666d0b7678bbbaa54b188178ad1bce7a47a804c29779f43cc0f5b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nn-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/nn-NO/thunderbird-102.3.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "8ede5e5a46e972d5b08e2c5afe316ca8f789faffc2b25e235eefda361073cbc3"; + sha256 = "d1dab28a6768aef75d0b2235b4b922ec8f6e54f03905e58a69d1ccb6c2c2c3ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pa-IN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pa-IN/thunderbird-102.3.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d7090dc233b508586d04c19b9f0a72d49207daf01f7dba009fbab6004bffa2da"; + sha256 = "1cad44aac21295951ee0422bea1324314ebbbf266a254ba7aa0335a16a83b17c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pl/thunderbird-102.3.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "55728076e95a42ae58bd545f4a9a07d43937e3eeca432cf14cc5b990df993cb7"; + sha256 = "66c1d6c0a2924819bd7443852f2d6c03f5e4fe666260410fbd35a5446717c440"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pt-BR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pt-BR/thunderbird-102.3.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4fcef15d7ff85a5dbfc8c30628ab50403715217ba90c28c10a46f6dfd54c806e"; + sha256 = "8fce80badd70051942bb1e8a2816907fe40a64302ec2c53db601adb76ae4b046"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pt-PT/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pt-PT/thunderbird-102.3.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "3a52e1938df9e3905e628444fa39a8ec242d5035d22081b9b236f4c9530360a2"; + sha256 = "528e4d61fc6183cbc878c50794a624fec24dae7ecd0de723b052916a38dae8d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/rm/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/rm/thunderbird-102.3.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fe1a9489fb05b630958419e9a861900f1f2208563cbfddca1535f2189fb22c9d"; + sha256 = "20175fc24b0422f8218dd2b9fe3c7272ab16d2c42bf908cf91d426d1df52aa7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ro/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ro/thunderbird-102.3.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "27faa3fe3ec2491bbba28719d1251b3b1708d533c7139d7ed9ae764cfff77b4f"; + sha256 = "3419299a3df936f428fd118f5728ca2583ee8674a9110b2846bfaebdc8fcac67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ru/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ru/thunderbird-102.3.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "25d8d95ee2310f168ba3c3b9ac382f9faa7980e2993d53170007fd8430ea81de"; + sha256 = "c2e058b4e73579f8459364d0197b63f5fa47b159d936ef6d02fb7ddfac0dc0bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sk/thunderbird-102.3.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c20d3375ecd71abc3a2e0ac02ecd3eba94a551515f3359ef1b67ba0bf6bce00e"; + sha256 = "832bd202ba4eaedbdc1a56c240a80d01b897fa323bfde55e10d7b469ae96b04e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sl/thunderbird-102.3.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "0228e8468438a9aa8eac458e24b20bfafe6aefdb5e48b54954ed00e63706bc13"; + sha256 = "5caa4ef84763e5fedf0ce7bdba3c18c78d8e6adb9cb9393b192981473f5e7124"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sq/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sq/thunderbird-102.3.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5a8663228110c37300854bf27dcc7266ab7f644433b661504c45abba41aed2e8"; + sha256 = "4ab052d9941061b1754a2abc0327a416cfd3bf2d313f2763f71cdc3f2e9f1787"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sr/thunderbird-102.3.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9a1df52ac44477ca7686408fe0581cdd72767ca72195799026ce5140623c096b"; + sha256 = "da52e326fa26db84cab3981dbadf1686c9657230d3a33725db07b089f310c252"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sv-SE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sv-SE/thunderbird-102.3.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "232aa296cc744b133127baffd286521dd9f07f3236619bd052b3f279860db9ff"; + sha256 = "a97b6001a6b4fb5b7797c745674f4d782b8b9eb6e969858aa64c7109734763c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/th/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/th/thunderbird-102.3.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "184a66243f02c8387e10cccaf8a464aba3da6f3e2f20d8493a7e6e491b16a329"; + sha256 = "aa3e07d59b55f5e691173fdf2876d75b470312823329b70b2812c39f6d70e2e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/tr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/tr/thunderbird-102.3.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9ed55035f0d9348f5903bf80a8f4b9b25d024f42eb67c7f90e32546bbe8aad37"; + sha256 = "685d0005a6db08a644527167f7f72758ce1441a35dee17d67ca82ab567e9796e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/uk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/uk/thunderbird-102.3.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2c8b84d9cc9db19d8bfccba149c02f2b339967e2e97b3955a3628f9cec3e26f2"; + sha256 = "2bc50651e17ffbeebfc51ef7a91ae348da5372f2cefded4d2810e0587d6bcc3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/uz/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/uz/thunderbird-102.3.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "47e31e1aaf4b8cd9506bc22f25cc1b7be23b6c6aa36dc7828f2d56f3506f7def"; + sha256 = "a8f6901be7bae700cef8aed58341bbfee177688cc5629326446a5a00ef76fc84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/vi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/vi/thunderbird-102.3.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d9253ed61361b5c7888429c10c2792f95c59b72dd56ab16c2707db5e4305f34b"; + sha256 = "b39bacae6af2aa1ba4b3bbbdcb7a9bd169d25878f90c7ca83b434c7fb4cb8c8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/zh-CN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/zh-CN/thunderbird-102.3.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "f978eb65f70017c61f7e32994bbf5be19fe2f18176a58f1b1aa0e36e688dc2ef"; + sha256 = "0f033acd591aaa1252ffa987d27bd1ca8924c12c980e6a57824d4ac2c7576304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/zh-TW/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/zh-TW/thunderbird-102.3.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7a337e36d45668e5c6b20e60b3617f9acdf0f0a9166ca234567a1f0e4a47181a"; + sha256 = "acfcb269900e6e24ab41fc6e6ef313b4a4e6f605de4642e1fa9398f2817fda80"; } ]; } From 4c749f11c9b29b74c020cc7a4f7751edb592e017 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 7 Oct 2022 11:16:17 +0200 Subject: [PATCH 18/46] wordpressPackages: add static-mail-sender-configurator --- pkgs/servers/web-apps/wordpress/packages/plugins.json | 6 ++++++ .../web-apps/wordpress/packages/wordpress-plugins.json | 1 + 2 files changed, 7 insertions(+) diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 4370eab7851a..85b103da39d0 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -83,6 +83,12 @@ "sha256": "1wy9cbibbngjarc8c9qn4bil3qc8i0h2kz0k364zcsnfpwi8jk3c", "version": "1.3.3" }, + "static-mail-sender-configurator": { + "path": "static-mail-sender-configurator/tags/0.9.3", + "rev": "2574393", + "sha256": "0dirfpm71av0a6qhfsczn94ry9gam4zsyin0czzy8bjzbwd6m649", + "version": "0.9.3" + }, "webp-converter-for-media": { "path": "webp-converter-for-media/tags/5.2.4", "rev": "2791011", diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index 5cf542b457c6..bef597c40f83 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -13,6 +13,7 @@ , "mailpoet" , "opengraph" , "simple-login-captcha" +, "static-mail-sender-configurator" , "webp-converter-for-media" , "wp-mail-smtp" , "wp-gdpr-compliance" From 6a09447568d2100f660b8f337ef3cf7f6218a26e Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 8 Oct 2022 13:15:13 +0200 Subject: [PATCH 19/46] adcli: 0.9.1 -> 0.9.2 --- pkgs/os-specific/linux/adcli/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/adcli/default.nix b/pkgs/os-specific/linux/adcli/default.nix index 977c1d09dbae..a60a77b4e6a0 100644 --- a/pkgs/os-specific/linux/adcli/default.nix +++ b/pkgs/os-specific/linux/adcli/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , openldap , libkrb5 , libxslt @@ -16,25 +15,16 @@ stdenv.mkDerivation rec { pname = "adcli"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "realmd"; repo = pname; rev = version; - sha256 = "sha256-Zzt4qgLiJNuSrbtDWuxJEfGL7sWSbqN301q3qXZpn9c="; + sha256 = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE="; }; - # https://bugs.gentoo.org/820224 - # Without this it produces some weird missing symbol error in glibc - patches = [ - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch?id=01db544de893262e857685e11b33c2a74210181f"; - sha256 = "sha256-dZ6dkzxd+0XjY/X9/2IWMan3syvCDGFHiMbxFxMHGFA="; - }) - ]; - postPatch = '' substituteInPlace tools/Makefile.am \ --replace 'sbin_PROGRAMS' 'bin_PROGRAMS' @@ -52,6 +42,7 @@ stdenv.mkDerivation rec { patch_docbook doc/adcli-devel.xml patch_docbook doc/adcli-docs.xml ''; + nativeBuildInputs = [ autoreconfHook pkg-config docbook_xsl ]; buildInputs = [ openldap libkrb5 libxslt cyrus_sasl util-linux xmlto docbook_xsl ]; From 1b6aa43a6a9b4f61adc6a3f8b357a306c3c7f918 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 8 Oct 2022 13:15:55 +0200 Subject: [PATCH 20/46] adcli: add anthonyroussel to maintainers --- pkgs/os-specific/linux/adcli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/adcli/default.nix b/pkgs/os-specific/linux/adcli/default.nix index a60a77b4e6a0..da91c99404f6 100644 --- a/pkgs/os-specific/linux/adcli/default.nix +++ b/pkgs/os-specific/linux/adcli/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html"; description = "A helper library and tools for Active Directory client operations."; license = licenses.lgpl21Only; - maintainers = with maintainers; [ SohamG ]; + maintainers = with maintainers; [ SohamG anthonyroussel ]; platforms = platforms.linux; }; } From ac8ffafa401fd353911d45d26f35e5b708ed4be0 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 8 Oct 2022 13:20:24 +0200 Subject: [PATCH 21/46] adcli: cleanup --- pkgs/os-specific/linux/adcli/default.nix | 25 +++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/adcli/default.nix b/pkgs/os-specific/linux/adcli/default.nix index da91c99404f6..66e017437f9d 100644 --- a/pkgs/os-specific/linux/adcli/default.nix +++ b/pkgs/os-specific/linux/adcli/default.nix @@ -25,6 +25,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE="; }; + nativeBuildInputs = [ + autoreconfHook + pkg-config + docbook_xsl + util-linux + xmlto + ]; + + buildInputs = [ + openldap + libkrb5 + libxslt + cyrus_sasl + ]; + + configureFlags = [ "--disable-debug" ]; + postPatch = '' substituteInPlace tools/Makefile.am \ --replace 'sbin_PROGRAMS' 'bin_PROGRAMS' @@ -33,7 +50,7 @@ stdenv.mkDerivation rec { --replace 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \ '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl' - function patch_docbook(){ + function patch_docbook() { substituteInPlace $1 \ --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" @@ -43,12 +60,6 @@ stdenv.mkDerivation rec { patch_docbook doc/adcli-docs.xml ''; - nativeBuildInputs = [ autoreconfHook pkg-config docbook_xsl ]; - - buildInputs = [ openldap libkrb5 libxslt cyrus_sasl util-linux xmlto docbook_xsl ]; - - configureFlags = [ "--disable-debug" ]; - meta = with lib; { homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html"; description = "A helper library and tools for Active Directory client operations."; From 9766d6127ab52253174ff5989d6054745ba1b7bf Mon Sep 17 00:00:00 2001 From: ners Date: Fri, 7 Oct 2022 13:57:44 +0200 Subject: [PATCH 22/46] maintainers: add ners --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0ddf2fa033de..5ef23561699e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9555,6 +9555,13 @@ githubId = 23743547; name = "Akshay Oppiliappan"; }; + ners = { + name = "ners"; + email = "ners@gmx.ch"; + matrix = "@ners:ners.ch"; + github = "ners"; + githubId = 50560955; + }; nessdoor = { name = "Tomas Antonio Lopez"; email = "entropy.overseer@protonmail.com"; From 2c5c239958bc9f9e7fda9f37c3515586f793f7b9 Mon Sep 17 00:00:00 2001 From: ners Date: Sat, 8 Oct 2022 14:15:05 +0200 Subject: [PATCH 23/46] apache-directory-server: init at 2.0.0.AM26 --- .../apache-directory-server/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/apache-directory-server/default.nix diff --git a/pkgs/servers/apache-directory-server/default.nix b/pkgs/servers/apache-directory-server/default.nix new file mode 100644 index 000000000000..7008e0e40d25 --- /dev/null +++ b/pkgs/servers/apache-directory-server/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchzip, jdk11, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "apache-directory-server"; + version = "2.0.0.AM26"; + + src = fetchzip { + url = "https://dlcdn.apache.org//directory/apacheds/dist/${version}/apacheds-${version}.zip"; + sha256 = "sha256-36kDvfSy5rt/3+nivEFTepnIKf6sX0NTgPRm28M+1v4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/apacheds + install -D $src/lib/*.jar $out/share/apacheds + classpath=$(jars=($out/share/apacheds/*.jar); IFS=:; echo "''${jars[*]}") + makeWrapper ${jdk11}/bin/java $out/bin/apache-directory-server \ + --add-flags "-classpath $classpath org.apache.directory.server.UberjarMain" + ''; + + meta = with lib; { + description = "An extensible and embeddable directory server"; + homepage = "https://directory.apache.org/apacheds/"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.ners ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31e774dcad04..2464fe98b7c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26821,6 +26821,8 @@ with pkgs; ao = libfive; + apache-directory-server = callPackage ../servers/apache-directory-server {}; + apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; apkeep = callPackage ../tools/misc/apkeep { From 5ec24ce090a82ee341cbdca458aec72f0f0f4a5a Mon Sep 17 00:00:00 2001 From: ners Date: Sat, 8 Oct 2022 14:15:22 +0200 Subject: [PATCH 24/46] janusgraph: init at 0.6.2 --- pkgs/servers/nosql/janusgraph/default.nix | 44 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/servers/nosql/janusgraph/default.nix diff --git a/pkgs/servers/nosql/janusgraph/default.nix b/pkgs/servers/nosql/janusgraph/default.nix new file mode 100644 index 000000000000..3fc63a91cd36 --- /dev/null +++ b/pkgs/servers/nosql/janusgraph/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchzip, jdk11, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "janusgraph"; + version = "0.6.2"; + + src = fetchzip { + url = "https://github.com/JanusGraph/janusgraph/releases/download/v${version}/janusgraph-${version}.zip"; + sha256 = "sha256-8TMYk8gGyL71zcFk0Lgo7Isvm4k3eh/H6PjfVePpkI4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/janusgraph + install -D $src/lib/*.jar $out/share/janusgraph + cd $src + find conf scripts -type f -exec install -D {} $out/share/janusgraph/{} \; + + JANUSGRAPH_LIB=$out/share/janusgraph + classpath="" + # Add the slf4j-log4j12 binding + classpath="$classpath":$(find -L $JANUSGRAPH_LIB -name 'slf4j-log4j12*.jar' | sort | tr '\n' ':') + # Add the jars in $JANUSGRAPH_LIB that start with "janusgraph" + classpath="$classpath":$(find -L $JANUSGRAPH_LIB -name 'janusgraph*.jar' | sort | tr '\n' ':') + # Add the remaining jars in $JANUSGRAPH_LIB. + classpath="$classpath":$(find -L $JANUSGRAPH_LIB -name '*.jar' \ + \! -name 'janusgraph*' \ + \! -name 'slf4j-log4j12*.jar' | sort | tr '\n' ':') + + makeWrapper ${jdk11}/bin/java $out/bin/janusgraph-server \ + --add-flags "-classpath $classpath org.janusgraph.graphdb.server.JanusGraphServer" + ''; + + meta = with lib; { + description = "An open-source, distributed graph database"; + homepage = "https://janusgraph.org/"; + mainProgram = "janusgraph-server"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.ners ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2464fe98b7c9..3c10bb56aecc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23297,6 +23297,8 @@ with pkgs; janus-gateway = callPackage ../servers/janus-gateway { }; + janusgraph = callPackage ../servers/nosql/janusgraph { }; + jboss = callPackage ../servers/http/jboss { }; jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { }; From c1af7320e6c10ce22bbda1bf626112b59b3a48e9 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 8 Oct 2022 15:14:54 +0200 Subject: [PATCH 25/46] vdpauinfo: 1.3 -> 1.5 --- pkgs/tools/X11/vdpauinfo/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 35305d44635f..a5fc87aaf6f2 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, libvdpau }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libvdpau }: stdenv.mkDerivation rec { pname = "vdpauinfo"; - version = "1.3"; + version = "1.5"; src = fetchurl { - url = "https://gitlab.freedesktop.org/vdpau/vdpauinfo/uploads/6fa9718c507ef0fb6966170ef55344bf/${pname}-${version}.tar.gz"; - sha256 = "0s6jdadnycyd1agsnfx7hrf17hmipasx1fpmppd4m1z6i9sp1i6g"; + url = "https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-uOs/r8Ow7KvSpY1NhD2A+D4Qs6iWJe4fZGfVj6nIiCw="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libvdpau ]; meta = with lib; { @@ -17,6 +18,6 @@ stdenv.mkDerivation rec { description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; license = licenses.mit; # expat version platforms = platforms.unix; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ vcunat ]; }; } From c856e2c30601caa5eca85d8b591af16c04191eeb Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Fri, 7 Oct 2022 11:42:21 +0200 Subject: [PATCH 26/46] duckstation: unstable-2022-08-22 -> unstable-2022-07-08 This reverts commit b6298548da6d75df0b444117f6628377178454f2, reversing changes made to c82e839d2d9d35f677326d9168f0afc1af5373cb. duckstation: 0.pre+date=2022-01-18 -> unstable-2022-07-08 --- .../emulators/duckstation/default.nix | 24 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 7936ced720f0..d02e08ed6cd4 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -7,28 +7,28 @@ , makeDesktopItem , curl , extra-cmake-modules +, libevdev , libpulseaudio , libXrandr , mesa # for libgbm , ninja , pkg-config , qtbase -, qtsvg , qttools , vulkan-loader -, wayland +#, wayland # Wayland doesn't work correctly this version , wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "duckstation"; - version = "unstable-2022-08-22"; + version = "unstable-2022-07-08"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "4f2da4213d1d2c69417392d15b27bb123ee9d297"; - sha256 = "sha256-VJeKbJ40ZErlu/6RETvk0KDSc9T7ssBrLDecNczQlXU="; + rev = "82965f741e81e4d2f7e1b2abdc011e1f266bfe7f"; + sha256 = "sha256-D8Ps/EQRcHLsps/KEUs56koeioOdE/GPA0QJSrbSdYs="; }; nativeBuildInputs = [ @@ -44,30 +44,31 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 curl + libevdev libpulseaudio libXrandr mesa qtbase - qtsvg vulkan-loader - wayland + #wayland ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" - "-DUSE_WAYLAND=ON" + #"-DUSE_WAYLAND=ON" ]; desktopItems = [ (makeDesktopItem { - name = "DuckStation"; - desktopName = "JamesDSP"; + name = "duckstation-qt"; + desktopName = "DuckStation"; genericName = "PlayStation 1 Emulator"; icon = "duckstation"; tryExec = "duckstation-qt"; exec = "duckstation-qt %f"; comment = "Fast PlayStation 1 emulator"; categories = [ "Game" "Emulator" "Qt" ]; + type = "Application"; }) ]; @@ -79,7 +80,7 @@ stdenv.mkDerivation rec { cp -r bin $out/share/duckstation ln -s $out/share/duckstation/duckstation-qt $out/bin/ - install -Dm644 bin/resources/images/duck.png $out/share/pixmaps/duckstation.png + install -Dm644 ../extras/icons/icon-256px.png $out/share/pixmaps/duckstation.png runHook postInstall ''; @@ -93,6 +94,7 @@ stdenv.mkDerivation rec { # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 qtWrapperArgs = [ + "--set QT_QPA_PLATFORM xcb" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7aea53c6df5e..25206c4fb24d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1494,7 +1494,7 @@ with pkgs; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - duckstation = qt6Packages.callPackage ../applications/emulators/duckstation {}; + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; dynamips = callPackage ../applications/emulators/dynamips { }; From 679cd3462fab51ba0534532d5a28b96659cc8b63 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 8 Oct 2022 10:22:42 +0200 Subject: [PATCH 27/46] sget: init at unstable-2022-10-04 This binary was provided by the `cosign` package until now but it is in the process of being removed, see https://github.com/sigstore/cosign/pull/2019 Since it might be removed during the 22.11 cycle we drop it preventively. This will make possible security backports easier if we need them. --- .../from_md/release-notes/rl-2211.section.xml | 4 ++- .../manual/release-notes/rl-2211.section.md | 2 +- pkgs/tools/security/cosign/default.nix | 5 --- pkgs/tools/security/sget/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 pkgs/tools/security/sget/default.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 78bd6c6a22d8..177af1d2afa3 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -501,7 +501,9 @@ pkgs.cosign does not provide the - cosigned binary anymore. + cosigned binary anymore. The + sget binary has been moved into its own + package. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 37b0db8a8ce1..d0376b67c982 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -169,7 +169,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - PHP 7.4 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 22.11 release. -- `pkgs.cosign` does not provide the `cosigned` binary anymore. +- `pkgs.cosign` does not provide the `cosigned` binary anymore. The `sget` binary has been moved into its own package. - Emacs now uses the Lucid toolkit by default instead of GTK because of stability and compatibility issues. Users who still wish to remain using GTK can do so by using `emacs-gtk`. diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index f64237b82540..6cfd46954e32 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -20,7 +20,6 @@ buildGoModule rec { subPackages = [ "cmd/cosign" - "cmd/sget" ]; tags = [] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ]; @@ -45,10 +44,6 @@ buildGoModule rec { --bash <($out/bin/cosign completion bash) \ --fish <($out/bin/cosign completion fish) \ --zsh <($out/bin/cosign completion zsh) - installShellCompletion --cmd sget \ - --bash <($out/bin/sget completion bash) \ - --fish <($out/bin/sget completion fish) \ - --zsh <($out/bin/sget completion zsh) ''; meta = with lib; { diff --git a/pkgs/tools/security/sget/default.nix b/pkgs/tools/security/sget/default.nix new file mode 100644 index 000000000000..ef59b5db3341 --- /dev/null +++ b/pkgs/tools/security/sget/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "sget"; + version = "unstable-2022-10-04"; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = pname; + rev = "d7d1e53b21ca906000e74474729854cb5ac48dbc"; + sha256 = "sha256-BgxTlLmtKqtDq3HgLoH+j0vBrpRujmL9Wr8F4d+jPi0="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + vendorSha256 = "sha256-KPQHS7Hfco1ljOJgStIXMaol7j4dglcr0w+6Boj7GK8="; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + installShellCompletion --cmd sget \ + --bash <($out/bin/sget completion bash) \ + --fish <($out/bin/sget completion fish) \ + --zsh <($out/bin/sget completion zsh) + ''; + + meta = with lib; { + homepage = "https://github.com/sigstore/sget"; + description = "Command for safer, automatic verification of signatures and integration with Sigstore's binary transparency log, Rekor"; + license = licenses.asl20; + maintainers = with maintainers; [ lesuisse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33ca400bbb81..a5ad554e9c7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11059,6 +11059,8 @@ with pkgs; sg3_utils = callPackage ../tools/system/sg3_utils { }; + sget = callPackage ../tools/security/sget { }; + sha1collisiondetection = callPackage ../tools/security/sha1collisiondetection { }; shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { }; From b206c7d019517276f22761b515509382d139499b Mon Sep 17 00:00:00 2001 From: witheredsea7df Date: Sat, 8 Oct 2022 15:34:45 -0400 Subject: [PATCH 28/46] bitcoin-abc: 0.21.13 -> 0.26.2 --- .../blockchains/bitcoin-abc/default.nix | 8 ++++---- .../bitcoin-abc/fix-bitcoin-qt-build.patch | 15 --------------- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 6f1734bbc135..c1ede1ea839f 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -15,6 +15,7 @@ , protobuf , qrencode , libevent +, sqlite , withGui , python3 , jemalloc @@ -23,17 +24,15 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.21.13"; + version = "0.26.2"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1x8xcdi1vcskggk9bqkwr3ah4vi9b7sj2h8hf7spac6dvz8lmzav"; + sha256 = "0gz4713lk3alk3ykwq1bdqjywadrfrnb7n2878136g01n87j00az"; }; - patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssl @@ -47,6 +46,7 @@ mkDerivation rec { util-linux protobuf libevent + sqlite ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; cmakeFlags = lib.optionals (!withGui) [ diff --git a/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch b/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch deleted file mode 100644 index c49bbc432519..000000000000 --- a/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- bitcoin-abc-v0.15.0-src/build-aux/m4/bitcoin_qt.m4 1970-01-01 01:00:01.000000000 +0100 -+++ bitcoin-abc-v0.15.0-src.org/build-aux/m4/bitcoin_qt.m4 2017-09-27 23:38:44.748384197 +0100 -@@ -35,11 +35,7 @@ - dnl Output: $1 is set to the path of $2 if found. $2 are searched in order. - AC_DEFUN([BITCOIN_QT_PATH_PROGS],[ - BITCOIN_QT_CHECK([ -- if test "x$3" != x; then -- AC_PATH_PROGS($1,$2,,$3) -- else -- AC_PATH_PROGS($1,$2) -- fi -+ AC_PATH_PROGS($1,$2) - if test "x$$1" = x && test "x$4" != xyes; then - BITCOIN_QT_FAIL([$1 not found]) - fi From 7e959388cddd24a46cbeff8e62214bb79248e76a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 8 Oct 2022 23:30:03 +0200 Subject: [PATCH 29/46] pcem: migrate to wxGTK32 --- pkgs/applications/emulators/pcem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix index 2e6aa683e4d3..22173fe9e085 100644 --- a/pkgs/applications/emulators/pcem/default.nix +++ b/pkgs/applications/emulators/pcem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsa-lib, pkg-config +{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config , autoreconfHook, withNetworking ? true, withALSA ? true }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ wxGTK31 coreutils SDL2 openal ] + buildInputs = [ wxGTK32 coreutils SDL2 openal ] ++ lib.optional withALSA alsa-lib; configureFlags = [ "--enable-release-build" ] From 64fb94794f70a0e05319a05fc8931e8fdd01b934 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Oct 2022 03:15:00 +0000 Subject: [PATCH 30/46] dnstwist: 20220815 -> 20221008 --- pkgs/tools/networking/dnstwist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/tools/networking/dnstwist/default.nix index 03f31e5064b8..d812873b086c 100644 --- a/pkgs/tools/networking/dnstwist/default.nix +++ b/pkgs/tools/networking/dnstwist/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20220815"; + version = "20221008"; src = fetchFromGitHub { owner = "elceef"; repo = pname; - rev = version; - sha256 = "sha256-cmwgnjhfTqehMCu6mN0840NIaTN8gf4r098ULVj0yPI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-JRlUQoN8lNEaovAeYzrect/r6jdXtIzChK2lqaxAavc="; }; propagatedBuildInputs = with python3.pkgs; [ From de25676c9f0954c9fdbb703cdb9326af9301ad50 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 9 Oct 2022 15:43:34 +1000 Subject: [PATCH 31/46] promtail: move alongside grafana-loki --- pkgs/servers/monitoring/loki/promtail.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 pkgs/servers/monitoring/loki/promtail.nix diff --git a/pkgs/servers/monitoring/loki/promtail.nix b/pkgs/servers/monitoring/loki/promtail.nix new file mode 100644 index 000000000000..e8539ee60a32 --- /dev/null +++ b/pkgs/servers/monitoring/loki/promtail.nix @@ -0,0 +1,7 @@ +{ lib, grafana-loki }: + +grafana-loki.overrideAttrs (o: { + pname = "promtail"; + subPackages = ["clients/cmd/promtail"]; + CGO_ENABLED = 1; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 547ca93ef8df..b51c0bbbe3d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23219,15 +23219,10 @@ with pkgs; grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; grafana-loki = callPackage ../servers/monitoring/loki { }; + promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; mimir = callPackage ../servers/monitoring/mimir { }; - promtail = grafana-loki.overrideAttrs (o: { - pname = "promtail"; - subPackages = ["clients/cmd/promtail"]; - CGO_ENABLED = 1; - }); - grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; From 4df4d2a8eac999e47f973911857b9756281f8273 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 30 Sep 2022 17:02:24 +0200 Subject: [PATCH 32/46] genJqSecretsReplacementSnippet: Allow dots in attribute names... ...and escape quotation marks and backslashes. --- nixos/lib/utils.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index d7671a374999..f646f70323e3 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -102,7 +102,11 @@ rec { if item ? ${attr} then nameValuePair prefix item.${attr} else if isAttrs item then - map (name: recurse (prefix + "." + name) item.${name}) (attrNames item) + map (name: + let + escapedName = ''"${replaceChars [''"'' "\\"] [''\"'' "\\\\"] name}"''; + in + recurse (prefix + "." + escapedName) item.${name}) (attrNames item) else if isList item then imap0 (index: item: recurse (prefix + "[${toString index}]") item) item else @@ -182,13 +186,13 @@ rec { '') (attrNames secrets)) + "\n" - + "${pkgs.jq}/bin/jq >'${output}' '" - + concatStringsSep + + "${pkgs.jq}/bin/jq >'${output}' " + + lib.escapeShellArg (concatStringsSep " | " (imap1 (index: name: ''${name} = $ENV.secret${toString index}'') - (attrNames secrets)) + (attrNames secrets))) + '' - ' <<'EOF' + <<'EOF' ${builtins.toJSON set} EOF (( ! $inherit_errexit_enabled )) && shopt -u inherit_errexit From 0211edd1ff005575c5b2061f25d73fccb6271252 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 3 Oct 2022 19:12:38 +0200 Subject: [PATCH 33/46] nixos/gitlab: Add workhorse.config option --- nixos/modules/services/misc/gitlab.nix | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e5de3a2b6ad1..77039baa4e21 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -6,6 +6,8 @@ let cfg = config.services.gitlab; opt = options.services.gitlab; + toml = pkgs.formats.toml {}; + ruby = cfg.packages.gitlab.ruby; postgresqlPackage = if config.services.postgresql.enable then @@ -867,6 +869,39 @@ in { }; }; + workhorse.config = mkOption { + type = toml.type; + default = {}; + example = literalExpression '' + { + object_storage.provider = "AWS"; + object_storage.s3 = { + aws_access_key_id = "AKIAXXXXXXXXXXXXXXXX"; + aws_secret_access_key = { _secret = "/var/keys/aws_secret_access_key"; }; + }; + }; + ''; + description = lib.mdDoc '' + Configuration options to add to Workhorse's configuration + file. + + See + + and + + for examples and option documentation. + + Options containing secret data should be set to an attribute + set containing the attribute `_secret` - a string pointing + to a file containing the value the option should be set + to. See the example to get a better picture of this: in the + resulting configuration file, the + `object_storage.s3.aws_secret_access_key` key will be set to + the contents of the {file}`/var/keys/aws_secret_access_key` + file. + ''; + }; + extraConfig = mkOption { type = types.attrs; default = {}; @@ -1357,6 +1392,7 @@ in { wantedBy = [ "gitlab.target" ]; partOf = [ "gitlab.target" ]; path = with pkgs; [ + remarshal exiftool gitPackage gnutar @@ -1371,6 +1407,17 @@ in { TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; + ExecStartPre = pkgs.writeShellScript "gitlab-workhorse-pre-start" '' + set -o errexit -o pipefail -o nounset + shopt -s dotglob nullglob inherit_errexit + + ${utils.genJqSecretsReplacementSnippet + cfg.workhorse.config + "${cfg.statePath}/config/gitlab-workhorse.json"} + + json2toml "${cfg.statePath}/config/gitlab-workhorse.json" "${cfg.statePath}/config/gitlab-workhorse.toml" + rm "${cfg.statePath}/config/gitlab-workhorse.json" + ''; ExecStart = "${cfg.packages.gitlab-workhorse}/bin/workhorse " + "-listenUmask 0 " @@ -1378,6 +1425,7 @@ in { + "-listenAddr /run/gitlab/gitlab-workhorse.socket " + "-authSocket ${gitlabSocket} " + "-documentRoot ${cfg.packages.gitlab}/share/gitlab/public " + + "-config ${cfg.statePath}/config/gitlab-workhorse.toml " + "-secretPath ${cfg.statePath}/.gitlab_workhorse_secret"; }; }; From bee6e1dafa55df37ac4a6199cd8b0c00ac73ed07 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 4 Oct 2022 14:32:25 +0200 Subject: [PATCH 34/46] nixos/gitlab: Deduplicate runtime dependency listing --- nixos/modules/services/misc/gitlab.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 77039baa4e21..34c20cb83b77 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -190,6 +190,16 @@ let MALLOC_ARENA_MAX = "2"; } // cfg.extraEnv; + runtimeDeps = with pkgs; [ + nodejs + gzip + git + gnutar + postgresqlPackage + coreutils + procps + ]; + gitlab-rake = pkgs.stdenv.mkDerivation { name = "gitlab-rake"; buildInputs = [ pkgs.makeWrapper ]; @@ -199,7 +209,7 @@ let mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ - --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \ + --set PATH '${lib.makeBinPath runtimeDeps}:$PATH' \ --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ --chdir '${cfg.packages.gitlab}/share/gitlab' ''; @@ -214,7 +224,7 @@ let mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ - --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \ + --set PATH '${lib.makeBinPath runtimeDeps}:$PATH' \ --chdir '${cfg.packages.gitlab}/share/gitlab' ''; }; From 843082eb3af6a453b3aeb6c3c6724e508aa44478 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 4 Oct 2022 14:33:43 +0200 Subject: [PATCH 35/46] nixos/gitlab: Add findutils to runtime dependencies Needed for the gitlab:cleanup:orphan_job_artifact_files rake task. --- nixos/modules/services/misc/gitlab.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 34c20cb83b77..98d822c19de7 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -198,6 +198,7 @@ let postgresqlPackage coreutils procps + findutils # Needed for gitlab:cleanup:orphan_job_artifact_files ]; gitlab-rake = pkgs.stdenv.mkDerivation { From 3dedfb3fa03c5a4eda64bdb1dfd9a39fa587bc8a Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 4 Oct 2022 14:52:12 +0200 Subject: [PATCH 36/46] nixos/gitlab: Connect to redis through a unix socket by default This gives us slightly higher security as you have to be in the gitlab group to connect, and possibly a (very small) performance benefit as well. --- nixos/modules/services/misc/gitlab.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 98d822c19de7..60d7df08c051 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -91,13 +91,6 @@ let repos_path = "${cfg.statePath}/repositories"; secret_file = "${cfg.statePath}/gitlab_shell_secret"; log_file = "${cfg.statePath}/log/gitlab-shell.log"; - redis = { - bin = "${pkgs.redis}/bin/redis-cli"; - host = "127.0.0.1"; - port = config.services.redis.servers.gitlab.port; - database = 0; - namespace = "resque:gitlab"; - }; }; redisConfig.production.url = cfg.redisUrl; @@ -481,9 +474,9 @@ in { redisUrl = mkOption { type = types.str; - default = "redis://localhost:${toString config.services.redis.servers.gitlab.port}/"; - defaultText = literalExpression ''redis://localhost:''${toString config.services.redis.servers.gitlab.port}/''; - description = lib.mdDoc "Redis URL for all GitLab services except gitlab-shell"; + default = "unix:/run/gitlab/redis.sock"; + example = "redis://localhost:6379/"; + description = lib.mdDoc "Redis URL for all GitLab services."; }; extraGitlabRb = mkOption { @@ -1018,8 +1011,9 @@ in { # Redis is required for the sidekiq queue runner. services.redis.servers.gitlab = { enable = mkDefault true; - port = mkDefault 31636; - bind = mkDefault "127.0.0.1"; + user = mkDefault cfg.user; + unixSocket = mkDefault "/run/gitlab/redis.sock"; + unixSocketPerm = mkDefault 770; }; # We use postgres as the main data store. From 8e8253ddb4b5b0488e476a1a1c50b340990bd516 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 4 Oct 2022 14:56:49 +0200 Subject: [PATCH 37/46] nixos/gitlab: Create registry state path --- nixos/modules/services/misc/gitlab.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 60d7df08c051..bd32cabedd27 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1155,6 +1155,7 @@ in { "d ${gitlabConfig.production.shared.path}/lfs-objects 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/packages 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/pages 0750 ${cfg.user} ${cfg.group} -" + "d ${gitlabConfig.production.shared.path}/registry 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/terraform_state 0750 ${cfg.user} ${cfg.group} -" "L+ /run/gitlab/config - - - - ${cfg.statePath}/config" "L+ /run/gitlab/log - - - - ${cfg.statePath}/log" From 58158100f766214a9493ca32afc6e8bfc6c8b10e Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 4 Oct 2022 14:57:43 +0200 Subject: [PATCH 38/46] nixos/gitlab: Make sure docker-registry starts after cert generation --- nixos/modules/services/misc/gitlab.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index bd32cabedd27..51e90cb813b7 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1102,6 +1102,7 @@ in { # Ensure Docker Registry launches after the certificate generation job systemd.services.docker-registry = optionalAttrs cfg.registry.enable { wants = [ "gitlab-registry-cert.service" ]; + after = [ "gitlab-registry-cert.service" ]; }; # Enable Docker Registry, if GitLab-Container Registry is enabled From 9b3ff51c777d51f3aa0f23e3a6c956504ccd2f7e Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 4 Oct 2022 15:59:56 +0200 Subject: [PATCH 39/46] nixos/gitlab: Set a more appropriate type for extraConfig --- nixos/modules/services/misc/gitlab.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 51e90cb813b7..0c8cafff9ed5 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -7,6 +7,7 @@ let opt = options.services.gitlab; toml = pkgs.formats.toml {}; + yaml = pkgs.formats.yaml {}; ruby = cfg.packages.gitlab.ruby; @@ -907,7 +908,7 @@ in { }; extraConfig = mkOption { - type = types.attrs; + type = yaml.type; default = {}; example = literalExpression '' { From fae653deb4af085526163467e73f2d26b2220b52 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 4 Oct 2022 17:42:43 +0200 Subject: [PATCH 40/46] nixos/gitlab: Configure ActionCable ActionCable is used to provide realtime updates in a few places, mainly the issue sidebar. --- nixos/modules/services/misc/gitlab.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 0c8cafff9ed5..772693cb624e 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -96,6 +96,14 @@ let redisConfig.production.url = cfg.redisUrl; + cableYml = yaml.generate "cable.yml" { + production = { + adapter = "redis"; + url = cfg.redisUrl; + channel_prefix = "gitlab_production"; + }; + }; + pagesArgs = [ "-pages-domain" gitlabConfig.production.pages.host "-pages-root" "${gitlabConfig.production.shared.path}/pages" @@ -1211,6 +1219,7 @@ in { cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb + ln -sf ${cableYml} ${cfg.statePath}/config/cable.yml ${cfg.packages.gitlab-shell}/bin/install From 7cce28d594fcc094dfb76eb89430806002c04352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Oct 2022 08:14:06 +0200 Subject: [PATCH 41/46] qt5.qtscript: drop the version override It really was updated in commit 697a72e8a and refused to build. (You can think of this as a revert of commit dd4afc7c0055.) --- pkgs/development/libraries/qt-5/5.15/srcs.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index e05963a4aaf1..8c40a49ac0a7 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -2,9 +2,7 @@ let version = "5.15.6"; - overrides = { - qtscript.version = "5.15.4"; - }; + overrides = {}; mk = name: args: let From 4fd75277dd383abfa0d8719306b1fbe18c024366 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 Oct 2022 09:31:48 +0200 Subject: [PATCH 42/46] nixos/coturn: refactor secret injection The original implementation had a few issues: * The secret was briefly leaked since it is part of the cmdline for `sed(1)` and on Linux `cmdline` is world-readable. * If the secret would contain either a `,` or a `"` it would mess with the `sed(1)` expression itself unless you apply messy escape hacks. To circumvent all of that, I decided to use `replace-secret` which allows you to replace a string inside a file (in this case `#static-auth-secret#`) with the contents of a file, i.e. `cfg.static-auth-secret-file` without any of these issues. --- nixos/modules/services/networking/coturn.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index 4d83d2d48e37..2f34a72377ce 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -335,9 +335,10 @@ in { preStart = '' cat ${configFile} > ${runConfig} ${optionalString (cfg.static-auth-secret-file != null) '' - STATIC_AUTH_SECRET="$(head -n1 ${cfg.static-auth-secret-file} || :)" - sed -e "s,#static-auth-secret#,$STATIC_AUTH_SECRET,g" \ - -i ${runConfig} + ${pkgs.replace-secret}/bin/replace-secret \ + "#static-auth-secret#" \ + ${cfg.static-auth-secret-file} \ + ${runConfig} '' } chmod 640 ${runConfig} ''; From 0e211108227518c4f841425145a822a76e0e05b0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 2 Oct 2022 09:06:37 +0200 Subject: [PATCH 43/46] =?UTF-8?q?ocamlPackages.caqti:=201.8.0=20=E2=86=92?= =?UTF-8?q?=201.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/caqti/async.nix | 1 - pkgs/development/ocaml-modules/caqti/default.nix | 15 ++++++--------- .../ocaml-modules/caqti/driver-mariadb.nix | 1 - .../ocaml-modules/caqti/driver-postgresql.nix | 1 - .../ocaml-modules/caqti/driver-sqlite3.nix | 1 - pkgs/development/ocaml-modules/caqti/dynload.nix | 1 - pkgs/development/ocaml-modules/caqti/lwt.nix | 1 - .../ocaml-modules/caqti/type-calendar.nix | 4 +--- 8 files changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix index 0e0da6a94bb7..148694770777 100644 --- a/pkgs/development/ocaml-modules/caqti/async.nix +++ b/pkgs/development/ocaml-modules/caqti/async.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-async"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ]; diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index 510437f1c3bc..5edb68d30cfa 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -1,19 +1,16 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage, ocaml , cppo, logs, ptime, uri, bigstringaf , re, cmdliner, alcotest }: buildDunePackage rec { pname = "caqti"; - version = "1.8.0"; - useDune2 = true; + version = "1.9.1"; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; - src = fetchFromGitHub { - owner = "paurkedal"; - repo = "ocaml-${pname}"; - rev = "v${version}"; - sha256 = "sha256-8uKlrq9j1Z3QzkCyoRIn2j6wCdGyo7BY7XlbFHN1xVE="; + src = fetchurl { + url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${version}/caqti-v${version}.tbz"; + sha256 = "sha256-PQBgJBNx3IcE6/vyNIf26a2xStU22LBhff8eM6UPaJ4="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix index 5f4f681540e9..bff515eff381 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-mariadb"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti mariadb ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix index a1b427a5edf4..f33e38fab8df 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-postgresql"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti postgresql ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index 5282ba5ef505..822c002a8de3 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-sqlite3"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix index 6ed86683728b..8e6a30a1a312 100644 --- a/pkgs/development/ocaml-modules/caqti/dynload.nix +++ b/pkgs/development/ocaml-modules/caqti/dynload.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-dynload"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti ]; diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix index f02fa377f806..d06421136280 100644 --- a/pkgs/development/ocaml-modules/caqti/lwt.nix +++ b/pkgs/development/ocaml-modules/caqti/lwt.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-lwt"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti logs lwt ]; diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix index d2050e2cf474..26b0887f20e8 100644 --- a/pkgs/development/ocaml-modules/caqti/type-calendar.nix +++ b/pkgs/development/ocaml-modules/caqti/type-calendar.nix @@ -2,9 +2,7 @@ buildDunePackage { pname = "caqti-type-calendar"; - version = "1.2.0"; - useDune2 = true; - inherit (caqti) src; + inherit (caqti) src version; propagatedBuildInputs = [ calendar caqti ]; From 17b9d61957bcd2bfb26d86f65121b63d955afaaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sun, 9 Oct 2022 12:40:07 +0200 Subject: [PATCH 44/46] mediathekview: 13.8.0 -> 13.9.1 (#194125) --- .../video/mediathekview/default.nix | 25 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 5ad81bc0a768..618758494011 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,33 +1,38 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, zip }: +{ lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }: stdenv.mkDerivation rec { - version = "13.8.0"; + version = "13.9.1"; pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q"; + sha256 = "4BYKkYhl1YjiAZyfNRdV5KQL+dVkL058uhTG892mXUM="; }; + nativeBuildInputs = [ makeWrapper zip ]; - installPhase = '' + installPhase = + let + libraryPath = lib.strings.makeLibraryPath [ libglvnd libnotify ]; + in + '' runHook preInstall mkdir -p $out/{bin,lib} - # log4j mitigation, see https://logging.apache.org/log4j/2.x/security.html - zip -d MediathekView.jar org/apache/logging/log4j/core/lookup/JndiLookup.class - install -m644 MediathekView.jar $out/lib makeWrapper ${jre}/bin/java $out/bin/mediathek \ - --add-flags "-jar $out/lib/MediathekView.jar" + --add-flags "-jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" makeWrapper ${jre}/bin/java $out/bin/MediathekView \ - --add-flags "-jar $out/lib/MediathekView.jar" + --add-flags "-jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ - --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" + --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17e762f0d431..ac6cd9f98324 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29800,7 +29800,7 @@ with pkgs; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = adoptopenjdk-hotspot-bin-16; }; + mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-17; }; megapixels = callPackage ../applications/graphics/megapixels { }; From 74fc4924fb2d678ff4fdf49b38040e635ebee5c2 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Fri, 7 Oct 2022 09:06:01 -0500 Subject: [PATCH 45/46] xmonadctl: use xmonad-contrib's src --- pkgs/applications/window-managers/xmonad/xmonadctl.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonadctl.nix b/pkgs/applications/window-managers/xmonad/xmonadctl.nix index da1e414d8416..e0c452340456 100644 --- a/pkgs/applications/window-managers/xmonad/xmonadctl.nix +++ b/pkgs/applications/window-managers/xmonad/xmonadctl.nix @@ -1,16 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, ghcWithPackages, ... }: +{ stdenv, lib, fetchFromGitHub, ghcWithPackages, haskellPackages, ... }: let xmonadctlEnv = ghcWithPackages (self: [ self.xmonad-contrib self.X11 ]); in stdenv.mkDerivation rec { pname = "xmonadctl"; - version = "0.17.0"; - src = fetchFromGitHub { - owner = "xmonad"; - repo = "xmonad-contrib"; - rev = "v${version}"; - sha256 = "142ycg7dammq98drimv6xbih8dla9qindxds9fgkspmrrils3sar"; - }; + inherit (haskellPackages.xmonad-contrib) src version; installPhase = '' runHook preInstall From b31c42831f1b99544f81bc27f9da183d3276e9aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Oct 2022 07:03:22 +0000 Subject: [PATCH 46/46] conntrack-tools: 1.4.6 -> 1.4.7 --- pkgs/os-specific/linux/conntrack-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 0b14398e58f6..a5416648a7c0 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "conntrack-tools"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2"; - sha256 = "0psx41bclqrh4514yzq03rvs3cq3scfpd1v4kkyxnic2hk65j22r"; + sha256 = "sha256-CZ3rz1foFpDO1X9Ra0k1iKc1GPSMFNZW+COym0/CS10="; }; buildInputs = [