diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 18032c354f0c..828482c1caf1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7810,6 +7810,12 @@ githubId = 24463229; name = "Forden"; }; + ForgottenBeast = { + email = "forgottenbeast@riseup.net"; + github = "ForgottenBeast"; + githubId = 5754552; + name = "ForgottenBeast"; + }; forkk = { email = "forkk@forkk.net"; github = "Forkk"; @@ -16459,6 +16465,12 @@ github = "NiklasVousten"; githubId = 24965952; }; + nikolaizombie1 = { + name = "Fabio J. Matos Nieves"; + email = "fabio.matos999@gmail.com"; + githubId = 70602908; + github = "nikolaizombie1"; + }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 4778365d5c9a..627d2bfe0857 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -521,6 +521,20 @@ with lib.maintainers; shortName = "Home Assistant"; }; + hyprland = { + members = [ + donovanglover + fufexan + johnrtitor + khaneliman + NotAShelf + ]; + githubTeams = [ "hyprland" ]; + scope = "Maintain Hyprland compositor and ecosystem"; + shortName = "Hyprland"; + enableFeatureFreezePing = true; + }; + infisical = { members = [ akhilmhdh ]; scope = "Maintain Infisical"; diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index d00f2a188d6d..21f8266d4292 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -139,5 +139,5 @@ in ] "Nvidia patches are no longer needed") ]; - meta.maintainers = with lib.maintainers; [ fufexan ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/programs/wayland/hyprlock.nix b/nixos/modules/programs/wayland/hyprlock.nix index 1b55c75f0852..e05d8f826a4c 100644 --- a/nixos/modules/programs/wayland/hyprlock.nix +++ b/nixos/modules/programs/wayland/hyprlock.nix @@ -26,5 +26,5 @@ in security.pam.services.hyprlock = { }; }; - meta.maintainers = with lib.maintainers; [ johnrtitor ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/services/wayland/hypridle.nix b/nixos/modules/services/wayland/hypridle.nix index 83a081aa6741..4ccb126b56f2 100644 --- a/nixos/modules/services/wayland/hypridle.nix +++ b/nixos/modules/services/wayland/hypridle.nix @@ -28,5 +28,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ johnrtitor ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix index c0fdbaa23435..8f61a8ac9e97 100644 --- a/nixos/modules/services/web-apps/calibre-web.nix +++ b/nixos/modules/services/web-apps/calibre-web.nix @@ -2,6 +2,7 @@ let cfg = config.services.calibre-web; + dataDir = if lib.hasPrefix "/" cfg.dataDir then cfg.dataDir else "/var/lib/${cfg.dataDir}"; inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionalString types; in @@ -32,9 +33,10 @@ in dataDir = mkOption { type = types.str; - default = "/var/lib/calibre-web"; + default = "calibre-web"; description = '' - The directory where Calibre-Web stores its data. + Where Calibre-Web stores its data. + Either an absolute path, or the directory name below {file}`/var/lib`. ''; }; @@ -107,14 +109,16 @@ in }; config = mkIf cfg.enable { - systemd.tmpfiles.settings."10-calibre-web".${cfg.dataDir}.d = { - inherit (cfg) user group; - mode = "0700"; + systemd.tmpfiles.settings = lib.optionalAttrs (lib.hasPrefix "/" cfg.dataDir) { + "10-calibre-web".${dataDir}.d = { + inherit (cfg) user group; + mode = "0700"; + }; }; systemd.services.calibre-web = let - appDb = "${cfg.dataDir}/app.db"; - gdriveDb = "${cfg.dataDir}/gdrive.db"; + appDb = "${dataDir}/app.db"; + gdriveDb = "${dataDir}/gdrive.db"; calibreWebCmd = "${cfg.package}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; settings = concatStringsSep ", " ( @@ -151,6 +155,8 @@ in ExecStart = "${calibreWebCmd} -i ${cfg.listen.ip}"; Restart = "on-failure"; + } // lib.optionalAttrs (!(lib.hasPrefix "/" cfg.dataDir)) { + StateDirectory = cfg.dataDir; }; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix index f9a586b23b8d..9282ff5cd497 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -8,13 +8,13 @@ melpaBuild { pname = "edraw"; - version = "1.2.0-unstable-2025-01-06"; + version = "1.2.0-unstable-2025-01-16"; src = fetchFromGitHub { owner = "misohena"; repo = "el-easydraw"; - rev = "9a5b5e2b071be99350bfc8db6fbc2c9c667f3725"; - hash = "sha256-lQYSUQFAv6rqvZySsFbe8B7ZqEaa2L+L3HXB231D4OQ="; + rev = "449c1226f7108e1cf8b4b447a65fa053b6bd782f"; + hash = "sha256-u6lc2s4fqNWNCuICu832vAbMmV5X6FB8fIkJwgdBKfg="; }; propagatedUserEnvPkgs = [ gzip ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 489b362cdaba..8b775dd74e64 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -195,6 +195,18 @@ final: prev: meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; + LuaSnip-snippets-nvim = buildVimPlugin { + pname = "LuaSnip-snippets.nvim"; + version = "2022-03-17"; + src = fetchFromGitHub { + owner = "molleweide"; + repo = "LuaSnip-snippets.nvim"; + rev = "d7e40e4cce622eab2316607dbcd8d6039bcb9fe0"; + sha256 = "063fz3f9byzmb1qavhrjdcphr3nk4l4d19h7mzj5sx4wv7cn8nl8"; + }; + meta.homepage = "https://github.com/molleweide/LuaSnip-snippets.nvim/"; + }; + MatchTagAlways = buildVimPlugin { pname = "MatchTagAlways"; version = "2017-05-20"; @@ -11324,6 +11336,18 @@ final: prev: meta.homepage = "https://github.com/gabrielpoca/replacer.nvim/"; }; + repolink-nvim = buildVimPlugin { + pname = "repolink.nvim"; + version = "2023-12-08"; + src = fetchFromGitHub { + owner = "9seconds"; + repo = "repolink.nvim"; + rev = "55edfedbaef3e894d2ab5107ea7fadc64cb8258d"; + sha256 = "1pa75cmb1fyxz4b9lam4vbgkcy2g3lfj0f31s17cppzapk0aqh6a"; + }; + meta.homepage = "https://github.com/9seconds/repolink.nvim/"; + }; + resession-nvim = buildVimPlugin { pname = "resession.nvim"; version = "2025-01-25"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 61f623e7197c..a57851975775 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1616,6 +1616,10 @@ in ]; }; + LuaSnip-snippets-nvim = super.LuaSnip-snippets-nvim.overrideAttrs { + checkInputs = [ self.luasnip ]; + }; + lz-n = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lz-n; }; @@ -2764,6 +2768,10 @@ in dependencies = [ self.plenary-nvim ]; }; + repolink-nvim = super.repolink-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + # needs "http" and "json" treesitter grammars too rest-nvim = super.rest-nvim.overrideAttrs { dependencies = with self; [ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d3e516ef2402..5fd747b9a552 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -15,6 +15,7 @@ https://github.com/martinda/Jenkinsfile-vim-syntax/,, https://github.com/vigoux/LanguageTool.nvim/,, https://github.com/LazyVim/LazyVim/,, https://github.com/Yggdroot/LeaderF/,, +https://github.com/molleweide/LuaSnip-snippets.nvim/,HEAD, https://github.com/Valloric/MatchTagAlways/,, https://github.com/numToStr/Navigator.nvim/,, https://github.com/overcache/NeoSolarized/,, @@ -938,6 +939,7 @@ https://github.com/amitds1997/remote-nvim.nvim/,HEAD, https://github.com/filipdutescu/renamer.nvim/,, https://github.com/MeanderingProgrammer/render-markdown.nvim/,, https://github.com/gabrielpoca/replacer.nvim/,HEAD, +https://github.com/9seconds/repolink.nvim/,HEAD, https://github.com/stevearc/resession.nvim/,HEAD, https://github.com/rest-nvim/rest.nvim/,, https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 47398b88c80a..058b8a26db47 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -18,8 +18,6 @@ let nativeBuildInputs = [ makeWrapper ]; - phases = [ "buildPhase" "fixupPhase" ]; - buildPhase = '' makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 65927dd70f0f..9a4336362227 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "128.6.0esr"; + version = "128.6.1esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/af/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/af/thunderbird-128.6.1esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "147169c7e5d3bb763fa87c4f7627f9ddec6493fa7833656021d102df897d2b2b"; + sha256 = "be2c44af9f0476c5ed21abed583cc6970b1a074b25ebe69b0000a3c38b892e91"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ar/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ar/thunderbird-128.6.1esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "eaf250a43059ab0d255ea7b1a96f55baa9287c88b2faf5269fc574df70e5731c"; + sha256 = "4f3208c2151de9a7503888bb467b2f3fc8006a1a79abb91f98306f8498e266d6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ast/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ast/thunderbird-128.6.1esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0a66cbf7d5defd48c433784eab0b0b457c11971eac0d4d2f45a735818a23ec02"; + sha256 = "e370b6799874607d5072bb09a98c2998ef8b6c3e8a967a7fe31eca3f15a94e6d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/be/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/be/thunderbird-128.6.1esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "bb475d2f103966cf26e2837333124310cd9e943ee86ec01e524b884f438af6fa"; + sha256 = "0b0f0e4ae1843ca5c643a740a46737e39d844627212631a60b7c9b16c45c83e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/bg/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/bg/thunderbird-128.6.1esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "86f3ff01453cfe8156de06b23b4b7a08bc75bd6a7703b3851b145d0e334116c6"; + sha256 = "a4dee78c0bc74de69c1a61400ceb8fdced5b6da9deead89ce88a5cdc3234ff6a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/br/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/br/thunderbird-128.6.1esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "cd2df9f9970e80e9cf97d658b0157d900dda0f2ecd8be225f40d132143874d88"; + sha256 = "ef798d533bab9530f30f03636900f61804b4b57c61a61585761f23c942eb18ca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ca/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ca/thunderbird-128.6.1esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0684f9615fd8324cea414b2b0d95a86bf361190ac41281805957cf70c1005457"; + sha256 = "3bd0fecc87a4aaf8934a35f0a4bcc86e271a78c1547d6c6fe5a924847f395e19"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cak/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/cak/thunderbird-128.6.1esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d2c40cd642b5e5b0a81c9d2cf0f1b034b17453dfdff100765874ff684e0bbf17"; + sha256 = "7af923642bd14adb3fccdbe6effc9afb25e911c3f8db8d42af1b122689f39bde"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cs/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/cs/thunderbird-128.6.1esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "2d2324de917822676da6a13173e3fbd541abdeff2ae3cbbb9adab7c9321fe280"; + sha256 = "67c4a3efb4d00ac2840a732161f803b24b4f5ff1379b64a923b473fa8594e64b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cy/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/cy/thunderbird-128.6.1esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8a57b789bfa683781d24cc3c74fe5ca5e28aa55d790bbfe2ec9113816cbad0ac"; + sha256 = "10a52a5ea2bd1957b350f07dbbff088529591bfb4634ab3ee1a76509489f47c1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/da/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/da/thunderbird-128.6.1esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1a58db475780f1aa0c2d487f826e83d2da592dd3f2bf296a19406ca5ee4ff864"; + sha256 = "fade618a5a8a8e80828796509a901883086ec528c1b92e8f5a5acc3afcd77226"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/de/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/de/thunderbird-128.6.1esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "7c5c2ef5e276cc9214d19235a913c1345cc1fcf967c0ca1abc0c935427188df4"; + sha256 = "3e54f9ad84530145aa48b2e0b861e7db0e2ea263422c60a7fd574221001a1908"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/dsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/dsb/thunderbird-128.6.1esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b1fc585a9a57506d5852b5ced928ee26b27569bd11a6e31d1d362a2ce0e80e29"; + sha256 = "2267f1087ed7e796824aa732700c6c0892782dd8660dcba8d5540e617664d3c2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/el/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/el/thunderbird-128.6.1esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "88ff0bf13a314a9228504b7af1c151935e56fb93fd5fec447c82df587439ec87"; + sha256 = "650490e9684ab556f552aa400ac11ad68883d4a51901f207dc077c7c1ce227d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-CA/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/en-CA/thunderbird-128.6.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a27961dac518dbd07fbe65aee8dbd0a088f510b359644e67503a4c604a483cbf"; + sha256 = "bd70b88b9ad86c5a3a36f741f6a9cf08fd50d5ca82022327c038e6c9a3aef92e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-GB/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/en-GB/thunderbird-128.6.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "315c95f6ae7aa96682d8db8f091a8fdb66f1d071e96ccb23394cc7b0e041b32d"; + sha256 = "699c053e9ae061842e51fab1ca87acf81b8a2ca243a2a1833eeb968af8865d2c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-US/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/en-US/thunderbird-128.6.1esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f8e7fdd9a29a196be4e3af54760ad6987d40180644bae4afb68bbf63f931f2b8"; + sha256 = "4dfa40703f0623569ef9f11e5909c35e61fd6d73d4858d85f1e911158b6e9f39"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-AR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/es-AR/thunderbird-128.6.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "1a166113f8c3d38ff12dddd0193a45823ab623ed28bd8348025d45afd6c969a6"; + sha256 = "408148e33a08d9b092b2017c3fd97f3e7502bbb061b9e6381973f5f7e656b840"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-ES/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/es-ES/thunderbird-128.6.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "11fe857aa1ec54fb135840b3763dc5373eccd302b65028c9b8e3ff1d238a5c82"; + sha256 = "33f964d271a86f1bb02dbe793f89ba6b4a56e22f6a0fd72a9f1cbbbadc409c8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-MX/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/es-MX/thunderbird-128.6.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "10922d63aedd1e472d804a29572d084f9a49bd014072815b195ac04ee8959fa0"; + sha256 = "bf93e6bddb47944d9ccd5fe3443c2e7b9e4ff3ac0af1db05a07f45bbb57c8917"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/et/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/et/thunderbird-128.6.1esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "26f2876b278747de85c888c59abb639ce715ea2b849a3317c69192eb4690366d"; + sha256 = "8135645758ba64d0f0b4631d06142dcd621c49db5fc584cd01222a9ce543dabb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/eu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/eu/thunderbird-128.6.1esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b9446b2f5bb87bb5ad9074e4295559d9aedfc790af7f5e1ae74077f93165eda4"; + sha256 = "4fc0f5a7e7342eb3387691cb3728a64e11f6983e233060f0dff41f351e328f37"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/fi/thunderbird-128.6.1esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e85e265b8b21839dbe09af3b860bc7c30c62678758f42542a3f2e73bec9b9300"; + sha256 = "67192f44c2edd542272806f6de1166e85e0cbe8d5ea59ea0459fc5dcf29c13cf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/fr/thunderbird-128.6.1esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6c77bc7aec3e985c4ddc17e51bd659d8f4c68811e3e04dd5c27eaa37f48e4ebe"; + sha256 = "6323051cd2084f286ffeeee1e4e24cdc6c2b8853fd1aad8581eacea6e26478c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fy-NL/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/fy-NL/thunderbird-128.6.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a57e8c11a14e7418ef198c2acd566a4e3581cc9eda3ecb4fe8e1e219b27594f3"; + sha256 = "08718d1f1c809633b7854a96b56c841001408b8cc941455d4a2e500cc082c211"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ga-IE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ga-IE/thunderbird-128.6.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "aed8de9226564d4ee4bb6869cc0421c435878d31103e87af21f393ba68c36ae3"; + sha256 = "a9c5d6534572f6356c439c88a990a97175b3e77a299bb34cbffb6f13d3e7c4ef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/gd/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/gd/thunderbird-128.6.1esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0cf99116e8534cb21696c0675d7bba710f27559d3d82d5e72a64daac16c1c7f4"; + sha256 = "4258c7ad2e824e20ea2fdc86507187c687cdb0178702442469a18ff77d206a49"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/gl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/gl/thunderbird-128.6.1esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3354f923b02c9c13d45c8a08c2f5e47fad5bac133563bcaf164a57c68d5bba92"; + sha256 = "235e1396dfaa266ebbeda750b6a10186593ddcfa95465201e7f7a3b87e8f15ff"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/he/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/he/thunderbird-128.6.1esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "461f8f59ea9699a1e74a1b27cbdcff05b52b8f126e8e97a0f037952a8b536cf0"; + sha256 = "5c38f24471bed56e25eab4820c556c0eba1d2798f2a566408ff8e9d973e87012"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hr/thunderbird-128.6.1esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7fb6430e834532e43bd87b246058adeef11dd77adc850b8672fd04f3d6d6060a"; + sha256 = "c177125fb51b2b80cdaa6978ff2475ce9e052b8a2b1bf9b1ce536fe7ecc89309"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hsb/thunderbird-128.6.1esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e727fa3ff2617962157473b20e31bfdb99c59c35ec3e6cb10046211bfd47723d"; + sha256 = "8333ab8efc2f46a1a0a0db86c3d58dc6cd4e0144f2e69f3183ccddc0a7e882fd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hu/thunderbird-128.6.1esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "c8d6f822508d7a68c65927b14105ddea413835a518d348bca4f41ef61bf11a94"; + sha256 = "f91995e57af2ca41e3166d3abe88915d3578a56f8fa646ad17a97d88d4362f03"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hy-AM/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hy-AM/thunderbird-128.6.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "da532b67da698cdc025a5320b4e11f630eb8982ed389c1c60fc3c942bdfb4034"; + sha256 = "12cdc3de116fc6b27ab2e9d55ea722363364477156b6da020c1df1346c3f2ae8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/id/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/id/thunderbird-128.6.1esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "05ae0434947fbacd738b24941633db92a21ef8936703706cdaeb311f98cacab2"; + sha256 = "eb449aed2254840cd3b24056758130c14ed34dcd5dd7738d807a592bd71cdbb9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/is/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/is/thunderbird-128.6.1esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "4f506da3c5677cb9fe600e31a9e37b398f00200a403365f8e68f89c8a0eb6bf0"; + sha256 = "67cebbbd999d7a42ec03a98dfcbaec637c291b5eb9eedd4bd4f65097526b0ecd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/it/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/it/thunderbird-128.6.1esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9142f001b55718443937fa7bc2ac92584371e9b4a1d0d87ff84c272fc87fa74e"; + sha256 = "e4ba4ff84f5a3ed8cfa86b5155bf3f1d487524566b03eacdd4052c4b5f431d96"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ja/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ja/thunderbird-128.6.1esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "965e2b5125ffbabce121c4efbd86cc796372ec969d8634d106a44fef2696c930"; + sha256 = "7b8d6c8a302d1877569246d4b5e23e4e6e7192a924030e89bd35cd04229d3b98"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ka/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ka/thunderbird-128.6.1esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "24b87f5590e83999c8a1b3970b5d0fa3bf98de9820573b0e1af49ced9ca7d29b"; + sha256 = "bf3e8af506a98db415491d56856261113b471ff9749a4b094a08d7b1850e86d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/kab/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/kab/thunderbird-128.6.1esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2efdaf21264181251f39f165270e3e22103823750b9d4d35fb94784f95137d18"; + sha256 = "0efd72d632cc95e2546dd9c811b1e761c2d47e17bef49613aa38832af96acd8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/kk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/kk/thunderbird-128.6.1esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "63820d662893a836a28159057e4ceb2042823d042e2c1f0ed833480817e3cedc"; + sha256 = "b3de6a7fa35e3ea01336dfe86c448d4b0f9a672d7452e77569541fce65810d02"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ko/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ko/thunderbird-128.6.1esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a1006fb62ca22730213805e9a8bde134bd88405b0068204eba0400880bb10cdd"; + sha256 = "9410d40fd086f25fea1f5faeedd2f640ef0d436f49b5b8bbd4f41b4f4bed1525"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/lt/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/lt/thunderbird-128.6.1esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "60d9333c6633c828f4e491dc8a033a8940894875b9154433511573c31d4834a4"; + sha256 = "2af7d411d75ee76a8b3e4b1e63b07ab0634811ef8c18dfe5dd4cf3cb9676ea68"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/lv/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/lv/thunderbird-128.6.1esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "edf454a5d2ed00f486aebbf505aa5ce8cf9b6d14f06f4645535cc08a1db2a445"; + sha256 = "9d67e04d6039f69b0b256d103b494d7ad46471e4f337821bfc56811bb28f39a7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ms/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ms/thunderbird-128.6.1esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2e6374ae36a01a0362a3ac8e9a616e8b80d9c31fbe8f89e58930e00bbb8ede93"; + sha256 = "a7f269a701dabd3260a526f6a8588a6cb033c1d1e097497cf056642414974221"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nb-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/nb-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "85e121b6878115a304720f9ff8ad85ce757ce1cb520284973be199f51357b707"; + sha256 = "940b364182ce1f208c99c58b0d5cad38fe0f5f09ab3995d4ea757136995295d5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/nl/thunderbird-128.6.1esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "306f6af60bee6174e0d7aab66b7cf21cfe383f9dce403c91fc867ce9a2c26944"; + sha256 = "9e18c1556863868f49a7c79a20da5e35d84f385dd4e0b11c6eaa0d8dc934944d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nn-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/nn-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3aa2b9391365419cdf7a753206c962a932e7f5325505a3320ae57f3b781634d9"; + sha256 = "87f3c24434e81592cf9ba6d2715219ba632ba0014d2587d027e18441e9c306e1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pa-IN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pa-IN/thunderbird-128.6.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "797ae91d608e7be252439b1fcd4536df1b030fb1f7267408c17b75cefda4c20b"; + sha256 = "b8cdd1c2db2eede3e2aad1da30bf767d15bf302441c3cc4979a5280b36bcf539"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pl/thunderbird-128.6.1esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4ac87004c02e69159ae6875658cb7ed95ddd965fa3871ba7a89a82b6abd4f9f6"; + sha256 = "6be2cd7239411ee03bf4f5fdb98ebb4235428e4aa3fb0c85fc9c9362571deecb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pt-BR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pt-BR/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "40a3721ec6cd57f58e27ddb239e5026648bf9d75eafc417e4d61b5128c8e6a45"; + sha256 = "baee1f8a9428f50c0115766e999a9f3c18c0e9bf6961a32b27716935f0d813d7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pt-PT/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pt-PT/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "860fb6f9ed881a18921a498f30d5559316e1d7934d974636951339221a2b4b57"; + sha256 = "bddb747ee6e45014baf9a8d2261aadd4150c98d63dcd5ddafc08200972451038"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/rm/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/rm/thunderbird-128.6.1esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b9c47fe2fdc79f0ab5cd6233aec9b8be4bda9537ea3fdba1290d28e6d2e38dcc"; + sha256 = "bc2835f7eeaebef7ec60c06cfd4641aed51facc81ae69e83d7e4d56ec9ea10a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ro/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ro/thunderbird-128.6.1esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "aecc5113a2e86c6202cab6ce6278a2b7ff8b7228efba5e3de5dc3811d845c043"; + sha256 = "8e9e4b0091ae91fb544d00e7e6748532a4f874e5d416cf317478858e06aed782"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ru/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ru/thunderbird-128.6.1esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ab3903775cafe7907b28bf56d5f30e2d3d79055d84bd52469b26bf72ec8240c9"; + sha256 = "4420432e93242e90d048f7eeffc6d4b2a0208cc3a8b6b3547bf402c58f684094"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sk/thunderbird-128.6.1esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8ef99d4dc206ae86ccf4460206ff56e314e1e35d282f05f86944e462db119b8c"; + sha256 = "2a3e5f5fc207a39954b53da37faae8b77c04beeeb77f01a712d34c3a97dcb8d1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sl/thunderbird-128.6.1esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c57ab55bd835e2d5bf8903a6a8db69ea456f93f1406167bffa9a9047b3747db3"; + sha256 = "67222234ed147536af027c7a9292a6e13f4fa0d6ba7a2af86d3e631754a8b9ce"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sq/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sq/thunderbird-128.6.1esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8b8f216d54cf9e432e19ae07b2ac316684a8e1ba91e2dee7f8157f626c46b114"; + sha256 = "e6c0b7a5e1a7c91d74c192b6d07ca21aebf2a423f11d9384c268175e9a52c516"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sr/thunderbird-128.6.1esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "9212dbe44a7e39097b1d1a7860a06f4a7bdd45abe734b3c5bb7c04de0d766fec"; + sha256 = "fb4682aeb65695dfe82e7420f69e31000871cc89f28f85a968b8a9851d3c4374"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sv-SE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sv-SE/thunderbird-128.6.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "1f1b6b76775b1643a6748b414c014c24c1fc84a09da4aad3ee7a3672ca5f0012"; + sha256 = "6a191f049d25899d5550e8b32fe36c9c9b87f1764271a38daeecc99d2d42258d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/th/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/th/thunderbird-128.6.1esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "82f1ddd9b88b777162c947f09ef6add3e3050ab87ec5bb33d245b6fa14a603dd"; + sha256 = "4a7b662274fcb08462d28e9bacb0b388c24ba97ec2d2de4cd2a6ebeee51f19a5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/tr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/tr/thunderbird-128.6.1esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "380bcfa6ec40a2fba1eb444e473baa521cbf4ee654ad63898e5f3829be746dc8"; + sha256 = "e1c5e3f7b40d1e627b6f442bd2f015d28e1c07c70eadf686502ccc2d6c8f61de"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/uk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/uk/thunderbird-128.6.1esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2a7052d5c51e53c0ab3b0703f7b33a3e870a123b8604416ef8c92dfcbad736e9"; + sha256 = "57fd513305a33a959a09c80a1fbd3e06fd0cdd40f86cb41f814e9a31a9b24267"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/uz/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/uz/thunderbird-128.6.1esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "72148f0f1160f9fb93ea65e1dd6053a768e02b45f6ecfb3de68de4db4f635291"; + sha256 = "ca72d66aa59098fc0e2325718a0dec4911af4bab55245268876e6224ffc47169"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/vi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/vi/thunderbird-128.6.1esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "475abbbb400aea36414d787e98ce9095632e11436759da552ccdb4272adaacea"; + sha256 = "57b4b669b8a8e1704a50040c8ee5dd84e5145a09ad40644709fbdceb46af1975"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/zh-CN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/zh-CN/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b2d5ac008c57e7e48168b9712d6e90891bd5c517a891e4d0d4fcb6d5ae2cfb3c"; + sha256 = "6e8323e5cc67720a7cf1afba7776116e70ad9ada3b4e01023eae1c5f4134c555"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/zh-TW/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/zh-TW/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "01122295d0e40f896312eee085b9db6e696a9eede5f94a69651d39253f7cec2c"; + sha256 = "746eb3f9a1296143c97817056cfdb4465fbd2071fa6dc9283d577c6a84c04c56"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/af/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/af/thunderbird-128.6.1esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "62d59997921ad6f8867fd28d249c86c4879c2634e5766b498feaa68d0da38336"; + sha256 = "f5f9713502309cf753ee9cb584226e1ec4b8983975eca29df846feb8617f3aee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ar/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ar/thunderbird-128.6.1esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "dbc05ffb01763cfbec843331d47772d8b53f0e700db0fa4d3ce0afc4a48814e3"; + sha256 = "51ae27836ec8ad79a453a79dda6ebeac92f0a9a9928784a632cbde12952bec7c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ast/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ast/thunderbird-128.6.1esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bdcc2cb138d79367087ac72d7fec609128cb983416bee6e3f57f18ba3f78741b"; + sha256 = "710c0bf59054b3619c58707aee80469e950cfc7f571208aab0db44b115eb8dfa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/be/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/be/thunderbird-128.6.1esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ee1132188cca65f69cbef56287f930f685cc1c7f7e445b3eb819bd935ec7cb2e"; + sha256 = "f330fb05511f92648adfbcb21f7d40a5769d5bfb45a5aec74f0ea691e5871af7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/bg/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/bg/thunderbird-128.6.1esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "ebbc2843eedaf5ef42e8d9b53e2e7c020e3eefaccbfa9d95554d259ea2332781"; + sha256 = "711940850a15971ae10bbd47650b4a0a2025fc6518c30b07b571892e85b9a75e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/br/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/br/thunderbird-128.6.1esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "5c0679c6970f2e7d80fd4e1b78643e912d42641a287074ec8deb6f49016844fd"; + sha256 = "5294c69244262827b74d48e3d9080bbe55eeeb5c4dc58c2148923bc27176847f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ca/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ca/thunderbird-128.6.1esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d1d727eee4d58c7798414510918248b37d33ba5953243b6e23e7a03fe7c5dab3"; + sha256 = "7ff75c06c3e79aa66406ae9208f3ca3c496703e4828e1fdf77eaaecfc08f3e06"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cak/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/cak/thunderbird-128.6.1esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e9e6fa54db1a01d8a9fdaf3339dbbf84fb101220e57fe060df44e045a6051189"; + sha256 = "a3197fa772df576d549c26b8480c4ff4c550c7d922139d00582a8a5be4393ff2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cs/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/cs/thunderbird-128.6.1esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f1e2399413bf3a744128cb9e2279b9f207f9361c5da3bdb4f7f625f73d2217a6"; + sha256 = "03a130d9449fa1f708be06e7a2724f087238727e321b41ffec07dcb6400026be"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cy/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/cy/thunderbird-128.6.1esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "33a3372f67b1254dbb30989879a71b0078a2340901875abb9759780d81855712"; + sha256 = "490a874e8f1ada465cb600434464c25e25d44cb6452219b227510c59e91051b7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/da/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/da/thunderbird-128.6.1esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2a08ff6af580d47bf2e5759dba6d706bdd3fc74e7d7b6e56b4333c4b7aae9ace"; + sha256 = "f3a8e93f01bb5f0d13a2711aa55610672526989ba54596a6a72cf1f22198e470"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/de/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/de/thunderbird-128.6.1esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "66eaf15fd54ecd204510e3ee8e6042515932138464d12e31f287008c1abc8218"; + sha256 = "69849cb1ef0eb78c967e7529a85e5cda2f31ac25f6b48c88ee055230857c339e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/dsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/dsb/thunderbird-128.6.1esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "2febaf2c4fb0e75b78bffd4c81b2818c63fe993451b0a7cc20a7e6353dd8fb07"; + sha256 = "357fbce54d89547a97055c08725c08619675830ac0dfe7967547e498ccc79381"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/el/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/el/thunderbird-128.6.1esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "165b23be9f875111a17807edcf6813fc8687773827b85e9c73475590ccab5412"; + sha256 = "638408fcff3c6e116e94bac9a10c9719cf81500d23f575f088b097c97b40de66"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-CA/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/en-CA/thunderbird-128.6.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "001af04eedd973468bfac7a2357bf145fc507bbf710d2ec236fb841d1b31309b"; + sha256 = "fb1d42d13985c308bd501d36f2b0977bf1d820d8f6e56ab3e4887b0f21bb2d57"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-GB/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/en-GB/thunderbird-128.6.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f45125ce2e23318ae0d9943e15c6212a4238777fede7af7686f826ee3d9dbe28"; + sha256 = "89507abd00647841e576a318f4c18e2c728d818107e0e35a5c4f32f34e0b5879"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-US/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/en-US/thunderbird-128.6.1esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d9c2e45e91c927832fa2b6affaccfed77a48f83cba647a895b49eaeeaa4461ec"; + sha256 = "eb8555ff145dfbcee89271de61d22f73ec90f2bc2e06ef54ec60aa2c3b4318df"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-AR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/es-AR/thunderbird-128.6.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "39fccbc25a74ab3ced790c034bfa170d1b9f4eb312ad8a9c3f7e1ad77d427c51"; + sha256 = "2e5740eccfd005ba2ba20763246cd51923b2caf4a41ea6976ffe2670294d0ded"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-ES/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/es-ES/thunderbird-128.6.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "03741e6cdbb65a7f5915bf57b109cf6adf5213abc20da905fc861c88f9c9c406"; + sha256 = "835b83dddec9dd1ea6283f3294ae9b5e9b827c72e65bc4b50204b338fa7da2d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-MX/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/es-MX/thunderbird-128.6.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "15c7d464ff7769701d314f13330271ed2937ab0b0034a81161b2e36d283831be"; + sha256 = "47e23a7507b3c4af1da944c4865692808d961ab7073daec08887a1cd5505a77b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/et/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/et/thunderbird-128.6.1esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2f388016a416978bd4459f10c627d380fffbeff95dcc4f652ad459ea77a114af"; + sha256 = "60be867338dc57434be4521bc1ef9d26ac16da51bcc0681c3424ee65d0f04335"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/eu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/eu/thunderbird-128.6.1esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "913e9a6f0c642488a6f265aeb82f47cad6d9da4c8a3c20a538be4dacfdd2f424"; + sha256 = "9e407cda465e65b8fa40f966eec6793f1d618a2cb4cdaf89026736f210582146"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/fi/thunderbird-128.6.1esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "181c0036ea5c3cd1d2a51c1f554be95c780d825c2b698196f21ce4451242069a"; + sha256 = "559ead385a9d4545c31a3ae0219604658275700e56fd62f289bf89743d784bcf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/fr/thunderbird-128.6.1esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "4855ccbf98d16a50f5b879ca7488b850a2d4378610c1a45e292e1635b3e5836c"; + sha256 = "c64d0fbc18b86da7fdf599bb574cfea257a2ad2a4072d6d54f0f201284d32ba7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fy-NL/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/fy-NL/thunderbird-128.6.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f1e518d037905d175b67ea69524f9347b1cf84bddfaac15c9755de319cc8cee6"; + sha256 = "48199cb503d9e4744368b199d4d06545265ddb0cbc9f3d443a0570d4f2a50658"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ga-IE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ga-IE/thunderbird-128.6.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a1b6fdd4a59fece7a9216c8684502634bdae34a23ad6b1d4a9b1877aa8c74b2f"; + sha256 = "4157290dd27ff6e738e8c7aa7522f0f1b8f3df09329c286c232cd21ffefca532"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/gd/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/gd/thunderbird-128.6.1esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "770e304815467dcd557a9377f7755ab6eeef1b754db35865102e148d181c24bd"; + sha256 = "053504f03781525eca26a11f0469c814480cd5c714eba97be41b321f8075e273"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/gl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/gl/thunderbird-128.6.1esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "715aa396a68625b69ab3d19133023c2b8623074bcbf60198d278e48d655562f7"; + sha256 = "0e5d718033eadbb6f1d701df5995591fdcbed0b7cc3d5cc68ba42d8a481fe9bb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/he/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/he/thunderbird-128.6.1esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "71851abff423cd15633b014ed49fc340a668f37912813180087bec647ef52695"; + sha256 = "631ea9ad6ba16b83e1edc0fd55c476f4a16259025a3863e9212e61e0d89bc7ea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hr/thunderbird-128.6.1esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ec3b050dd285b5ef797de74003f5661bb4157bc4db5dabd195f1973cf0c6f5bf"; + sha256 = "bad8f983ea5ae4f80ae38ada0c7c8d3fa336744b1e966c48af10217bf5ea2237"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hsb/thunderbird-128.6.1esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "84d25c5f124a159ce9d6f0e2909c2813857c7efe38dd2f0df5b383f8f7e3d494"; + sha256 = "4d50574ac492b5bee3a7ab7f3e859ad076771cd9e47c4020018e1c10b9083518"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hu/thunderbird-128.6.1esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ae2566441c6bdd4705dc24d3b917c8e03d7219650b38fbf94d94ff82a446fe62"; + sha256 = "e782b4eb870ffa199be3a1c571c67eade17cee24f3b4b8ee6f160067082a8c8c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hy-AM/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hy-AM/thunderbird-128.6.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "684d92cba150239ba8f7c85cc00b8002a4f86c310c3a96cadc8afa4a8212337a"; + sha256 = "16c02f0811ded8a5fd0d17a3b4ce944fe2adc6ed53c8927a2bc0dd13ae6b5a17"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/id/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/id/thunderbird-128.6.1esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f0be4128db7336c6d42880515d7006d6818e2650dc024e65aad6cd0e2be0e961"; + sha256 = "4226e163541af84d2df18d755673d6a5b2fafe9f650f6acdc9dc92d258b5ac1c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/is/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/is/thunderbird-128.6.1esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a141c3fb553a32f9874ed6f2a4004e84979d1b970c17fa7a74a6d23fce0263c9"; + sha256 = "3ee5840dcfbcfaa488ddf34267ee15346d6f4af3531a1581918ce0bef894e627"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/it/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/it/thunderbird-128.6.1esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "bbc2a5d84e0ed6bebd8585df3a852fbf92e5bb0f548ae37b970a6b2447c98ed1"; + sha256 = "8895b995cc0f80ce299b90b59609943eabbfbea79b9732c0020356223c47f792"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ja/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ja/thunderbird-128.6.1esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d04fc2f0a0ce0be61012ae72dba8c48fe90bd6467ca20d8440787260f92dffcc"; + sha256 = "684e8e68b1369c3fba79192d6e5ec1a81da536d2c3bd41a3ae9ded8217cd1501"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ka/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ka/thunderbird-128.6.1esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "ed178358c17b02499d4b7691098c07c85cfbe4a43cb9bb8b5fd86ce7779298ae"; + sha256 = "aabc4ce18a4f12fb9bcbe5b185df7193850d98e75ebd3d71e277111edc1a76a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/kab/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/kab/thunderbird-128.6.1esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "3299c8a36adc7af99a3c73863645eb622e2b46de84f404233443d00b416e204c"; + sha256 = "11c2f379d051411a9339b0de268619d78d214cbd64ee75ed142c4b3b57114efd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/kk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/kk/thunderbird-128.6.1esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1de2bac82f5be71751eef5bfeb59116927ea04b2b8c2b568fe1725745d160e85"; + sha256 = "636709b2a21c97264bf10464b72606bdaf95014dfa5dacb509989cdf8edec2b7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ko/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ko/thunderbird-128.6.1esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "0326665b85426f1b14216e063118796e010969689d2341469bbf36d799f2f4a5"; + sha256 = "0f751cbdf911524e4436a3c7a1504de2c500e79d346acc539f3ecef4ec1acf2f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/lt/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/lt/thunderbird-128.6.1esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "458467e5d24267011aa9b2c61cccb77b174bd17b791ab8ab260a7e07b0059ce2"; + sha256 = "2bdc68ba0514ad110427b85008c6e586c60cd3e5309d5b8fd0f55348c9df8375"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/lv/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/lv/thunderbird-128.6.1esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "935564c24ad59a8cba9388c0629c5074738d9671dfc95c3058adf5f0ffae465e"; + sha256 = "72bfa32ed3b847f3e4842a9a923dd64967da1430cf38182c1bf9772cb99a7ad9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ms/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ms/thunderbird-128.6.1esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "d98f64f31ed2c2f2c5d6b044bfa64f342f326e9710da9e8884ece1010cd7482c"; + sha256 = "054c3a226465ed5d5d05d9465089a0b8369f89ff4b2e5db2f5e7d880eeede5da"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nb-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/nb-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "14302cbe97ac0fcdfc3fa480f2b4437764be824dd0ab500c2c6c73701f4dedca"; + sha256 = "9137be450d76d838521f274a645995d61fb9723cd0f7b26ee6641306b645e031"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/nl/thunderbird-128.6.1esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8b5bb83eeab32207258366e9bd286c2b1b2cd729ef45abf41277f473baa7305f"; + sha256 = "71c19034ac6a06bffb84f64922360871e6fb1670d9c3fbc9a19798c8abee66c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nn-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/nn-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9417b5870546bd223de53ec36c17a4d0e2210fcbb4b853abb2f034b74a589051"; + sha256 = "d07aaf91cfc6f3b4da65cad518e62a5168eae9a8ee7bd940424a6682d7ad126b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pa-IN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pa-IN/thunderbird-128.6.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "0405871e0fbbda68cbdeb933c70c26d7c0cab0c4501b8762c7be3bd148e08ab8"; + sha256 = "3951b9ff05096165b17a9e5c49ac544cf77b1eb1b732e2a41ee9d94c47ebf6f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pl/thunderbird-128.6.1esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1da36203c8420749724bd8b32e1c215257a225aa98f0e0643d0425b32aec5980"; + sha256 = "ae27f78332e8ad0855b0214f14cae0d7fa09d59f71b38a0f80dce359606073a6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pt-BR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pt-BR/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "cac9cd2269f7d69c25ca618864bfd115bcb2ec27331038b7c6e5831f941499ee"; + sha256 = "5383952811ca6f9bc52f3ddcfcc0b881fed818b6dca6b99d9cf90d178082ad9f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pt-PT/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pt-PT/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d66daca210cb2459850b554d492d4c0ba7d9fc7a34980ee72cfe983436861194"; + sha256 = "85c8c8ef1cf8dbd3c9c9874686590300e9cfc10c684b1bb4f64eb39cc8c5e4d2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/rm/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/rm/thunderbird-128.6.1esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "dfdc1b27313897e4ae7437423d70a93b47c3277ff5199a7f134e90c787a6f5f4"; + sha256 = "2bd11169c571047b44025f0094a3bba2642f7d24480003a652fa30988997ac6f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ro/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ro/thunderbird-128.6.1esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "477a37e982f00f32f7afd9e1263035f878034bc6ee79200cc3d156efc20dc124"; + sha256 = "88a1940d95c02f46aeb092af2758cb85840425b3924b662b2d1beacf18670628"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ru/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ru/thunderbird-128.6.1esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "d94e863b730f86b3c1ffd2004c74d339f72af66b67d098beb51a056e7bc4e58d"; + sha256 = "5efad22aa2d09b275367dac33deac99f4fe99e126f90883829ef71e2c577e161"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sk/thunderbird-128.6.1esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7fb502e717b62433c10338a140ce724d2bcd6f947c3df140d88ccc7ba17f3f02"; + sha256 = "b4a4e1b3df1882a99394ce659018efaa01b940d08bb6f1d6bef0455c8c27c39e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sl/thunderbird-128.6.1esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8eea3f3ecd02765a286ddb763a1dd305a630d82720569069a239750ba83664d5"; + sha256 = "18dc29b47a46a74aa8e8a003593d0e92dc707a289a3f846355f6aca522b2d7ef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sq/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sq/thunderbird-128.6.1esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8aa055e87b14cca81d25499d196cceed9503e8922e03ee0ea92097dd9ed54d42"; + sha256 = "4f44f82bc32802c2bfb95fc9188ff1656b0b50b215e6475615395f19b4ba5e9c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sr/thunderbird-128.6.1esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "879683d2bd155f0d764979c148c8024213337ff110e9b43bb45d6012f229a300"; + sha256 = "389b47ff4fe0ec44f6f04fed574a0be4fafcfe95713f5575972ee7be4fa2bc63"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sv-SE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sv-SE/thunderbird-128.6.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "add729440a5acacbdb9303b975196ccd081fbaf609a5ca520c5c49da8a57fbfe"; + sha256 = "ce9ade81d2d2a66ccd50f043998364e4696eb5a5c3c272ec093d0266abf03417"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/th/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/th/thunderbird-128.6.1esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b7dfb1c4471c6afe6ff84c15f868254d6871a32e9d989a085cfea3431e592b49"; + sha256 = "c51ac457124127d23339c9901446e3930c7b3f77870c71bb4be0baaf0ccf8fcf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/tr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/tr/thunderbird-128.6.1esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "55291db94cdbd0ba57ec3235a02dc06e3003240f0f9f95dba028a0fa6193e3d5"; + sha256 = "d657d7447a7a24ec5a033b72edf0410d1ccd07d0a40d9e296e6ecadaf57d654d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/uk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/uk/thunderbird-128.6.1esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "07ca8084dd890216f576f612f5540333f222496c061172e2bca55a97949ff199"; + sha256 = "0643a480d328aaf211fc65b0bb323dc4cc7943940c26784642fc8ddbf2f963a9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/uz/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/uz/thunderbird-128.6.1esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d0374a986585bd43e7e2ff88ce8c6fee727523ec98983fbcb665acf32327e2d0"; + sha256 = "a7dbb5595a507f4207e2181e138ba99ca08b87aa031ed4acdacf594f0ff523b9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/vi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/vi/thunderbird-128.6.1esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "147b9d64d517142fc20c91de1b5613a2c56976fa6c70382abee69dc98ad2a703"; + sha256 = "ebb655c6734c9b68bffe76a00f35156da93bd97c5879e4acf34df7b31ba92f0b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/zh-CN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/zh-CN/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "15cc8573c79e62f611499a0dcd09155e7d5b66c25bf8361132f8ce4a3530897c"; + sha256 = "004ff5ed854609c6554fdf235c81854038ab56f4e231fff00477d1de85a6d30b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/zh-TW/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/zh-TW/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9c5fae7d1ff16246beb284f26461a1cdec93c31bf8b9c0ca12adef2bf9fa7794"; + sha256 = "7894a24b448663f24e4466399fe006c4c0806f56a29a56ecfae5c2ad2f883106"; } ]; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 0c582199a6af..5867656b2cbc 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -45,8 +45,8 @@ let } else { - version = "2024.4"; - hash = "sha256-rGGOzi5Yr6hrU2xaLE/Lk38HYDGPEtGPEDRra969hqg="; + version = "2024.5"; + hash = "sha256-/s8GsYbN25Qs+0LujaXz6yuZk+aswKLxjRSsCwFEJPM="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 57b0464ac06e..d2e2ec888d1f 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-wGxxLfl+d8uTPLHPL2EKpaL36x0or7PHwdVaZTlKITE="; + hash = "sha256-B421xXt7TrBJVwi04vygnw9t5o7/KLVpuItQtwV4E24="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8Zybs+SlwVuF+obJD+yt36HdtDGIJWLSGUnypqOlFWU="; + cargoHash = "sha256-GGEKQgnSB2HW3VIj4CfxzUZaWYE2/nHJPN9ZMmHY5Ns="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index db8fdf62b3d1..fd00d81af44b 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -33,10 +33,7 @@ let homepage = "https://github.com/hyprwm/hyprland-plugins"; description = "Hyprland ${description} plugin"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; inherit (hyprland.meta) platforms; }; } diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 9da0df03294b..75d3e1d6ef9c 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -91,10 +91,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/releases/tag/v${finalAttrs.version}"; mainProgram = "hyprland-share-picker"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - khaneliman - ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index e2ba073fa636..74fc2982563f 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -7,17 +7,18 @@ stdenv, installShellFiles, versionCheckHook, + callPackage, }: buildGoModule rec { pname = "alist"; - version = "3.41.0"; - webVersion = "3.41.0"; + version = "3.42.0"; + webVersion = "3.42.0"; src = fetchFromGitHub { owner = "AlistGo"; repo = "alist"; tag = "v${version}"; - hash = "sha256-DzqSkcyDRyiHM0yh7A+dZj7TnjhDVQoHHgV5piVcu1g="; + hash = "sha256-qUW9bA2TeAVve77i43+ITxClLaO3aqm5959itf+iFqs="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -31,11 +32,11 @@ buildGoModule rec { }; web = fetchzip { url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz"; - hash = "sha256-1IXvst9VfxuIjUrgmJxTYm8jJQStMK+RlQibQ3fTDGs="; + hash = "sha256-g2+qdLrxuyuqxlyVk32BKJCbMfXNs29KLEPxAkTQHjU="; }; proxyVendor = true; - vendorHash = "sha256-p6JqYmcQR6W7RE7F6NGxoiTxSOESuYjpke0rLRlxeSM="; + vendorHash = "sha256-uid+uT4eOtDsCNsKqGqPc4vMDnKUatG4V2n0Z7r6ccY="; buildInputs = [ fuse ]; @@ -67,6 +68,7 @@ buildGoModule rec { "TestHTTPAll" "TestWebsocketAll" "TestWebsocketCaller" + "TestDownloadOrder" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; @@ -88,6 +90,10 @@ buildGoModule rec { versionCheckHook ]; + passthru = { + updateScript = lib.getExe (callPackage ./update.nix { }); + }; + meta = { description = "File list/WebDAV program that supports multiple storages"; homepage = "https://github.com/alist-org/alist"; diff --git a/pkgs/by-name/al/alist/update.nix b/pkgs/by-name/al/alist/update.nix new file mode 100644 index 000000000000..e32f0c3e6c8d --- /dev/null +++ b/pkgs/by-name/al/alist/update.nix @@ -0,0 +1,43 @@ +{ + writeShellApplication, + nix, + nix-update, + curl, + jq, + common-updater-scripts, +}: + +writeShellApplication { + name = "update-alist"; + runtimeInputs = [ + curl + jq + nix + common-updater-scripts + nix-update + ]; + + text = '' + # get old info + oldVersion=$(nix-instantiate --eval --strict -A "alist.version" | jq -e -r) + + get_latest_release() { + local repo=$1 + curl --fail ''${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ + -s "https://api.github.com/repos/AlistGo/$repo/releases/latest" | jq -r ".tag_name" + } + + version=$(get_latest_release "alist") + version="''${version#v}" + webVersion=$(get_latest_release "alist-web") + + if [[ "$oldVersion" == "$version" ]]; then + echo "Already up to date!" + exit 0 + fi + + update-source-version alist "$webVersion" --source-key=web --version-key=webVersion + + nix-update alist --version="$version" + ''; +} diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index 188a82f69321..7e1dfceea806 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -71,10 +71,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A very light linux rendering backend library"; homepage = "https://github.com/hyprwm/aquamarine"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; }) diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 7e742bdb7b83..5d4965ac9a18 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -6,28 +6,14 @@ pkg-config, alsa-lib, versionCheckHook, + bacon, nix-update-script, + + withSound ? false, }: -rustPlatform.buildRustPackage rec { - pname = "bacon"; - version = "3.9.0"; - - src = fetchFromGitHub { - owner = "Canop"; - repo = "bacon"; - tag = "v${version}"; - hash = "sha256-LnJlE4ostOl+pr+d7ZsAfKvG4C45qt4pedWpeiTchPU="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-o+hTK/7hw2/gLwGm5TozfZZyi674h2p55E7yfprB9wU="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = +let + soundDependencies = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] @@ -35,12 +21,40 @@ rustPlatform.buildRustPackage rec { # bindgenHook is only included on darwin as it is needed to build `coreaudio-sys`, a darwin-specific crate rustPlatform.bindgenHook ]; +in + +rustPlatform.buildRustPackage rec { + pname = "bacon"; + version = "3.9.1"; + + src = fetchFromGitHub { + owner = "Canop"; + repo = "bacon"; + tag = "v${version}"; + hash = "sha256-TniEPcY3mK5LO9CBXi5kgnUQkOeDwF9n1K0kSn4ucKk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-6vR8Bxv/A6do4+oGAI0kx1yUyht7YOi1pP/mnIiBPmc="; + + buildFeatures = lib.optionals withSound [ + "sound" + ]; + + nativeBuildInputs = lib.optionals withSound [ + pkg-config + ]; + + buildInputs = lib.optionals withSound soundDependencies; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; passthru = { + tests = { + withSound = bacon.override { withSound = true; }; + }; updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/bl/blueberry/package.nix b/pkgs/by-name/bl/blueberry/package.nix index f32e619f56f5..1bcd602ccac5 100644 --- a/pkgs/by-name/bl/blueberry/package.nix +++ b/pkgs/by-name/bl/blueberry/package.nix @@ -13,9 +13,10 @@ xapp, }: -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { pname = "blueberry"; version = "1.4.8"; + format = "other"; src = fetchFromGitHub { owner = "linuxmint"; @@ -26,7 +27,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - python3Packages.wrapPython wrapGAppsHook3 ]; @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { bluez-tools gnome-bluetooth_1_0 libnotify - python3Packages.python util-linux xapp ]; @@ -53,28 +52,28 @@ stdenv.mkDerivation rec { # Fix paths substituteInPlace $out/bin/blueberry \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/bin/blueberry-tray \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/etc/xdg/autostart/blueberry-obex-agent.desktop \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/etc/xdg/autostart/blueberry-tray.desktop \ - --replace Exec=blueberry-tray Exec=$out/bin/blueberry-tray + --replace-fail Exec=blueberry-tray Exec=$out/bin/blueberry-tray substituteInPlace $out/lib/blueberry/blueberry-obex-agent.py \ - --replace /usr/share $out/share + --replace-fail /usr/share $out/share substituteInPlace $out/lib/blueberry/blueberry-tray.py \ - --replace /usr/share $out/share + --replace-fail /usr/share $out/share substituteInPlace $out/lib/blueberry/blueberry.py \ - --replace '"bt-adapter"' '"${bluez-tools}/bin/bt-adapter"' \ - --replace /usr/bin/pavucontrol ${pavucontrol}/bin/pavucontrol \ - --replace /usr/lib/blueberry $out/lib/blueberry \ - --replace /usr/share $out/share + --replace-fail '"bt-adapter"' '"${bluez-tools}/bin/bt-adapter"' \ + --replace-fail /usr/bin/pavucontrol ${pavucontrol}/bin/pavucontrol \ + --replace-fail /usr/lib/blueberry $out/lib/blueberry \ + --replace-fail /usr/share $out/share substituteInPlace $out/lib/blueberry/rfkillMagic.py \ - --replace /usr/bin/rfkill ${util-linux}/bin/rfkill \ - --replace /usr/sbin/rfkill ${util-linux}/bin/rfkill \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/bin/rfkill ${util-linux}/bin/rfkill \ + --replace-fail /usr/sbin/rfkill ${util-linux}/bin/rfkill \ + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/share/applications/blueberry.desktop \ - --replace Exec=blueberry Exec=$out/bin/blueberry + --replace-fail Exec=blueberry Exec=$out/bin/blueberry glib-compile-schemas --strict $out/share/glib-2.0/schemas diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix index cdc711873a36..7abde58978fe 100644 --- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix +++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "chirpstack-rest-api"; - version = "4.10.2"; + version = "4.11.0"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-rest-api"; rev = "v${version}"; - hash = "sha256-t7JACy26BzmkC7f/KGATw8V+lqEqhkPjEg6LHQ6REWE="; + hash = "sha256-yYuSciMsQudGqBPNqj28TZgCGtZb9j7mtEkBR8tbEm4="; }; - vendorHash = "sha256-Y4KGcLms5TAWHcvm9OYKty3+Lciycy+31zokVAPx/pI="; + vendorHash = "sha256-UZ1todyWnxRTnqEGc/2rM+JCZPWYG/WA+OnivpB6JGI="; ldflags = [ "-s" diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 17134da28104..357e71fa0379 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2024-12-09"; + version = "0-unstable-2025-01-10"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "ca156f7bc9109c552973414a63d310f76ef0cbf8"; - hash = "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o="; + rev = "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6"; + hash = "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index ed64279ccb16..ecdec1f89c8c 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.89"; + "version" = "1.11.91"; "hashes" = { - "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0="; - "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q"; + "desktopSrcHash" = "sha256-nHA/j9V+vZUgY+eCCp/iO458GrXSkla+ruJbJjh9NJw="; + "desktopYarnHash" = "09k4kislf1zimbyn6m68bh2s3kpn2cs9h04wqli3j3qgkplcvxdv"; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index 6bd45a77319d..75bc7666939a 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.89"; + "version" = "1.11.91"; "hashes" = { - "webSrcHash" = "sha256-K9i5MxTJaX359qsnpfXZBZiNHbhCEy25plUPVUtbGQs="; - "webYarnHash" = "164smvrq9937x0pql20zdqab5w35fcidbywkzlyc5g4w7iwkd9kx"; + "webSrcHash" = "sha256-kdjkmVkoJuV3SBFkVQr4IAi69mAs8V5i3qFOd66BP2s="; + "webYarnHash" = "sha256-in7qiGIXP+Ki820RB/uB2st2FIwrxjqYpdOmmLI6RSM="; }; } diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix index 4065332ca941..77d869e3c9e9 100644 --- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix +++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "fzyzcjy"; repo = "flutter_rust_bridge"; rev = "v${version}"; - hash = "sha256-XHHgKwwGI0v6PD+KQBA8AvUBqUPxefxoJXcZDwjOemQ="; + hash = "sha256-I9IaBOqX93g5i26aMa/ICWKurX/82R9PvINNVWNQuNk="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-4/Tmj0FFBLhGKbabE+kcoHqBX7rmlg3ps3oZ/hwuir8="; + cargoHash = "sha256-8+h2B3q3cFH7lLilathipnSJKx5nAts0EiUUiqFENFU="; cargoBuildFlags = "--package flutter_rust_bridge_codegen"; cargoTestFlags = "--package flutter_rust_bridge_codegen"; diff --git a/pkgs/by-name/gd/gdlauncher-carbon/package.nix b/pkgs/by-name/gd/gdlauncher-carbon/package.nix index b76ff180ac76..2bf6074c25fb 100644 --- a/pkgs/by-name/gd/gdlauncher-carbon/package.nix +++ b/pkgs/by-name/gd/gdlauncher-carbon/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdlauncher-carbon"; - version = "2.0.20"; + version = "2.0.22"; src = appimageTools.extract { inherit (finalAttrs) pname version; src = fetchurl { url = "https://cdn-raw.gdl.gg/launcher/GDLauncher__${finalAttrs.version}__linux__x64.AppImage"; - hash = "sha256-tI9RU8qO3MHbImOGw2Wl1dksNbhqrYFyGemqms8aAio="; + hash = "sha256-b1d39cSuVJ17rx8vjlYlyIUvqkBbhCWXuq4Z96K1I3M="; }; }; diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index a9018cb1fda3..09262b7db87a 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.9"; + version = "1.1.11"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-dBUMn5KMSLTfmJnKTS6seEYDRy2JCiR+fi37UIUJ5aM="; + hash = "sha256-bb5tU4UtqdWcSqgl28V8IoATWx4TADxNFXkn9ljmw6Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix b/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix index 815252650fc7..722453d3cd2c 100644 --- a/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix +++ b/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix @@ -6,6 +6,7 @@ gnome, adwaita-icon-theme, meson, + mesonEmulatorHook, ninja, pkg-config, gtk3, @@ -51,20 +52,24 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ - meson - ninja - gettext - itstool - pkg-config - libxml2 - wrapGAppsHook3 - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - python3 - ]; + nativeBuildInputs = + [ + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook3 + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + python3 + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; buildInputs = [ glib @@ -86,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs meson_post_install.py ''; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-bluetooth"; diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index fa7bab1cde8b..b01e93c958a5 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -64,10 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Helper for screenshots within Hyprland, based on grimshot"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ - donovanglover - khaneliman - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "grimblast"; }; }) diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index a501314bcd91..05e8cc9c7911 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -50,7 +50,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland cursor format, library and utilities"; changelog = "https://github.com/hyprwm/hyprcursor/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ iynaix ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iynaix + ]); mainProgram = "hyprcursor-util"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index 43eb8f4b7e7d..b6cf9820f4e8 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -51,9 +51,6 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Official implementation library for the hypr config language"; license = lib.licenses.lgpl3Only; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ - fufexan - khaneliman - ]; + maintainers = lib.teams.hyprland.members; }; }) diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index aa9e74b0ce55..19697748d968 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -48,11 +48,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland's idle daemon"; homepage = "https://github.com/hyprwm/hypridle"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - iogamaster - johnrtitor - khaneliman - ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iogamaster + ]); mainProgram = "hypridle"; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/hy/hyprland-protocols/package.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix index 87c9c21036e0..814f3bd94857 100644 --- a/pkgs/by-name/hy/hyprland-protocols/package.nix +++ b/pkgs/by-name/hy/hyprland-protocols/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/hyprwm/hyprland-protocols"; description = "Wayland protocol extensions for Hyprland"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fufexan ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix index 779a186bea73..f1109b56cebf 100644 --- a/pkgs/by-name/hy/hyprland-qtutils/package.nix +++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix @@ -43,7 +43,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland QT/qml utility apps"; homepage = "https://github.com/hyprwm/hyprland-qtutils"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.fufexan ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index bf39f15cd87a..2b1c9475c2e5 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -217,12 +217,7 @@ customStdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/hyprwm/Hyprland"; description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - khaneliman - wozeparrot - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "Hyprland"; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index 0cbd1babd340..d4dbe9584dd8 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -39,9 +39,10 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Official implementation library for the hypr config language"; license = lib.licenses.lgpl3Only; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ - iogamaster - fufexan - ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iogamaster + ]); }; }) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index e93cdcaceca0..6ee11eef131f 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -70,10 +70,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland's GPU-accelerated screen locking utility"; homepage = "https://github.com/hyprwm/hyprlock"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - iynaix - johnrtitor - ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iynaix + ]); mainProgram = "hyprlock"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index bbf718c12f11..3d04aa0caa41 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -82,11 +82,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs.src.meta) homepage; description = "Blazing fast wayland wallpaper utility"; license = licenses.bsd3; - maintainers = with maintainers; [ - fufexan - khaneliman - wozeparrot - ]; + maintainers = lib.teams.hyprland.members; inherit (wayland.meta) platforms; broken = gcc14Stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix index f053be81f95a..72ca3b69676b 100644 --- a/pkgs/by-name/hy/hyprpicker/package.nix +++ b/pkgs/by-name/hy/hyprpicker/package.nix @@ -61,10 +61,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Wlroots-compatible Wayland color picker that does not suck"; homepage = "https://github.com/hyprwm/hyprpicker"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - khaneliman - ]; + maintainers = lib.teams.hyprland.members; platforms = wayland.meta.platforms; mainProgram = "hyprpicker"; }; diff --git a/pkgs/by-name/hy/hyprpolkitagent/package.nix b/pkgs/by-name/hy/hyprpolkitagent/package.nix index 056bd0d3aad4..f63a95a4c04b 100644 --- a/pkgs/by-name/hy/hyprpolkitagent/package.nix +++ b/pkgs/by-name/hy/hyprpolkitagent/package.nix @@ -40,10 +40,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Polkit authentication agent written in QT/QML"; homepage = "https://github.com/hyprwm/hyprpolkitagent"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprpolkitagent"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix index f50e592506f6..e69670eb254e 100644 --- a/pkgs/by-name/hy/hyprprop/package.nix +++ b/pkgs/by-name/hy/hyprprop/package.nix @@ -65,7 +65,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "An xprop replacement for Hyprland"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ khaneliman ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprprop"; }; }) diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix index 56755a513954..40ebdae92ef5 100644 --- a/pkgs/by-name/hy/hyprsunset/package.nix +++ b/pkgs/by-name/hy/hyprsunset/package.nix @@ -53,10 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Application to enable a blue-light filter on Hyprland"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprsunset"; }; }) diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index ab661f982ec1..7f2760e90292 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -42,9 +42,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Small C++ library for utilities used across the Hypr* ecosystem"; license = lib.licenses.bsd3; platforms = lib.platforms.linux ++ lib.platforms.freebsd; - maintainers = with lib.maintainers; [ - donovanglover - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; }; }) diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index ff72717819f7..1e32eaa1f736 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -36,10 +36,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Hyprland version of wayland-scanner in and for C++"; changelog = "https://github.com/hyprwm/hyprwayland-scanner/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprwayland-scanner"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 199e2283252f..be53054ff9d6 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.125.3", - "hash": "sha256-lDk2Pj+wspzeRVccWOJ1Xp4E72jlkJBU3G5djFNNHYw=", + "version": "1.125.6", + "hash": "sha256-8rVpXo4pASKA5UTUGh3yHd5J7JPQe0kYOPQ/0hMED24=", "components": { "cli": { - "npmDepsHash": "sha256-l4h6aTgGGZf84LpmaN9XLiw99pgo4JN8zfBXvyE438Y=", - "version": "2.2.44" + "npmDepsHash": "sha256-DqyA/J90+PsjWiwXyGML0gJqYL8jBRR99SxoG0acxqY=", + "version": "2.2.47" }, "server": { - "npmDepsHash": "sha256-v21BjA7+zOPQtZNH06q4+x/EvcNVi/4T1Zi4LMgYZUU=", - "version": "1.125.3" + "npmDepsHash": "sha256-4+G4mIxABb2Rr9HqbfzB2B7gwBLMlwZTDnH11Oi7kMc=", + "version": "1.125.6" }, "web": { - "npmDepsHash": "sha256-H32WmL7C+I03i3LSfs87Wyj/TMubqF1Nz7/VEj25aeI=", - "version": "1.125.3" + "npmDepsHash": "sha256-iMFKWgYlCCdjGnnYx0vB5Vl4+d4ftPjPRenHQDPePSU=", + "version": "1.125.6" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-HpLw4I7KEap45HnRcA4u1PA8qM2HvSeF5hLkar20bns=", - "version": "1.125.3" + "npmDepsHash": "sha256-nZTg6PmuMDqCFOoz+3INyRUMdbUKAqvkl+EHVkPZXoQ=", + "version": "1.125.6" }, "geonames": { - "timestamp": "20250126191509", - "hash": "sha256-uzKJJTN9TZCAgEtePI2RGZWTNGKdhmup4RHNVMGfQ48=" + "timestamp": "20250128052059", + "hash": "sha256-QnDkaqJbOpaROXZRtr1nLJxtd70YULEuNqLlwgN/9lY=" } } } diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index 70d9cf242b53..28df57aae22a 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.479.2"; + version = "2.479.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-F3wsAz8NOuQUjmAdD9raYBEtg/JQUh86Cg/ZfLsTjb0="; + hash = "sha256-MEyFkoYNWwPewnyWteiexY/HRPeBYcU/ejRKC/fOkgM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix index 08df492acd72..0fcefd35c5ce 100644 --- a/pkgs/by-name/ka/kanata/package.nix +++ b/pkgs/by-name/ka/kanata/package.nix @@ -22,28 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-cG9so0x0y8CbTxLOxSQwn5vG72KxHJzzTIH4lQA4MvE="; }; - cargoHash = "sha256-QQrFUJ24Qnrx8+7+h9riycXZSQUdH1sXMhpDzU9AXiI="; - - # the dependency native-windows-gui contains both README.md and readme.md, - # which causes a hash mismatch on systems with a case-insensitive filesystem - # this removes the readme files and updates cargo's checksum file accordingly - depsExtraArgs = { - nativeBuildInputs = [ - jq - moreutils - ]; - - postBuild = '' - pushd $name/native-windows-gui - - rm --force --verbose README.md readme.md - jq 'del(.files."README.md") | del(.files."readme.md")' \ - .cargo-checksum.json -c \ - | sponge .cargo-checksum.json - - popd - ''; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-VKvle1hQae+0Vbvd7Epq3cDqG8OV5J2mowF5lue59oc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; diff --git a/pkgs/by-name/ka/kanidm/1_3.nix b/pkgs/by-name/ka/kanidm/1_3.nix index 8d4d310ac713..f0f708eba357 100644 --- a/pkgs/by-name/ka/kanidm/1_3.nix +++ b/pkgs/by-name/ka/kanidm/1_3.nix @@ -1,7 +1,7 @@ import ./generic.nix { version = "1.3.3"; hash = "sha256-W5G7osV4du6w/BfyY9YrDzorcLNizRsoz70RMfO2AbY="; - cargoHash = "sha256-iziTHr0gvv319Rzgkze9J1H4UzPR7WxMmCkiGVsb33k="; + cargoHash = "sha256-QgEoeXjGm7fhPnJBbquWJYDYPg+Uv1IjZnaI5yUEYlQ="; patchDir = ./patches/1_3; extraMeta = { knownVulnerabilities = [ diff --git a/pkgs/by-name/ka/kanidm/1_4.nix b/pkgs/by-name/ka/kanidm/1_4.nix index 1b1b941905bf..a87b8eb4f11e 100644 --- a/pkgs/by-name/ka/kanidm/1_4.nix +++ b/pkgs/by-name/ka/kanidm/1_4.nix @@ -1,6 +1,6 @@ import ./generic.nix { version = "1.4.6"; hash = "sha256-pjJyq52wO5p34LN2Jmt0npgWBDcWin8gIX4skZ7Ff8E="; - cargoHash = "sha256-XyyvXxZOvaxSzH8Jd23IxE4Wyd/6h5N3HRVEvdQ8RtY="; + cargoHash = "sha256-33HRoH/vWPe/wOZJtQLWV9eBocbj0iR/XUu4zMehu8M="; patchDir = ./patches/1_4; } diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix index 5c0a04bcbc2b..8512f1fc357c 100644 --- a/pkgs/by-name/ka/kanidm/generic.nix +++ b/pkgs/by-name/ka/kanidm/generic.nix @@ -38,6 +38,7 @@ in rustPlatform.buildRustPackage rec { pname = "kanidm" + (lib.optionalString enableSecretProvisioning "-with-secret-provisioning"); inherit version cargoHash; + useFetchCargoVendor = true; cargoDepsName = "kanidm"; src = fetchFromGitHub { diff --git a/pkgs/by-name/ma/mallard-ducktype/package.nix b/pkgs/by-name/ma/mallard-ducktype/package.nix new file mode 100644 index 000000000000..7a9f1f890e8f --- /dev/null +++ b/pkgs/by-name/ma/mallard-ducktype/package.nix @@ -0,0 +1,4 @@ +{ python3 }: + +with python3.pkgs; +toPythonApplication mallard-ducktype diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index e0fc11bb8223..074b1cccb387 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -17,6 +17,7 @@ xvfb-run, libadwaita, libxcvt, + libGL, libICE, libX11, libXcomposite, @@ -106,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ desktop-file-utils gettext + glib libxcvt meson ninja @@ -133,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { libdrm libei libdisplay-info + libGL libgudev libinput libstartup_notification @@ -175,10 +178,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "libadwaita-1.so.0" "${libadwaita}/lib/libadwaita-1.so.0" ''; - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. # TODO: Move this into a directory devhelp can find. @@ -189,6 +188,7 @@ stdenv.mkDerivation (finalAttrs: { PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; separateDebugInfo = true; + strictDeps = true; passthru = { libdir = "${finalAttrs.finalPackage}/lib/mutter-15"; diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix index c27d97088518..2f726ee47d65 100644 --- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix +++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix @@ -38,16 +38,20 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; + nativeBuildInputs = + [ + autoreconfHook + glib # for gdbus-codegen + pkg-config + ] + ++ lib.optionals withGnome [ + gtk4 # for gtk4-builder-tool + ]; buildInputs = [ networkmanager ppp - glib openssl nss ] @@ -67,6 +71,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + strictDeps = true; passthru = { networkManagerPlugin = "VPN/nm-l2tp-service.name"; diff --git a/pkgs/by-name/ne/networkmanager-openconnect/package.nix b/pkgs/by-name/ne/networkmanager-openconnect/package.nix index c33ba6644f90..e4ec7fa5739b 100644 --- a/pkgs/by-name/ne/networkmanager-openconnect/package.nix +++ b/pkgs/by-name/ne/networkmanager-openconnect/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { buildInputs = [ - glib libxml2 openconnect networkmanager @@ -55,6 +54,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + glib intltool pkg-config file diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix index 964a51ddab97..82e9c7b0149f 100644 --- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix +++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gettext + glib pkg-config file libxml2 @@ -46,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { [ openvpn networkmanager - glib ] ++ lib.optionals withGnome [ gtk3 @@ -63,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { "--enable-absolute-paths" ]; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = "NetworkManager-openvpn"; diff --git a/pkgs/by-name/ne/networkmanager-sstp/package.nix b/pkgs/by-name/ne/networkmanager-sstp/package.nix index 4a8a13ac3936..494f27b80571 100644 --- a/pkgs/by-name/ne/networkmanager-sstp/package.nix +++ b/pkgs/by-name/ne/networkmanager-sstp/package.nix @@ -29,18 +29,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-zd+g86cZLyibLhYLal6XzUb9wFu7kHROp0KzRM95Qng="; }; - nativeBuildInputs = [ - autoreconfHook - file - gettext - pkg-config - ]; + nativeBuildInputs = + [ + autoreconfHook + file + gettext + glib # for gdbus-codegen + pkg-config + ] + ++ lib.optionals withGnome [ + gtk4 # for gtk4-builder-tool + ]; buildInputs = [ sstp networkmanager - glib ppp ] ++ lib.optionals withGnome [ @@ -63,6 +67,8 @@ stdenv.mkDerivation rec { "--enable-absolute-paths" ]; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix index 52f47d871199..76af39b9da20 100644 --- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix +++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix @@ -35,12 +35,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file + glib ]; buildInputs = [ vpnc networkmanager - glib ] ++ lib.optionals withGnome [ gtk3 gtk4 @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { "--enable-absolute-paths" ]; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix index 6ccff3cce505..870ad9692f92 100644 --- a/pkgs/by-name/ni/nimlangserver/package.nix +++ b/pkgs/by-name/ni/nimlangserver/package.nix @@ -6,7 +6,7 @@ buildNimPackage ( final: prev: rec { pname = "nimlangserver"; - version = "1.8.0"; + version = "1.8.1"; # nix build ".#nimlangserver.src" # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --prefetch-git:bearssl,zlib @@ -16,7 +16,7 @@ buildNimPackage ( owner = "nim-lang"; repo = "langserver"; rev = "v${version}"; - hash = "sha256-JyBjHAP/sxQfQ1XvyeZyHsu0Er5D7ePDGyJK7Do5kyk="; + hash = "sha256-j5YnTGPtt0WhRvNfpgO9tjAqZJA5Kt1FE1Mjqn0/DNY="; }; doCheck = false; diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix index 575d213de0c9..4a689578ca22 100644 --- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix +++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix @@ -10,13 +10,13 @@ }: let - version = "unstable-2024-03-25"; + version = "0-unstable-2024-12-22"; src = fetchFromGitHub { owner = "jtojnar"; repo = "nixpkgs-hammering"; - rev = "6851ecea8c6da45870b7c06d6495cba3fb2d7c7c"; - hash = "sha256-kr3zMr7aWt4W/+Jcol5Ctiq0KjXSxViPhGtyqvX9dqE="; + rev = "56e8d636b3e7188dae2832fc405db2e388be634b"; + hash = "sha256-hr+BHAmWT/FCLI5zNEHgtKdBbIYgmAydrErRu9RfuuM="; }; meta = with lib; { diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/by-name/op/openrgb-plugin-effects/package.nix similarity index 91% rename from pkgs/applications/misc/openrgb-plugins/effects/default.nix rename to pkgs/by-name/op/openrgb-plugin-effects/package.nix index 5723bab1d1c8..70f96877ad79 100644 --- a/pkgs/applications/misc/openrgb-plugins/effects/default.nix +++ b/pkgs/by-name/op/openrgb-plugin-effects/package.nix @@ -2,13 +2,11 @@ lib, stdenv, fetchFromGitLab, - qtbase, + libsForQt5, openrgb, glib, openal, - qmake, pkg-config, - wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -29,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${openrgb.src} OpenRGB ''; - nativeBuildInputs = [ + nativeBuildInputs = with libsForQt5; [ qmake pkg-config wrapQtAppsHook ]; - buildInputs = [ + buildInputs = with libsForQt5; [ qtbase glib openal diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix similarity index 92% rename from pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix rename to pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix index 497da16c10a6..970c0d38a059 100644 --- a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix +++ b/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix @@ -2,14 +2,12 @@ lib, stdenv, fetchFromGitLab, - qtbase, + libsForQt5, openrgb, glib, libgtop, lm_sensors, - qmake, pkg-config, - wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -31,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: { rm -r dependencies/lhwm-cpp-wrapper ''; - buildInputs = [ + buildInputs = with libsForQt5; [ qtbase glib libgtop lm_sensors ]; - nativeBuildInputs = [ + nativeBuildInputs = with libsForQt5; [ qmake pkg-config wrapQtAppsHook diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/by-name/op/openrgb/package.nix similarity index 95% rename from pkgs/applications/misc/openrgb/default.nix rename to pkgs/by-name/op/openrgb/package.nix index ac8651b36e37..fa544e48cd93 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/by-name/op/openrgb/package.nix @@ -2,15 +2,12 @@ lib, stdenv, fetchFromGitLab, - qmake, - wrapQtAppsHook, + libsForQt5, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, - qtbase, - qttools, symlinkJoin, openrgb, }: @@ -26,12 +23,13 @@ stdenv.mkDerivation rec { hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; }; - nativeBuildInputs = [ + nativeBuildInputs = with libsForQt5; [ qmake pkg-config wrapQtAppsHook ]; - buildInputs = [ + + buildInputs = with libsForQt5; [ libusb1 hidapi mbedtls_2 diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index 4b871410d89a..ac9f6c0d7738 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchCrate, + fetchFromGitHub, rustPlatform, }: @@ -9,16 +9,17 @@ rustPlatform.buildRustPackage rec { version = "9.1.3"; pname = "oxipng"; - src = fetchCrate { - inherit version pname; - hash = "sha256-kzN4YNsFqv/KUxpHao++oqc90Us6VllyFYkpdVUigD0="; + # do not use fetchCrate (only repository includes tests) + src = fetchFromGitHub { + owner = "shssoichiro"; + repo = "oxipng"; + tag = "v${version}"; + hash = "sha256-8EOEcIw10hCyYi9SwDLDZ8J3ezLXa30RUY5I9ksfqTs="; }; useFetchCargoVendor = true; cargoHash = "sha256-4c9YcIQRZsbDJvl8P9Pkd3atTVM+RbQ/4BMb7rE84po="; - doCheck = !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin; - meta = { homepage = "https://github.com/shssoichiro/oxipng"; description = "Multithreaded lossless PNG compression optimizer"; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 1f91494028a5..a6b2ed8aec17 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -26,13 +26,13 @@ xorg, }: let - version = "2.14.5"; + version = "2.14.6"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-ML38TErINQPjBGweCY673zFlGEjTjgJcYJTJUbTov+4="; + hash = "sha256-wBm4+ohM9v25n6zEUAeaVU6mAmB3GR8n1kDYyTBlnjM="; }; # subpath installation is broken with uvicorn >= 0.26 @@ -283,6 +283,7 @@ python.pkgs.buildPythonApplication rec { # FileNotFoundError(2, 'No such file or directory'): /build/tmp... "test_script_with_output" "test_script_exit_non_zero" + "testDocumentPageCountMigrated" # AssertionError: 10 != 4 (timezone/time issue) # Due to getting local time from modification date in test_consumer.py "testNormalOperation" diff --git a/pkgs/by-name/pl/plumed/package.nix b/pkgs/by-name/pl/plumed/package.nix index 3809e5fccc84..c2d64c559678 100644 --- a/pkgs/by-name/pl/plumed/package.nix +++ b/pkgs/by-name/pl/plumed/package.nix @@ -9,13 +9,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "plumed"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "plumed"; repo = "plumed2"; rev = "v${version}"; - hash = "sha256-jNvdbfh1krNMrOFqkEHMy60mjsG/Wp6MQg0gHEjDA5U="; + hash = "sha256-KN412t64tp3QUQkhpLU3sAYDosQ3hw9HqpT1fzt5fwA="; }; postPatch = '' diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 8bf887a6f5d4..b67923d4e013 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { name = "regal"; - version = "0.30.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-sr+tGfKDSgJ5SiHihJ/aMAn6AnAC8bEb838+xYdFosc="; + hash = "sha256-HlopAz+AqpjZ/NpVVvkiR0p7+ezWlr5ddLMK/LobxpM="; }; - vendorHash = "sha256-6JheW6JHkAidZda7WWHSfEAuPYoBdli8wWHp2sX2r5Q="; + vendorHash = "sha256-0B8MOF+ovJ1memBuXtEeMViKKWaQXX6+HQzMY91bgyI="; ldflags = [ "-s" diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index d762cb8a82fe..7de5a63f4228 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.7.1"; + version = "9.7.2"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - hash = "sha256-ZPJ8OlVEqG/jmRaA7BJRsw3b1X/3tKtRcYTXqfGdJ0I="; + hash = "sha256-1nWpFGRBS49uzKl7m/4YWFI+3lvm2zKByYpR9llxsgY="; }; sourceRoot = "saga-${version}/saga-gis"; diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix index 30a24ea39838..55e8b094f8bd 100644 --- a/pkgs/by-name/sh/shairport-sync/package.nix +++ b/pkgs/by-name/sh/shairport-sync/package.nix @@ -53,13 +53,13 @@ in stdenv.mkDerivation rec { pname = "shairport-sync"; - version = "4.3.5"; + version = "4.3.6"; src = fetchFromGitHub { repo = "shairport-sync"; owner = "mikebrady"; tag = version; - hash = "sha256-GYu/n4JoghqUHnkCiSQJYm9WSLww585WKgXTEiWGq4g="; + hash = "sha256-Pbg2yFa524OFOfvwZPS1/K+Vvn+bwtmo7Fbr919Smwc="; }; nativeBuildInputs = diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index 97b3a45c535c..60ccaecca0cc 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitHub, + runCommand, + config, pkg-config, libtool, curl, @@ -33,6 +35,8 @@ enableX11 ? true, enableGtk2 ? false, gtk2, + enableNVML ? config.cudaSupport, + nvml, }: stdenv.mkDerivation rec { @@ -113,7 +117,14 @@ stdenv.mkDerivation rec { http-parser ] ++ lib.optionals enableX11 [ xorg.xauth ] - ++ lib.optionals enableGtk2 [ gtk2 ]; + ++ lib.optionals enableGtk2 [ gtk2 ] + ++ lib.optionals enableNVML [ + (runCommand "collect-nvml" { } '' + mkdir $out + ln -s ${nvml.dev}/include $out/include + ln -s ${nvml.lib}/lib/stubs $out/lib + '') + ]; configureFlags = [ @@ -132,7 +143,8 @@ stdenv.mkDerivation rec { "--without-rpath" # Required for configure to pick up the right dlopen path ] ++ (lib.optional enableGtk2 "--disable-gtktest") - ++ (lib.optional (!enableX11) "--disable-x11"); + ++ (lib.optional (!enableX11) "--disable-x11") + ++ (lib.optional (enableNVML) "--with-nvml"); preConfigure = '' patchShebangs ./doc/html/shtml2html.py diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json new file mode 100644 index 000000000000..f76816c86853 --- /dev/null +++ b/pkgs/by-name/so/sourcegit/deps.json @@ -0,0 +1,232 @@ +[ + { + "pname": "Avalonia", + "version": "11.0.0", + "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=" + }, + { + "pname": "Avalonia", + "version": "11.2.3", + "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + }, + { + "pname": "Avalonia.AvaloniaEdit", + "version": "11.1.0", + "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.29", + "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.2.3", + "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" + }, + { + "pname": "Avalonia.Controls.DataGrid", + "version": "11.2.3", + "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.2.3", + "hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.2.3", + "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" + }, + { + "pname": "Avalonia.Fonts.Inter", + "version": "11.2.3", + "hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.2.3", + "hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY=" + }, + { + "pname": "Avalonia.Native", + "version": "11.2.3", + "hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.2.3", + "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.0.0", + "hash": "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.2.3", + "hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "11.2.3", + "hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.2.3", + "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.2.3", + "hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE=" + }, + { + "pname": "Avalonia.X11", + "version": "11.2.3", + "hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60=" + }, + { + "pname": "AvaloniaEdit.TextMate", + "version": "11.1.0", + "hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM=" + }, + { + "pname": "CommunityToolkit.Mvvm", + "version": "8.3.2", + "hash": "sha256-zY+iB5Rj/8ru0xpRWwFLFO6JI3UFB/XHnx9pWmrZCAs=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.2", + "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + }, + { + "pname": "LiveChartsCore", + "version": "2.0.0-rc4.5", + "hash": "sha256-2Fgn9Bo1aM6dZHCU+OVykOhggTzpcEfFNfYtWc4yvHc=" + }, + { + "pname": "LiveChartsCore.SkiaSharpView", + "version": "2.0.0-rc4.5", + "hash": "sha256-03RR14tA0DtYHiLdgmAI4Gp5/e2H6QPkNFOBeqiFaJU=" + }, + { + "pname": "LiveChartsCore.SkiaSharpView.Avalonia", + "version": "2.0.0-rc4.5", + "hash": "sha256-lzG/5e6WDpUiHZ8GvovOMvwXyYoVBeB1Ktuuw2Fx5No=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "Onigwrap", + "version": "1.0.6", + "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.8", + "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" + }, + { + "pname": "SkiaSharp.HarfBuzz", + "version": "2.88.8", + "hash": "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.Text.Json", + "version": "8.0.5", + "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" + }, + { + "pname": "TextMateSharp", + "version": "1.0.59", + "hash": "sha256-qfAGSgVpTrWMZSk0TFDVP1IgWWi6O1jEEvWc0Pvw9i0=" + }, + { + "pname": "TextMateSharp", + "version": "1.0.65", + "hash": "sha256-kZx3CBDzu7qUSnihs9Q4Ck78ih1aJ+0g8cN8Hke+E5w=" + }, + { + "pname": "TextMateSharp.Grammars", + "version": "1.0.59", + "hash": "sha256-ru5VxQK4PFRJhHu+MvCzDt3EwbC/94n1whtDovUAUDA=" + }, + { + "pname": "TextMateSharp.Grammars", + "version": "1.0.65", + "hash": "sha256-tZx/GKYX3bomQFVFaEgneNYHpB74v+8D90IfkYImlhE=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.20.0", + "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + } +] diff --git a/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch b/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch new file mode 100644 index 000000000000..790fd218e789 --- /dev/null +++ b/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch @@ -0,0 +1,31 @@ +diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs +index a24f1b6..4102274 100644 +--- a/src/Native/Linux.cs ++++ b/src/Native/Linux.cs +@@ -97,7 +97,7 @@ namespace SourceGit.Native + } + } + +- private string FindExecutable(string filename) ++ public static string FindExecutable(string filename) + { + var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty; + var pathes = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries); +diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs +index 5721fe8..bc2a57d 100644 +--- a/src/Native/MacOS.cs ++++ b/src/Native/MacOS.cs +@@ -25,12 +25,7 @@ namespace SourceGit.Native + + public string FindGitExecutable() + { +- var gitPathVariants = new List() { +- "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git" +- }; +- foreach (var path in gitPathVariants) +- if (File.Exists(path)) return path; +- return string.Empty; ++ return Linux.FindExecutable("git"); + } + + public string FindTerminal(Models.ShellOrTerminal shell) diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix new file mode 100644 index 000000000000..72ac09617105 --- /dev/null +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -0,0 +1,117 @@ +{ + lib, + stdenv, + buildDotnetModule, + fetchFromGitHub, + dotnetCorePackages, + copyDesktopItems, + makeDesktopItem, + libicns, + + libXcursor, + libXext, + libXi, + libXrandr, + + git, + xdg-utils, +}: + +buildDotnetModule (finalAttrs: { + pname = "sourcegit"; + version = "2025.01"; + + src = fetchFromGitHub { + owner = "sourcegit-scm"; + repo = "sourcegit"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6FO0WRUcWm7xnuw6Br97+cWZhvzIOesg/eANZzeyxZo="; + }; + + patches = [ ./fix-darwin-git-path.patch ]; + + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; + + nugetDeps = ./deps.json; + + projectFile = [ "src/SourceGit.csproj" ]; + + executables = [ "SourceGit" ]; + + dotnetFlags = [ + "-p:DisableUpdateDetection=true" + "-p:DisableAOT=true" + ]; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + copyDesktopItems + libicns + ]; + + # these are dlopen-ed at runtime + # libXi is needed for right-click support + # not sure about what the other ones are needed for, but I'll include them anyways + runtimeDeps = [ + libXcursor + libXext + libXi + libXrandr + ]; + + # Note: users can use `.overrideAttrs` to append to this list + runtimePathDeps = [ + git + xdg-utils + ]; + + # add fallback binaries to use if the user doesn't already have them in their PATH + preInstall = '' + makeWrapperArgs+=( + --suffix PATH : ${lib.makeBinPath finalAttrs.runtimePathDeps} + ) + ''; + + desktopItems = [ + (makeDesktopItem { + name = "SourceGit"; + exec = "SourceGit"; + icon = "SourceGit"; + desktopName = "SourceGit"; + terminal = false; + comment = finalAttrs.meta.description; + }) + ]; + + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + # extract the .icns file into multiple .png files + # where the format of the .png file names is App_"$n"x"$n"x32.png + + icns2png -x build/resources/app/App.icns + + for f in App_*x32.png; do + res=''${f//App_} + res=''${res//x32.png} + install -Dm644 $f "$out/share/icons/hicolor/$res/apps/SourceGit.png" + done + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + install -Dm644 build/resources/app/App.icns $out/Applications/SourceGit.app/Contents/Resources/App.icns + + substitute build/resources/app/App.plist $out/Applications/SourceGit.app/Contents/Info.plist \ + --replace-fail "SOURCE_GIT_VERSION" "${finalAttrs.version}" + + mkdir -p $out/Applications/SourceGit.app/Contents/MacOS + ln -s $out/bin/SourceGit $out/Applications/SourceGit.app/Contents/MacOS/SourceGit + ''; + + meta = { + changelog = "https://github.com/sourcegit-scm/sourcegit/releases/tag/${finalAttrs.src.tag}"; + description = "Free & OpenSource GUI client for GIT users"; + homepage = "https://github.com/sourcegit-scm/sourcegit"; + license = lib.licenses.mit; + mainProgram = "SourceGit"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +}) diff --git a/pkgs/by-name/tp/tpm2-openssl/package.nix b/pkgs/by-name/tp/tpm2-openssl/package.nix index 48c04e25fb4f..a3a36bf24a3e 100644 --- a/pkgs/by-name/tp/tpm2-openssl/package.nix +++ b/pkgs/by-name/tp/tpm2-openssl/package.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "tpm2-openssl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = "tpm2-openssl"; rev = finalAttrs.version; - hash = "sha256-mZ4Z/GxJFwwfyFd1SAiVlQqOjkFSzsZePeuEZtq8Mcg="; + hash = "sha256-CCTR7qBqI/y+jLBEEcgRanYOBNUYM/sH/hCqOLGA4QM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/va/vanguards/package.nix b/pkgs/by-name/va/vanguards/package.nix new file mode 100644 index 000000000000..c821f1531723 --- /dev/null +++ b/pkgs/by-name/va/vanguards/package.nix @@ -0,0 +1,38 @@ +{ + python312Packages, + fetchFromGitHub, + lib, +}: +python312Packages.buildPythonApplication rec { + pname = "vanguards"; + version = "0.3.1-unstable-2023-10-31"; + + dependencies = [ python312Packages.stem ]; + #tries to access the network during the tests, which fails + doCheck = false; + + src = fetchFromGitHub { + owner = "mikeperry-tor"; + repo = "vanguards"; + rev = "8132fa0e556fbcbb3538ff9b48a2180c0c5e8fbd"; + sha256 = "sha256-XauSTgoH6zXv2DXyX2lQc6gy6Ysm41fKnyuWZ3hj7kI="; + }; + patches = [ ./python-3.12.patch ]; + postPatch = '' + # fix import cycle issue + substituteInPlace src/vanguards/main.py --replace-fail \ + 'import stem.response.events' 'import stem.socket; import stem.control; import stem.response.events' + ''; + + meta = { + maintainers = with lib.maintainers; [ ForgottenBeast ]; + mainProgram = "vanguards"; + license = lib.licenses.mit; + homepage = "https://github.com/mikeperry-tor/vanguards"; + description = "Protects TOR hidden services against guard node attacks"; + longDescription = '' + Runs alongside tor and interacts with its control port + in order to protect and alert against guard node attacks on hidden services + ''; + }; +} diff --git a/pkgs/by-name/va/vanguards/python-3.12.patch b/pkgs/by-name/va/vanguards/python-3.12.patch new file mode 100644 index 000000000000..5241b3c09ce6 --- /dev/null +++ b/pkgs/by-name/va/vanguards/python-3.12.patch @@ -0,0 +1,51 @@ +Origin: https://github.com/mikeperry-tor/vanguards/pull/105/commits/183d24775521feb3ed61b681088347279c3fc84c +From: Dave Jones +Date: Wed, 28 Aug 2024 12:54:24 +0100 +Subject: [PATCH] Python 3.12 compatibility + +Python 3.12 removes the deprecated `SafeConfigParser` class. This patch +switches the code to using ConfigParser and read_file from Python 3.x, +and patches 2.7's SafeConfigParser to a compatible definition. +--- + src/vanguards/config.py | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/vanguards/config.py b/src/vanguards/config.py +index 1c33391..b8e3f9c 100644 +--- a/src/vanguards/config.py ++++ b/src/vanguards/config.py +@@ -16,9 +16,12 @@ + from .logger import plog + + try: +- from configparser import SafeConfigParser, Error ++ from configparser import ConfigParser, Error + except ImportError: + from ConfigParser import SafeConfigParser, Error ++ class ConfigParser(SafeConfigParser): ++ def read_file(self, f, source=None): ++ return self.readfp(f, source) + + ################# Global options ################## + +@@ -209,7 +212,7 @@ def set_options_from_module(config, module, section): + config.set(section, param, str(val)) + + def generate_config(): +- config = SafeConfigParser(allow_no_value=True) ++ config = ConfigParser(allow_no_value=True) + set_options_from_module(config, sys.modules[__name__], "Global") + set_options_from_module(config, vanguards, "Vanguards") + set_options_from_module(config, bandguards, "Bandguards") +@@ -219,9 +222,9 @@ def generate_config(): + return config + + def apply_config(config_file): +- config = SafeConfigParser(allow_no_value=True) ++ config = ConfigParser(allow_no_value=True) + +- config.readfp(open(config_file, "r")) ++ config.read_file(open(config_file, "r")) + + get_options_for_module(config, sys.modules[__name__], "Global") + get_options_for_module(config, vanguards, "Vanguards") diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix index fb103ddaec7d..a5c964cde693 100644 --- a/pkgs/by-name/vi/vital/package.nix +++ b/pkgs/by-name/vi/vital/package.nix @@ -11,6 +11,7 @@ xorg, libGL, freetype, + zenity, }: stdenv.mkDerivation (finalAttrs: { @@ -57,6 +58,11 @@ stdenv.mkDerivation (finalAttrs: { curl libjack2 ] + }" \ + --prefix PATH : "${ + lib.makeBinPath [ + zenity + ] }" runHook postInstall diff --git a/pkgs/by-name/vp/vpnc/package.nix b/pkgs/by-name/vp/vpnc/package.nix index 4dcd434c04a2..d6b8630984a5 100644 --- a/pkgs/by-name/vp/vpnc/package.nix +++ b/pkgs/by-name/vp/vpnc/package.nix @@ -1,6 +1,8 @@ { lib, stdenv, + bash, + buildPackages, fetchFromGitHub, makeWrapper, pkg-config, @@ -24,7 +26,11 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional (!opensslSupport) pkg-config; + nativeBuildInputs = [ + makeWrapper + perl + ] ++ lib.optional (!opensslSupport) pkg-config; + buildInputs = [ libgcrypt perl @@ -40,15 +46,25 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }; - postPatch = '' - patchShebangs src/makeman.pl - ''; + postPatch = + '' + substituteInPlace src/vpnc-disconnect \ + --replace-fail /bin/sh ${lib.getExe' bash "sh"} + patchShebangs src/makeman.pl + '' + + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # manpage generation invokes the build vpnc, which must be emulating when cross compiling + substituteInPlace src/makeman.pl --replace-fail \ + '$vpnc --long-help' \ + '${stdenv.hostPlatform.emulator buildPackages} $vpnc --long-help' + ''; enableParallelBuilding = true; # Missing install depends: # install: target '...-vpnc-unstable-2021-11-04/share/doc/vpnc': No such file or directory # make: *** [Makefile:149: install-doc] Error 1 enableParallelInstalling = false; + strictDeps = true; meta = with lib; { homepage = "https://davidepucci.it/doc/vpnc/"; diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 561c5dbf55ab..e0a5e58b8e07 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -10,25 +10,27 @@ rustPlatform.buildRustPackage rec { pname = "waytrogen"; - version = "0.5.8"; + version = "0.6.3"; src = fetchFromGitHub { owner = "nikolaizombie1"; repo = "waytrogen"; tag = version; - hash = "sha256-tq5cC0Z0kmrYopOGbdoAERBHQXrAw799zWdQP06rTYw="; + hash = "sha256-jkrvtwkzlsQgbw8/N4uzeqQ3fVSur2oa21IOXRRgh9I="; }; - cargoHash = "sha256-05YfQBezDbQ8KfNvl/4Av5vf/rxJU3Ej6RDgSnSfjtM="; + cargoHash = "sha256-UkYQ/oN1+C9WQ+4hbhXxORw5J3Ypwe7DaDg5LhgP2d0="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; - buildInputs = [ - glib - ]; + buildInputs = [ glib ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; postBuild = '' install -Dm644 org.Waytrogen.Waytrogen.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas @@ -38,6 +40,10 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dm644 waytrogen.desktop $out/share/applications/waytrogen.desktop install -Dm644 README-Assets/WaytrogenLogo.svg $out/share/icons/hicolor/scalable/apps/waytrogen.svg + while IFS= read -r lang; do + mkdir -p $out/share/locale/$lang/LC_MESSAGES + msgfmt locales/$lang/LC_MESSAGES/waytrogen.po -o $out/share/locale/$lang/LC_MESSAGES/waytrogen.mo + done < locales/LINGUAS ''; passthru.updateScript = nix-update-script { }; @@ -52,7 +58,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nikolaizombie1/waytrogen"; changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${version}"; license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ genga898 ]; + maintainers = with lib.maintainers; [ + genga898 + nikolaizombie1 + ]; mainProgram = "waytrogen"; platforms = lib.platforms.linux; }; diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index 4cd9ea9e7db3..f07cd148290a 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -108,6 +108,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + # Multiple tests spin up & speak to D-Bus, avoid cross-talk causing failures + enableParallelChecking = false; + postInstall = '' substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \ --replace-fail '/bin/false' '${lib.getExe' coreutils "false"}' diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix index dd6929161031..b6d748b141eb 100644 --- a/pkgs/development/libraries/astal/buildAstalModule.nix +++ b/pkgs/development/libraries/astal/buildAstalModule.nix @@ -39,7 +39,7 @@ let cleanArgs args // { pname = "astal-${name}"; - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-01-23"; __structuredAttrs = true; strictDeps = true; @@ -47,8 +47,8 @@ let src = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "cac0fc63bfe098b26753db8262f5d95ac42b281b"; - hash = "sha256-kNtKWbQ+gMzmAF7KNSZ4Hb8/2cfSNoURCyRSB0nx2I4="; + rev = "127e9cdcbf173846a3c40ddc0abfbb038df48042"; + hash = "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI="; }; sourceRoot = "${finalAttrs.src.name}/${sourceRoot}"; diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix index 7feb91d8d971..99eca088b2ab 100644 --- a/pkgs/development/python-modules/bindep/default.nix +++ b/pkgs/development/python-modules/bindep/default.nix @@ -11,18 +11,17 @@ buildPythonPackage rec { pname = "bindep"; - version = "2.11.0"; + version = "2.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8="; + hash = "sha256-wGtR5tC6OWWq2PPCXwpXS+D4AboHyxp4SV2olUZ952A="; }; env.PBR_VERSION = version; build-system = [ - distro pbr setuptools ]; @@ -41,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library"; - homepage = "https://docs.opendev.org/opendev/bindep/latest/"; + homepage = "https://opendev.org/opendev/bindep"; license = licenses.asl20; mainProgram = "bindep"; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/compliance-trestle/default.nix b/pkgs/development/python-modules/compliance-trestle/default.nix new file mode 100755 index 000000000000..b67b80f02c01 --- /dev/null +++ b/pkgs/development/python-modules/compliance-trestle/default.nix @@ -0,0 +1,108 @@ +{ + attrs, + buildPythonPackage, + cmarkgfm, + cryptography, + defusedxml, + datamodel-code-generator, + email-validator, + fetchFromGitHub, + furl, + ilcli, + importlib-resources, + jinja2, + lib, + mypy, + openpyxl, + orjson, + paramiko, + pytestCheckHook, + pydantic, + python-dotenv, + python-frontmatter, + requests, + ruamel-yaml, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "compliance-trestle"; + version = "3.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oscal-compass"; + repo = "compliance-trestle"; + tag = "v${version}"; + hash = "sha256-MEPleUM5gSCJjVaVbNtNzRl+Vvvk97h6Q/mOWIxFd2Q="; + fetchSubmodules = true; + }; + + pythonRelaxDeps = true; + + postPatch = '' + substituteInPlace tests/trestle/misc/mypy_test.py \ + --replace-fail "trestle'," "${placeholder "out"}/bin/trestle'," \ + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + attrs + cmarkgfm + cryptography + defusedxml + datamodel-code-generator + email-validator + furl + ilcli + importlib-resources + jinja2 + openpyxl + orjson + paramiko + pydantic + python-dotenv + python-frontmatter + requests + ruamel-yaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + mypy + ]; + + disabledTests = [ + # Requires network access + "test_import_from_url" + "test_import_from_nist" + "test_remote_profile_relative_cat" + + # AssertionError + "test_profile_generate_assemble_rev_5" + "test_ssp_assemble_fedramp_profile" + "test_ssp_generate_aggregates_no_cds" + "test_ssp_generate_aggregates_no_param_value_orig" + ]; + + disabledTestPaths = [ + # Requires network access + "tests/trestle/core/remote" + ]; + + pythonImportsCheck = [ "trestle" ]; + + meta = { + description = "An opinionated tooling platform for managing compliance as code, using continuous integration and NIST's OSCAL standard"; + homepage = "https://github.com/oscal-compass/compliance-trestle"; + changelog = "https://github.com/oscal-compass/compliance-trestle/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "trestle"; + }; +} diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index 250bf77e4462..9a359369cb12 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -12,7 +12,7 @@ }: let - version = "1.50.3"; + version = "1.50.5"; tag = version; in buildPythonPackage { @@ -24,7 +24,7 @@ buildPythonPackage { owner = "elevenlabs"; repo = "elevenlabs-python"; inherit tag; - hash = "sha256-r96g/luQ1UwSY2IRv21cFBVf9H2TWtDFY8WElZoS7nc="; + hash = "sha256-Cew8+L7NoQlvR2pILVmwNIa3WUfZzmEkf1+U2nglsnM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 01d06d31eb12..f29fa882b578 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -6,6 +6,9 @@ # build-system hatchling, + # dependencies + wadler-lindig, + # tests cloudpickle, equinox, @@ -20,18 +23,22 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.36"; + version = "0.2.37"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; tag = "v${version}"; - hash = "sha256-TXhHh6Nka9TOnfFPaNyHmLdTkhzyFEY0mLSfoDf9KQc="; + hash = "sha256-0a/9TSQW/k5kuucHoSUhLtRk9k+5ycbI/g6V1id3v28="; }; build-system = [ hatchling ]; + dependencies = [ + wadler-lindig + ]; + pythonImportsCheck = [ "jaxtyping" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 2809ca2e619e..3eb2c2dff129 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - pythonOlder, hatch-jupyter-builder, hatchling, pytestCheckHook, @@ -89,6 +88,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" + # 19 failures on python 3.13: + # ResourceWarning: unclosed database in + # TODO: Can probably be removed at the next update + "-W" + "ignore::pytest.PytestUnraisableExceptionWarning" ]; preCheck = '' @@ -113,6 +117,10 @@ buildPythonPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ # Failed: DID NOT RAISE "test_copy_big_dir" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # TypeError: the JSON object must be str, bytes or bytearray, not NoneType + "test_terminal_create_with_cwd" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index ec69378235e6..6c07005d4ddf 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -1,8 +1,10 @@ { lib, stdenv, + gcc13Stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # nativeBuildInputs cmake, @@ -33,6 +35,9 @@ cudaPackages ? { }, }: +let + stdenvTarget = if cudaSupport then gcc13Stdenv else stdenv; +in buildPythonPackage rec { pname = "llama-cpp-python"; version = "0.3.6"; @@ -47,6 +52,16 @@ buildPythonPackage rec { }; # src = /home/gaetan/llama-cpp-python; + patches = [ + # fix segfault when running tests due to missing default Metal devices + (fetchpatch2 { + url = "https://github.com/ggerganov/llama.cpp/commit/acd38efee316f3a5ed2e6afcbc5814807c347053.patch?full_index=1"; + stripLen = 1; + extraPrefix = "vendor/llama.cpp/"; + hash = "sha256-71+Lpg9z5KPlaQTX9D85KS2LXFWLQNJJ18TJyyq3/pU="; + }) + ]; + dontUseCmakeConfigure = true; SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" ( lib.optionals cudaSupport [ @@ -76,6 +91,8 @@ buildPythonPackage rec { ] ); + stdenv = stdenvTarget; + dependencies = [ diskcache jinja2 @@ -99,7 +116,11 @@ buildPythonPackage rec { passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; - tests.llama-cpp-python = llama-cpp-python.override { cudaSupport = true; }; + tests = lib.optionalAttrs stdenvTarget.hostPlatform.isLinux { + withCuda = llama-cpp-python.override { + cudaSupport = true; + }; + }; }; meta = { @@ -109,12 +130,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ kirillrdy ]; badPlatforms = [ - # Segfaults during tests: - # tests/test_llama.py .Fatal Python error: Segmentation fault - # Current thread 0x00000001f3decf40 (most recent call first): - # File "/private/tmp/nix-build-python3.12-llama-cpp-python-0.3.2.drv-0/source/llama_cpp/_internals.py", line 51 in __init__ - lib.systems.inspect.patterns.isDarwin - # cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’ "aarch64-linux" ]; diff --git a/pkgs/development/python-modules/mallard-ducktype/default.nix b/pkgs/development/python-modules/mallard-ducktype/default.nix new file mode 100644 index 000000000000..f13d66593ed5 --- /dev/null +++ b/pkgs/development/python-modules/mallard-ducktype/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "mallard-ducktype"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "projectmallard"; + repo = "mallard-ducktype"; + tag = version; + hash = "sha256-jHjzTBBRBh//bOrdnyCRmZRmpupgDaDRuZGAd75baco="; + }; + + build-system = [ setuptools ]; + + checkPhase = '' + runHook preCheck + pushd tests + ./runtests + popd + runHook postCheck + ''; + + pythonImportsCheck = [ "mallard" ]; + + meta = { + description = "Parser for the lightweight Ducktype syntax for Mallard"; + homepage = "https://github.com/projectmallard/mallard-ducktype"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix index 0c12f0612792..c52242f8ed5b 100644 --- a/pkgs/development/python-modules/pyiskra/default.nix +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyiskra"; - version = "0.1.14"; + version = "0.1.15"; pyproject = true; src = fetchFromGitHub { owner = "Iskramis"; repo = "pyiskra"; tag = "v${version}"; - hash = "sha256-OLNUa11UULiW6E8nVy5rUyN7iAD7KdM+R76m2zaDOgc="; + hash = "sha256-LIrhd2gDqa1AehnG0WVQKUNbFTuFkLcHwqNAjFejYk0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scrap-engine/default.nix b/pkgs/development/python-modules/scrap-engine/default.nix index 0a8c9fed90e8..2583c637f7a8 100644 --- a/pkgs/development/python-modules/scrap-engine/default.nix +++ b/pkgs/development/python-modules/scrap-engine/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "scrap-engine"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchPypi { pname = "scrap_engine"; inherit version; - hash = "sha256-qxzbVYFcSKcL2HtMlH9epO/sCx9HckWAt/NyVD8QJBQ="; + hash = "sha256-9jiStwFD5vhPSxWsEVmHOvfRgNgVOUvlzAa1Rmf+faE="; }; build-system = [ diff --git a/pkgs/development/python-modules/stable-baselines3/default.nix b/pkgs/development/python-modules/stable-baselines3/default.nix index a9d784707886..0cca87dd9857 100644 --- a/pkgs/development/python-modules/stable-baselines3/default.nix +++ b/pkgs/development/python-modules/stable-baselines3/default.nix @@ -22,16 +22,14 @@ }: buildPythonPackage rec { pname = "stable-baselines3"; - # TODO: To this date, the latest release (2.4.1) is not compatible with numpy 2 and does not build - # successfully on nixpkgs - version = "2.4.1-unstable-2025-01-07"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "DLR-RM"; repo = "stable-baselines3"; - rev = "b7c64a1aa4dd2fd3efed96e7a9ddb4d1f5c96112"; - hash = "sha256-oyTOBRZsKkhhGKwwBN9HCV0t8+MkJYpWsTRdS+upMeI="; + tag = "v${version}"; + hash = "sha256-4KOF/3/PxHHSo95zaqtPy5+h53VcUsMhSx85tGvXV2o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wadler-lindig/default.nix b/pkgs/development/python-modules/wadler-lindig/default.nix new file mode 100644 index 000000000000..7011c0a9ef16 --- /dev/null +++ b/pkgs/development/python-modules/wadler-lindig/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # tests + numpy, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "wadler-lindig"; + version = "0.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "patrick-kidger"; + repo = "wadler_lindig"; + rev = "v${version}"; + hash = "sha256-akb1x9UYbfEwnVS6ahpb42XnEl3y7kk3WkhwD8p7AA4="; + }; + + build-system = [ + hatchling + ]; + + pythonImportsCheck = [ + "wadler_lindig" + ]; + + nativeCheckInputs = [ + numpy + pytestCheckHook + ]; + + meta = { + description = "A Wadler--Lindig pretty printer for Python"; + homepage = "https://github.com/patrick-kidger/wadler_lindig"; + changelog = "https://github.com/patrick-kidger/wadler_lindig/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a38555846362..4829bcc798ee 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -48,6 +48,7 @@ rec { runCommand, writeText, autoPatchelfHook, + buildPackages, # The JDK/JRE used for running Gradle. java ? defaultJava, @@ -78,7 +79,6 @@ rec { ]; buildInputs = [ - java stdenv.cc.cc ncurses5 ncurses6 @@ -123,6 +123,8 @@ rec { newFileEvents = toString (lib.versionAtLeast version "8.12"); in '' + # get the correct jar executable for cross + export PATH="${buildPackages.jdk}/bin:$PATH" . ${./patching.sh} nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)" diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 59ff96a3f42f..ab873f618f22 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -21,13 +21,13 @@ let common = rec { - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; rev = version; - hash = "sha256-5+ul4PxMgPkmGLB8CYpJcIcRDY/pJgByvjIHDA1Gs5A="; + hash = "sha256-gYC7nbZsTDOA1cJIw9JRjwjgkvSzrlQonGTT21EZeWM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/rust/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix deleted file mode 100644 index ace033d6a114..000000000000 --- a/pkgs/development/tools/rust/cargo-web/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - openssl, - perl, - pkg-config, - rustPlatform, - CoreServices, - Security, - fetchpatch, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-web"; - version = "0.6.26"; - - src = fetchFromGitHub { - owner = "koute"; - repo = pname; - rev = version; - sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; - }; - - patches = [ - (fetchpatch { - name = "fix-qualified-path.patch"; - url = "https://github.com/koute/cargo-web/commit/c9584542163d60d0aae6d6890509794e838e257f.patch"; - hash = "sha256-w59fXmrszptKt0llqGt0AF+0b3r9N6xUY6zQkpZnemE="; - }) - ]; - - cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA="; - - nativeBuildInputs = [ - openssl - perl - pkg-config - ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; - - meta = with lib; { - description = "Cargo subcommand for the client-side Web"; - mainProgram = "cargo-web"; - homepage = "https://github.com/koute/cargo-web"; - license = with licenses; [ - asl20 # or - mit - ]; - maintainers = with maintainers; [ clevor ]; - }; -} diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index 1eed4d5a569b..a1ed882b2b1f 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { - x86_64-darwin = fetchzip { - sha256 = "sha256-+xZmMc5VOJ2GKvZdR0qDdwj+qze4r7eJFtZuLUkqZwE="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_darwin_amd64.zip"; - }; - aarch64-darwin = fetchzip { - sha256 = "sha256-gIqPWHOl0bcZYmfujV3KnTrsZ8hWjN5KQDWq+aHNIn4="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_darwin_arm64.zip"; - }; - i686-linux = fetchurl { - sha256 = "sha256-HWUTRPkaqk26A2eeN13DUNKBNM+jDBa5UuqjrYzPK5k="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_386.tar.gz"; - }; - x86_64-linux = fetchurl { - sha256 = "sha256-El/IAemoIyOgQYpmI1F84qTFteHT0H3ncYp2WxzZcJY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_amd64.tar.gz"; - }; - aarch64-linux = fetchurl { - sha256 = "sha256-AHsQbTWH1mNafhRtpGY31g89jP07TZnL5fJvS0EbLDU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_arm64.tar.gz"; - }; - armv6l-linux = fetchurl { - sha256 = "sha256-cpCgPLJEkgR0h5pduIEGP+sb58qZTljEeQn/w3Csz2Q="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_armv6.tar.gz"; - }; - armv7l-linux = fetchurl { - sha256 = "sha256-Nm09ih54jZEDMJCBJst43Sl2d6vVXCdFnkWBV4lehns="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_armv7.tar.gz"; - }; +x86_64-darwin = fetchzip { + sha256 = "sha256-uviTmopXz7OYVr4H2M/dFOMw0vD5P+3t5CChSL2HyrE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_amd64.zip"; +}; +aarch64-darwin = fetchzip { + sha256 = "sha256-P9n6H8YmttcZE5E/7nw/Bc+Gzb4nHbs3L/2pgdqUyFw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_arm64.zip"; +}; +i686-linux = fetchurl { + sha256 = "sha256-JPhx1Hqu5o3K4bBulStedLZexCtZhgZNgzvGTqUn3XY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_386.tar.gz"; +}; +x86_64-linux = fetchurl { + sha256 = "sha256-BEqPo3jeLukMnykO+6GNZ93bplDCOcV33BOHleQLWDI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_amd64.tar.gz"; +}; +aarch64-linux = fetchurl { + sha256 = "sha256-JxitRduWdp4uJCcoR7FA26prDIc68CzsFOviehxDRxI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_arm64.tar.gz"; +}; +armv6l-linux = fetchurl { + sha256 = "sha256-TdBDGSny3xWRrMG5MamrN26E/fOf7V9jHvxxbK+7BPU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv6.tar.gz"; +}; +armv7l-linux = fetchurl { + sha256 = "sha256-mrBsebAKSelAMcuurAUiZdPKr2AGi9lnk1Dhz+PAm/0="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv7.tar.gz"; +}; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 63315913b720..d5fcb49a85ff 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.55"; + version = "0.107.56"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/servers/mail/mailpit/source.nix index b8c1f71cf67a..083abca3744e 100644 --- a/pkgs/servers/mail/mailpit/source.nix +++ b/pkgs/servers/mail/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.21.8"; - hash = "sha256-zTVjjd/XmxfVJpQdaFsIl6vDlzU1Hf7szHpnZJBwV3Y="; - npmDepsHash = "sha256-uUzlWReyvCYYTFoPRd6DDUHEPbty99OLmfH4CEVmzU4="; - vendorHash = "sha256-Rxavu9cu5tU4+SQmjh1O8NuLHJFnrcjN75bDYw3FY5Y="; + version = "1.22.0"; + hash = "sha256-cQgBHiUV9Wy9T1FSuaiM26hp/F44JvBmH4NvsEKwD1U="; + npmDepsHash = "sha256-McC7IDIJ6ZOOEFC8fCancAjp8BReJ6tfYN1FfPnaV8I="; + vendorHash = "sha256-WhTYG1Bza5RglhApOqVDZMkPC3K3hVk4l2GdLvstOIc="; } diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index b4996cfb7fde..821e7be598c8 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Y71o+ARi/YB2BRDfEyORbrA9HPvsUlWdh5UjM8hzmcA="; }; - cargoHash = "sha256-Mk+0LKP55Um5YiCx2O49rUZPwaXtKFnWtRC+WPGBadE="; + useFetchCargoVendor = true; + cargoHash = "sha256-bO3KN+ynxNdbnFv1ZHJSSPWd4SxWQGIis3O3Gfba8jw="; passthru = rec { test_client = rustPlatform.buildRustPackage { @@ -25,7 +26,8 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-SBEuFOTgqNjPtKx0PFDA5Gkiksn3cZEmYcs2shAo2Po="; + useFetchCargoVendor = true; + cargoHash = "sha256-bO3KN+ynxNdbnFv1ZHJSSPWd4SxWQGIis3O3Gfba8jw="; meta = meta // { mainProgram = "test_client"; diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix index ee8ea856c939..0746ab26bca4 100644 --- a/pkgs/servers/polaris/default.nix +++ b/pkgs/servers/polaris/default.nix @@ -30,9 +30,8 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = if stdenv.buildPlatform.isDarwin - then "sha256-HTqsghjfSjwOaN/ApPFvWVEoquZzE3MYzULkhUOXIWI" - else "sha256-Z3AbYtdNAyKT5EuGtCktEg0fxs/gpKdsrttRkxZhLAU"; + useFetchCargoVendor = true; + cargoHash = "sha256-bVXz/rSfkmdQlAa3B4zamZebpRBOkch6zNOFiyEQBbY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index e11a548eb4aa..a66390a16e3e 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -91,7 +91,7 @@ buildGoModule rec { '' mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary} '' - + lib.optionalString (!ui) '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform && !ui) '' installShellCompletion --cmd ${binary} \ --bash <($out/bin/${binary} completion bash) \ --fish <($out/bin/${binary} completion fish) \ diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index ff427b7e4fc9..522e21459f34 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -101,6 +101,8 @@ stdenv.mkDerivation rec { "-DWITH_DBUS=OFF" # libselinux is missing propagatedBuildInputs "-DWITH_SELINUX=OFF" + + "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DMKTREE_BACKEND=rootfs" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 453d700f6bb3..92af4d30971c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -205,6 +205,7 @@ mapAliases { cargo-espflash = espflash; cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 cargo-inspect = throw "'cargo-inspect' has been removed due to lack of upstream maintenance. Upstream recommends cargo-expand."; # Added 2025-01-26 + cargo-web = throw "'cargo-web' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; certmgr-selfsigned = certmgr; # Added 2023-11-30 cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd2573b9a0da..1bb34c926c5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4474,17 +4474,11 @@ with pkgs; openrefine = callPackage ../applications/science/misc/openrefine { jdk = jdk17; }; - openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; - openrgb-with-all-plugins = openrgb.withPlugins [ openrgb-plugin-effects openrgb-plugin-hardwaresync ]; - openrgb-plugin-effects = libsForQt5.callPackage ../applications/misc/openrgb-plugins/effects { }; - - openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { }; - toastify = darwin.apple_sdk_11_0.callPackage ../tools/misc/toastify {}; opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {}); @@ -6617,10 +6611,6 @@ with pkgs; ); buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; - cargo-web = callPackage ../development/tools/rust/cargo-web { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; - cargo-flamegraph = callPackage ../development/tools/rust/cargo-flamegraph { inherit (darwin.apple_sdk.frameworks) Security; inherit (linuxPackages) perf; @@ -7494,9 +7484,7 @@ with pkgs; fortran-language-server = python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server { }; - inherit (callPackages ../development/tools/language-servers/nixd { - llvmPackages = llvmPackages_16; - }) nixf nixt nixd; + inherit (callPackages ../development/tools/language-servers/nixd { }) nixf nixt nixd; ansible-later = callPackage ../tools/admin/ansible/later.nix { }; @@ -8283,6 +8271,10 @@ with pkgs; sloc = nodePackages.sloc; + slurm = callPackage ../by-name/sl/slurm/package.nix { + nvml = cudaPackages.cuda_nvml_dev; + }; + snowman = qt5.callPackage ../development/tools/analysis/snowman { }; sparse = callPackage ../development/tools/analysis/sparse { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b63c4eb15741..4705c7848561 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2578,6 +2578,8 @@ self: super: with self; { commonregex = callPackage ../development/python-modules/commonregex { }; + compliance-trestle = callPackage ../development/python-modules/compliance-trestle { }; + complycube = callPackage ../development/python-modules/complycube { }; compreffor = callPackage ../development/python-modules/compreffor { }; @@ -7879,6 +7881,8 @@ self: super: with self; { malduck = callPackage ../development/python-modules/malduck { }; + mallard-ducktype = callPackage ../development/python-modules/mallard-ducktype { }; + mammoth = callPackage ../development/python-modules/mammoth { }; mamba-ssm = callPackage ../development/python-modules/mamba-ssm { }; @@ -17963,6 +17967,8 @@ self: super: with self; { w3lib = callPackage ../development/python-modules/w3lib { }; + wadler-lindig = callPackage ../development/python-modules/wadler-lindig { }; + wadllib = callPackage ../development/python-modules/wadllib { }; wagtail = callPackage ../development/python-modules/wagtail { };