From 5db14cf8998f45ada68681eb3c6742f26333b099 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Feb 2024 06:50:37 +0000 Subject: [PATCH 01/40] plumber: 2.5.2 -> 2.5.3 --- pkgs/by-name/pl/plumber/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix index e306d09cdf35..b786fb65c8e1 100644 --- a/pkgs/by-name/pl/plumber/package.nix +++ b/pkgs/by-name/pl/plumber/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "plumber"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "streamdal"; repo = pname; rev = "v${version}"; - hash = "sha256-ftXLipJQjRdOSNO56rIRfAKKU0kHtAK85hgcT3nYOKA="; + hash = "sha256-0uQYNOmG84kJo6fBZNv4/ua8uVzg2OWOWVFdGIcbm5U="; }; vendorHash = null; From 6ab259abe6ef75509aae434a8132aab0140b4ae8 Mon Sep 17 00:00:00 2001 From: toastal Date: Sat, 27 Jan 2024 16:58:53 +0700 Subject: [PATCH 02/40] =?UTF-8?q?dvtm-unstable:=202018-03-31=20=E2=86=92?= =?UTF-8?q?=20unstable-2021-03-09?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • update to latest revision • prepended "unstable-" to the version as suggested in the Nixpkgs docs • remove merged patch @ Microsoft GitHub #86 • fetch from either Git forge mirror which reflects the documentation > You can always fetch the current code base from the Git repository > located at Github *or* SourceHut. --- pkgs/tools/misc/dvtm/unstable.nix | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/misc/dvtm/unstable.nix b/pkgs/tools/misc/dvtm/unstable.nix index 65e62be07497..4008407f28fa 100644 --- a/pkgs/tools/misc/dvtm/unstable.nix +++ b/pkgs/tools/misc/dvtm/unstable.nix @@ -1,13 +1,18 @@ -{callPackage, fetchFromGitHub, fetchpatch}: +{ callPackage, fetchpatch, fetchzip }: + +let + rev = "7bcf43f8dbd5c4a67ec573a1248114caa75fa3c2"; +in callPackage ./dvtm.nix { pname = "dvtm-unstable"; - version = "2018-03-31"; + version = "unstable-2021-03-09"; - src = fetchFromGitHub { - owner = "martanne"; - repo = "dvtm"; - rev = "311a8c0c28296f8f87fb63349e0f3254c7481e14"; - sha256 = "0pyxjkaxh8n97kccnmd3p98vi9h8mcfy5lswzqiplsxmxxmlbpx2"; + src = fetchzip { + urls = [ + "https://github.com/martanne/dvtm/archive/${rev}.tar.gz" + "https://git.sr.ht/~martanne/dvtm/archive/${rev}.tar.gz" + ]; + hash = "sha256-UtkNsW0mvLfbPSAIIZ1yvX9xzIDtiBeXCjhN2R8JhDc="; }; patches = [ @@ -18,13 +23,5 @@ callPackage ./dvtm.nix { url = "https://github.com/martanne/dvtm/commit/1f1ed664d64603f3f1ce1388571227dc723901b2.patch"; sha256 = "14j3kks7b1v6qq12442v1da3h7khp02rp0vi0qrz0rfgkg1zilpb"; }) - - # https://github.com/martanne/dvtm/pull/86 - # Fix buffer corruption when title is updated - (fetchpatch { - name = "fix-buffer-corruption-on-title-update"; - url = "https://github.com/martanne/dvtm/commit/be6c3f8f615daeab214d484e6fff22e19631a0d1.patch"; - sha256 = "1wdrl3sg815lhs22fwbc4w5dn4ifpdgl7v1kqfnhg752av4im7h7"; - }) ]; } From 1cd94ec0663bdbebc16b59ed3bf249c52c1a24ae Mon Sep 17 00:00:00 2001 From: toastal Date: Sun, 4 Feb 2024 01:45:20 +0700 Subject: [PATCH 03/40] adbuco: patch to use XDG directory scheme by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This eliminates clutter in the user’s $HOME directory --- pkgs/tools/misc/abduco/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 097cfd9170a9..5dc017d57fdc 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, writeText, conf ? null }: stdenv.mkDerivation rec { pname = "abduco"; @@ -17,6 +17,15 @@ stdenv.mkDerivation rec { installFlags = [ "install-completion" ]; CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + patches = [ + # https://github.com/martanne/abduco/pull/22 + (fetchpatch { + name = "use-XDG-directory-scheme-by-default"; + url = "https://github.com/martanne/abduco/commit/0e9a00312ac9777edcb169122144762e3611287b.patch"; + sha256 = "sha256-4NkIflbRkUpS5XTM/fxBaELpvlZ4S5lecRa8jk0XC9g="; + }) + ]; + meta = with lib; { homepage = "http://brain-dump.org/projects/abduco"; license = licenses.isc; From 4c5ada2276ae311d210b4aa262be8b5a59f9f1a8 Mon Sep 17 00:00:00 2001 From: toastal Date: Sun, 4 Feb 2024 02:15:45 +0700 Subject: [PATCH 04/40] aduco: add patch to give exit code on dead session --- pkgs/tools/misc/abduco/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 5dc017d57fdc..85eb225a6eb9 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -24,6 +24,14 @@ stdenv.mkDerivation rec { url = "https://github.com/martanne/abduco/commit/0e9a00312ac9777edcb169122144762e3611287b.patch"; sha256 = "sha256-4NkIflbRkUpS5XTM/fxBaELpvlZ4S5lecRa8jk0XC9g="; }) + + # “fix bug where attaching to dead session won't give underlying exit code” + # https://github.com/martanne/abduco/pull/45 + (fetchpatch { + name = "exit-code-when-attaching-to-dead-session"; + url = "https://github.com/martanne/abduco/commit/972ca8ab949ee342569dbd66b47cc4a17b28247b.patch"; + sha256 = "sha256-8hios0iKYDOmt6Bi5NNM9elTflGudnG2xgPF1pSkHI0="; + }) ]; meta = with lib; { From 79ba445fd570ee4fee28003071afb80e49a0e603 Mon Sep 17 00:00:00 2001 From: toastal Date: Sun, 4 Feb 2024 02:21:29 +0700 Subject: [PATCH 05/40] abduco: add patch to report pixel sizes to child processes --- pkgs/tools/misc/abduco/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 85eb225a6eb9..a551fa0a7ee0 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -32,6 +32,15 @@ stdenv.mkDerivation rec { url = "https://github.com/martanne/abduco/commit/972ca8ab949ee342569dbd66b47cc4a17b28247b.patch"; sha256 = "sha256-8hios0iKYDOmt6Bi5NNM9elTflGudnG2xgPF1pSkHI0="; }) + + # “report pixel sizes to child processes that use ioctl(0, TIOCGWINSZ, ...)” + # used for kitty & other terminals that display images + # https://github.com/martanne/abduco/pull/62 + (fetchpatch { + name = "report-pixel-sizes-to-child-processes"; + url = "https://github.com/martanne/abduco/commit/a1e222308119b3251f00b42e1ddff74a385d4249.patch"; + sha256 = "sha256-eiF0A4IqJrrvXxjBYtltuVNpxQDv/iQPO+K7Y8hWBGg="; + }) ]; meta = with lib; { From f0ccbfb33109ac65d09792cc3df8b5be348c149a Mon Sep 17 00:00:00 2001 From: toastal Date: Sun, 4 Feb 2024 02:29:28 +0700 Subject: [PATCH 06/40] abduco: add mirror, remove recursion > You can always fetch the current code base from the git repository > located at GitHub or SourceHut. The owner says the source code will be offered in two places so the code fetching should reflect the mirror & it adds resiliance. --- pkgs/tools/misc/abduco/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index a551fa0a7ee0..011f186bbbe2 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, writeText, conf ? null }: +{ lib, stdenv, fetchpatch, fetchzip, writeText, conf ? null }: -stdenv.mkDerivation rec { +let + rev = "8c32909a159aaa9484c82b71f05b7a73321eb491"; +in +stdenv.mkDerivation { pname = "abduco"; - version = "2020-04-30"; + version = "unstable-2020-04-30"; - src = fetchFromGitHub { - owner = "martanne"; - repo = "abduco"; - rev = "8c32909a159aaa9484c82b71f05b7a73321eb491"; - sha256 = "0a3p8xljhpk7zh203s75248blfir15smgw5jmszwbmdpy4mqzd53"; + src = fetchzip { + urls = [ + "https://github.com/martanne/abduco/archive/${rev}.tar.gz" + "https://git.sr.ht/~martanne/abduco/archive/${rev}.tar.gz" + ]; + hash = "sha256-o7SPK/G31cW/rrLwV3UJOTq6EBHl6AEE/GdeKGlHdyg="; }; preBuild = lib.optionalString (conf != null) From 7929cc1089f70a04470510d2b6bc0b5a9b85c691 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Fri, 26 Jan 2024 22:38:37 +0100 Subject: [PATCH 07/40] python3.pkgs.fx2: unstable-2023-09-20 -> 0.13 --- pkgs/development/python-modules/fx2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index f89334f8f60e..6991c3f4ab1b 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "fx2"; - version = "unstable-2023-09-20"; + version = "0.13"; format = "setuptools"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = "73fa811818d56a86b82c12e07327946aeddd2b3e"; - hash = "sha256-AGQPOVTdaUCUeVVNQTBmoNvz5CGxcBOK7+oL+X8AcIw="; + rev = "v${version}"; + hash = "sha256-PtWxjT+97+EeNMN36zOT1+ost/w3lRRkaON3Cl3dpp4="; }; nativeBuildInputs = [ sdcc ]; From 62aca06db2d7887022c7bc6c4ebe36aa0ab2faf6 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Fri, 26 Jan 2024 22:22:02 +0100 Subject: [PATCH 08/40] sdcc: 4.2.0 -> 4.4.0 --- pkgs/by-name/sd/sdcc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix index eaac606fbdb7..e8c20ac045c3 100644 --- a/pkgs/by-name/sd/sdcc/package.nix +++ b/pkgs/by-name/sd/sdcc/package.nix @@ -18,11 +18,11 @@ assert lib.subtractLists [ ] excludePorts == []; stdenv.mkDerivation (finalAttrs: { pname = "sdcc"; - version = "4.2.0"; + version = "4.4.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${finalAttrs.version}.tar.bz2"; - hash = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM="; + hash = "sha256-rowSFl6xdoDf9EsyjYh5mWMGtyQe+jqDsuOy0veQanU="; }; outputs = [ "out" "doc" "man" ]; From d1d8dd3e55ee84f188bc543bf262f29da65dde3e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Feb 2024 13:25:54 +0100 Subject: [PATCH 09/40] nixos/knot: add support for XDP setups The Express Data Path (XDP) is a way to circumvent the traditional Linux networking stack and instead run an eBPF program on your NIC, that makes the decision to provide Knot with certain packets. This is way faster and more scalable but comes at the cost of reduced introspection. Unfortunately the `knotc conf-check` command fails hard with missing interfaces or IP addresses configured in `xdp.listen`, so we disable it for now, once the `xdp` config section is set. We also promote the config check condition to a proper option, so our conditions become public documentation, and we allow users to deal with corner cases, that we have not thought of yet. We follow the pre-requisites documented in the Knot 3.3 manual, and set up the required capabilities and allow the AF_XDP address family. But on top of that, due to our strict hardening, we found two more requirements, that were communicated upstream while debugging this. - There is a requirement on AF_NETLINK, likely to query for and configure the relevant network interface - Running eBPF programs requires access to the `bpf` syscall, which we deny through the `~@privileged` configuration. In summary We now conditionally loosen the hardening of the unit once we detect that an XDP configuration is wanted. And since we cannot introspect arbitrary files from the `settingsFiles` option, we expose XDP support through the `enableXDP` toggle option on the module. --- nixos/modules/services/networking/knot.nix | 57 ++++++++++++++++++++-- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix index 94c32586736a..1646e4c491b0 100644 --- a/nixos/modules/services/networking/knot.nix +++ b/nixos/modules/services/networking/knot.nix @@ -113,8 +113,7 @@ let mkConfigFile = configString: pkgs.writeTextFile { name = "knot.conf"; text = (concatMapStringsSep "\n" (file: "include: ${file}") cfg.keyFiles) + "\n" + configString; - # TODO: maybe we could do some checks even when private keys complicate this? - checkPhase = lib.optionalString (cfg.keyFiles == []) '' + checkPhase = lib.optionalString cfg.checkConfig '' ${cfg.package}/bin/knotc --config=$out conf-check ''; }; @@ -144,6 +143,39 @@ in { services.knot = { enable = mkEnableOption (lib.mdDoc "Knot authoritative-only DNS server"); + enableXDP = mkOption { + type = types.bool; + default = lib.hasAttrByPath [ "xdp" "listen" ] cfg.settings; + defaultText = '' + Enabled when the `xdp.listen` setting is configured through `settings`. + ''; + example = true; + description = '' + Extends the systemd unit with permissions to allow for the use of + the eXpress Data Path (XDP). + + ::: {.note} + Make sure to read up on functional [limitations](https://www.knot-dns.cz/docs/latest/singlehtml/index.html#mode-xdp-limitations) + when running in XDP mode. + ::: + ''; + }; + + checkConfig = mkOption { + type = types.bool; + # TODO: maybe we could do some checks even when private keys complicate this? + # conf-check fails hard on missing IPs/devices with XDP + default = cfg.keyFiles == [] && !cfg.enableXDP; + defaultText = '' + Disabled when the config uses `keyFiles` or `enableXDP`. + ''; + example = false; + description = '' + Toggles the configuration test at build time. It runs in a + sandbox, and therefore cannot be used in all scenarios. + ''; + }; + extraArgs = mkOption { type = types.listOf types.str; default = []; @@ -210,7 +242,17 @@ in { wants = [ "network.target" ]; after = ["network.target" ]; - serviceConfig = { + serviceConfig = let + # https://www.knot-dns.cz/docs/3.3/singlehtml/index.html#pre-requisites + xdpCapabilities = lib.optionals (cfg.enableXDP) [ + "CAP_NET_ADMIN" + "CAP_NET_RAW" + "CAP_SYS_ADMIN" + "CAP_IPC_LOCK" + ] ++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "5.11") [ + "CAP_SYS_RESOURCE" + ]; + in { Type = "notify"; ExecStart = "${cfg.package}/bin/knotd --config=${configFile} --socket=${socketFile} ${concatStringsSep " " cfg.extraArgs}"; ExecReload = "${knot-cli-wrappers}/bin/knotc reload"; @@ -219,10 +261,10 @@ in { AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" - ]; + ] ++ xdpCapabilities; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" - ]; + ] ++ xdpCapabilities; DeviceAllow = ""; DevicePolicy = "closed"; LockPersonality = true; @@ -247,6 +289,9 @@ in { "AF_INET" "AF_INET6" "AF_UNIX" + ] ++ lib.optionals (cfg.enableXDP) [ + "AF_NETLINK" + "AF_XDP" ]; RestrictNamespaces = true; RestrictRealtime =true; @@ -258,6 +303,8 @@ in { SystemCallFilter = [ "@system-service" "~@privileged" + ] ++ optionals (cfg.enableXDP) [ + "bpf" ]; UMask = "0077"; }; From 08a775839dc3cf82fb32744d027ae0dbe3391c1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Feb 2024 13:34:06 +0100 Subject: [PATCH 10/40] nixos/tests/knot: test the XDP interface We reconfigure the secondary nameserver VM to do all the same things that it did before, but now over the XDP interface. --- nixos/tests/knot.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix index 44efd93b6fa9..c5af8bf1edcc 100644 --- a/nixos/tests/knot.nix +++ b/nixos/tests/knot.nix @@ -114,13 +114,16 @@ in { services.knot.extraArgs = [ "-v" ]; services.knot.settings = { server = { - listen = [ - "0.0.0.0@53" - "::@53" - ]; automatic-acl = true; }; + xdp = { + listen = [ + "eth1" + ]; + tcp = true; + }; + remote.primary = { address = "192.168.0.1@53"; key = "xfr_key"; @@ -140,7 +143,7 @@ in { "sub.example.com".file = "sub.example.com.zone"; }; - log.syslog.any = "info"; + log.syslog.any = "debug"; }; }; client = { lib, nodes, ... }: { From ec89463a611237052d32fe6da418eb805e11bbeb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 11 Feb 2024 17:07:12 +0100 Subject: [PATCH 11/40] nixos/knot: refactor - Stop using `with lib` - Drop `lib.mdDoc` - Use `escaepSystemdExecArgs` for escaping --- nixos/modules/services/networking/knot.nix | 54 ++++++++++++++++++---- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix index 1646e4c491b0..6488a159b3b7 100644 --- a/nixos/modules/services/networking/knot.nix +++ b/nixos/modules/services/networking/knot.nix @@ -1,8 +1,36 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: -with lib; let + inherit (lib) + attrNames + concatMapStrings + concatMapStringsSep + concatStrings + concatStringsSep + elem + filter + flip + hasAttr + hasPrefix + isAttrs + isBool + isDerivation + isList + mapAttrsToList + mkChangedOptionModule + mkEnableOption + mkIf + mkOption + mkPackageOption + optionals + types + ; + + inherit (utils) + escapeSystemdExecArgs + ; + cfg = config.services.knot; yamlConfig = let @@ -141,7 +169,7 @@ let in { options = { services.knot = { - enable = mkEnableOption (lib.mdDoc "Knot authoritative-only DNS server"); + enable = mkEnableOption "Knot authoritative-only DNS server"; enableXDP = mkOption { type = types.bool; @@ -179,7 +207,7 @@ in { extraArgs = mkOption { type = types.listOf types.str; default = []; - description = lib.mdDoc '' + description = '' List of additional command line parameters for knotd ''; }; @@ -187,7 +215,7 @@ in { keyFiles = mkOption { type = types.listOf types.path; default = []; - description = lib.mdDoc '' + description = '' A list of files containing additional configuration to be included using the include directive. This option allows to include configuration like TSIG keys without @@ -200,7 +228,7 @@ in { settings = mkOption { type = types.attrs; default = {}; - description = lib.mdDoc '' + description = '' Extra configuration as nix values. ''; }; @@ -208,7 +236,7 @@ in { settingsFile = mkOption { type = types.nullOr types.path; default = null; - description = lib.mdDoc '' + description = '' As alternative to ``settings``, you can provide whole configuration directly in the almost-YAML format of Knot DNS. You might want to utilize ``pkgs.writeText "knot.conf" "longConfigString"`` for this. @@ -254,8 +282,14 @@ in { ]; in { Type = "notify"; - ExecStart = "${cfg.package}/bin/knotd --config=${configFile} --socket=${socketFile} ${concatStringsSep " " cfg.extraArgs}"; - ExecReload = "${knot-cli-wrappers}/bin/knotc reload"; + ExecStart = escapeSystemdExecArgs ([ + (lib.getExe cfg.package) + "--config=${configFile}" + "--socket=${socketFile}" + ] ++ cfg.extraArgs); + ExecReload = escapeSystemdExecArgs [ + "${knot-cli-wrappers}/bin/knotc" "reload" + ]; User = "knot"; Group = "knot"; @@ -289,7 +323,7 @@ in { "AF_INET" "AF_INET6" "AF_UNIX" - ] ++ lib.optionals (cfg.enableXDP) [ + ] ++ optionals (cfg.enableXDP) [ "AF_NETLINK" "AF_XDP" ]; From f68c5bb998b47f22f9376b4f735b6e6d10373fef Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 13 Feb 2024 21:00:45 +0000 Subject: [PATCH 12/40] picom-allusive: remove --- .../window-managers/picom/picom-allusive.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/window-managers/picom/picom-allusive.nix diff --git a/pkgs/applications/window-managers/picom/picom-allusive.nix b/pkgs/applications/window-managers/picom/picom-allusive.nix deleted file mode 100644 index e0086142f1c3..000000000000 --- a/pkgs/applications/window-managers/picom/picom-allusive.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ picom, lib, fetchFromGitHub, installShellFiles, pcre }: - -picom.overrideAttrs (oldAttrs: rec { - pname = "picom-allusive"; - version = "1.2.5"; - - src = fetchFromGitHub { - owner = "allusive-dev"; - repo = "picom-allusive"; - rev = version; - hash = "sha256-yM4TJjoVs+i33m/u/oWlx1TDKJrgwlfiGu72DOL/tl8="; - }; - - nativeBuildInputs = [ installShellFiles pcre ] ++ oldAttrs.nativeBuildInputs; - - postInstall = '' - installManPage $src/man/picom.1.gz - '' + (lib.optionalString (oldAttrs ? postInstall) oldAttrs.postInstall); - - meta = (builtins.removeAttrs oldAttrs.meta [ "longDescription" ]) // { - description = "A fork of picom featuring improved animations and other features"; - homepage = "https://github.com/allusive-dev/picom-allusive"; - license = with lib.licenses; [ mit mpl20 ]; - maintainers = with lib.maintainers; [ allusive iogamaster ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d94efa53ea09..20a460de7909 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -824,6 +824,7 @@ mapAliases ({ pharo-spur64 = pharo; # Added 2022-08-03 phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 + picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 # Obsolete PHP version aliases php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b36b4132b3c2..0c8111de497b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36440,8 +36440,6 @@ with pkgs; picom = callPackage ../applications/window-managers/picom { }; - picom-allusive = callPackage ../applications/window-managers/picom/picom-allusive.nix { }; - picom-jonaburg = callPackage ../applications/window-managers/picom/picom-jonaburg.nix { }; picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; From 03ddd6654e74c2343b43e84338b279dc13c2089a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 13 Feb 2024 21:01:23 +0000 Subject: [PATCH 13/40] picom-jonaburg: remove --- .../window-managers/picom/picom-jonaburg.nix | 20 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/applications/window-managers/picom/picom-jonaburg.nix diff --git a/pkgs/applications/window-managers/picom/picom-jonaburg.nix b/pkgs/applications/window-managers/picom/picom-jonaburg.nix deleted file mode 100644 index d04cf5f4ecd6..000000000000 --- a/pkgs/applications/window-managers/picom/picom-jonaburg.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ picom, lib, fetchFromGitHub, pcre }: - -picom.overrideAttrs (oldAttrs: rec { - pname = "picom-jonaburg"; - version = "unstable-2022-03-19"; - src = fetchFromGitHub { - owner = "jonaburg"; - repo = "picom"; - rev = "e3c19cd7d1108d114552267f302548c113278d45"; - sha256 = "sha256-4voCAYd0fzJHQjJo4x3RoWz5l3JJbRvgIXn1Kg6nz6Y="; - }; - - nativeBuildInputs = [ pcre ] ++ oldAttrs.nativeBuildInputs; - - meta = with lib; { - description = "A fork of picom featuring animations and improved rounded corners."; - homepage = "https://github.com/jonaburg/picom"; - maintainers = with maintainers; oldAttrs.meta.maintainers ++ [ michaelBelsanti ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 20a460de7909..6d88b72cfa66 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -825,6 +825,7 @@ mapAliases ({ phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 + picom-jonaburg = throw "picom-jonaburg was removed because it is unmaintained by upstream"; # Added 2024-02-13 # Obsolete PHP version aliases php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c8111de497b..24432cd2c974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36440,8 +36440,6 @@ with pkgs; picom = callPackage ../applications/window-managers/picom { }; - picom-jonaburg = callPackage ../applications/window-managers/picom/picom-jonaburg.nix { }; - picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; xd = callPackage ../applications/networking/p2p/xd { }; From e084adaf44bbf0f4ae8bdfb24b03608fe05cb996 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 13 Feb 2024 21:02:18 +0000 Subject: [PATCH 14/40] picom-next: alias to picom Since picom v11 there is no more reason to keep a separate picom derivation that tracks the `next` branch from upstream since the current release is basically the `next` branch. Also, picom-next right now is pointing to an old commit, so it is clear that nobody is maintaining it updated. If there is a necessity later, we can bring back the picom-next again. --- .../window-managers/picom/picom-next.nix | 35 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/applications/window-managers/picom/picom-next.nix diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix deleted file mode 100644 index 22c748088074..000000000000 --- a/pkgs/applications/window-managers/picom/picom-next.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, fetchFromGitHub -, libXinerama -, pcre -, pcre2 -, picom -, xcbutil -}: - -picom.overrideAttrs (oldAttrs: { - pname = "picom-next"; - version = "unstable-2023-08-03"; - - buildInputs = [ - pcre2 - xcbutil - ] - # remove dependencies that are not used anymore - ++ (lib.subtractLists [ - libXinerama - pcre - ] - oldAttrs.buildInputs); - - src = fetchFromGitHub { - owner = "yshui"; - repo = "picom"; - rev = "5d6957d3da1bf99311a676eab94c69ef4276bedf"; - hash = "sha256-Mzf0533roLSODjMCPKyGSMbP7lIbT+PoLTZfoIBAI6g="; - }; - - meta = oldAttrs.meta // { - maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6d88b72cfa66..6b22af8ae0fc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -826,6 +826,7 @@ mapAliases ({ photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 picom-jonaburg = throw "picom-jonaburg was removed because it is unmaintained by upstream"; # Added 2024-02-13 + picom-next = picom; # Added 2024-02-13 # Obsolete PHP version aliases php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24432cd2c974..1e52adad004d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36440,8 +36440,6 @@ with pkgs; picom = callPackage ../applications/window-managers/picom { }; - picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; - xd = callPackage ../applications/networking/p2p/xd { }; xdaliclock = callPackage ../tools/misc/xdaliclock { }; From 51aca4dadd20e3a0ff4908d3036a73c703e8a0fb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 13 Feb 2024 21:09:05 +0000 Subject: [PATCH 15/40] picom: migrate to by-name --- .../picom/default.nix => by-name/pi/picom/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/window-managers/picom/default.nix => by-name/pi/picom/package.nix} (100%) diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/by-name/pi/picom/package.nix similarity index 100% rename from pkgs/applications/window-managers/picom/default.nix rename to pkgs/by-name/pi/picom/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e52adad004d..d9258076db02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36438,8 +36438,6 @@ with pkgs; x-create-mouse-void = callPackage ../applications/window-managers/x-create-mouse-void { }; - picom = callPackage ../applications/window-managers/picom { }; - xd = callPackage ../applications/networking/p2p/xd { }; xdaliclock = callPackage ../tools/misc/xdaliclock { }; From 4321996a21103c2e1b0cd5426742d49bc55e3a9d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 13 Feb 2024 22:45:54 +0100 Subject: [PATCH 16/40] dolibarr: 18.0.4 -> 18.0.5 Fixes CVE-2024-23817. Changelog: https://github.com/Dolibarr/dolibarr/releases/tag/18.0.5 --- pkgs/servers/web-apps/dolibarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index f689aff626bf..ca3b815eb021 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "18.0.4"; + version = "18.0.5"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-VHLkd8WAyPcfDzmzZl4G1pSTaklC2k0ez/YaZ+ci/1Q="; + hash = "sha256-DMy5GrQ6xKwMqJtJv3IW0CuLVq85pDCF9qJBs+1B5H4="; }; dontBuild = true; From d80a46737dc6e47e9594743ee1c0a01fe1353967 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Feb 2024 12:51:36 +0100 Subject: [PATCH 17/40] python312Packages.catalogue: 2.0.8 -> 2.0.10 Changelog: https://github.com/explosion/catalogue/releases/tag/v2.0.10 --- .../python-modules/catalogue/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index e1c1fed3bfdd..b417dba120f6 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -4,22 +4,27 @@ , pytestCheckHook , pythonAtLeast , pythonOlder +, setuptools , typing-extensions , zipp }: buildPythonPackage rec { pname = "catalogue"; - version = "2.0.8"; - format = "setuptools"; + version = "2.0.10"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-syXHdlkgi/tq8bDZOxoapBEuG7KaTFztgWdYpyLw44g="; + hash = "sha256-T1baqUCRPT8J1YnBkcdOWm1Rdis6njfdU7dDev1s2hU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions zipp From 0194efaf82ace98599db323400f31d6b46bb11f8 Mon Sep 17 00:00:00 2001 From: "Julie B." Date: Wed, 14 Feb 2024 20:58:18 +0100 Subject: [PATCH 18/40] maintainers: rename lourkeur -> bbjubjub, update details --- maintainers/maintainer-list.nix | 15 ++++++--------- maintainers/team-list.nix | 2 +- pkgs/applications/misc/electrum/ltc.nix | 2 +- .../networking/onionshare/default.nix | 2 +- .../version-management/git-aggregator/default.nix | 2 +- .../libraries/ghc_filesystem/default.nix | 2 +- pkgs/development/python-modules/cepa/default.nix | 2 +- .../concurrent-log-handler/default.nix | 2 +- .../python-modules/keyrings-cryptfile/default.nix | 2 +- .../os-specific/linux/teck-udev-rules/default.nix | 2 +- pkgs/tools/misc/uwufetch/default.nix | 2 +- pkgs/tools/networking/hostapd-mana/default.nix | 2 +- pkgs/tools/networking/snowflake/default.nix | 2 +- 13 files changed, 18 insertions(+), 21 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0aefa5a90a5a..93ac2ae6fe2c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2250,6 +2250,12 @@ githubId = 24027; name = "Bruno Bigras"; }; + bbjubjub = { + name = "Julie B."; + email = "julie+nixpkgs@bbjubjub.fr"; + github = "bbjubjub2494"; + githubId = 15657735; + }; bburdette = { email = "bburdette@protonmail.com"; github = "bburdette"; @@ -11067,15 +11073,6 @@ githubId = 4969294; name = "Louis Tim Larsen"; }; - lourkeur = { - name = "Louis Bettens"; - email = "louis@bettens.info"; - github = "lourkeur"; - githubId = 15657735; - keys = [{ - fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; - }]; - }; loveisgrief = { name = "LoveIsGrief"; email = "loveisgrief@tuta.io"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 39c1ddcc33c4..495483032c90 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -176,7 +176,7 @@ with lib.maintainers; { cosmopolitan = { members = [ - lourkeur + bbjubjub tomberek ]; scope = "Maintain the Cosmopolitan LibC and related programs."; diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 844a49974b8f..9b0c63834cfb 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -136,6 +136,6 @@ python3.pkgs.buildPythonApplication { homepage = "https://electrum-ltc.org/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; }; } diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 6cb15ad685d9..af0722a6acd3 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -57,7 +57,7 @@ let homepage = "https://onionshare.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; mainProgram = "onionshare-cli"; }; diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix index 22127c114110..34365cb5d90d 100644 --- a/pkgs/applications/version-management/git-aggregator/default.nix +++ b/pkgs/applications/version-management/git-aggregator/default.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { description = "Manage the aggregation of git branches from different remotes to build a consolidated one"; homepage = "https://github.com/acsone/git-aggregator"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; mainProgram = "gitaggregate"; }; } diff --git a/pkgs/development/libraries/ghc_filesystem/default.nix b/pkgs/development/libraries/ghc_filesystem/default.nix index 3232d7d8f615..8dd65a90e534 100644 --- a/pkgs/development/libraries/ghc_filesystem/default.nix +++ b/pkgs/development/libraries/ghc_filesystem/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "header-only single-file C++ std::filesystem compatible helper library"; homepage = "https://github.com/gulrak/filesystem"; license = licenses.mit; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; }; } diff --git a/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix index ef7850caf211..5e28aca3c642 100644 --- a/pkgs/development/python-modules/cepa/default.nix +++ b/pkgs/development/python-modules/cepa/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Controller library that allows applications to interact with Tor"; homepage = "https://github.com/onionshare/cepa"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; }; } diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix index 7890eda6b465..85ee8bda114e 100644 --- a/pkgs/development/python-modules/concurrent-log-handler/default.nix +++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Python logging handler that allows multiple processes to safely write to the same log file concurrently"; homepage = "https://pypi.org/project/concurrent-log-handler"; license = licenses.asl20; - maintainers = [ maintainers.lourkeur ]; + maintainers = [ maintainers.bbjubjub ]; }; } diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix index f15e65a32b57..6265ef7bb756 100644 --- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/frispete/keyrings.cryptfile"; changelog = "https://github.com/frispete/keyrings.cryptfile/blob/v${version}/CHANGES.md"; license = licenses.mit; - maintainers = [ maintainers.lourkeur ]; + maintainers = [ maintainers.bbjubjub ]; }; } diff --git a/pkgs/os-specific/linux/teck-udev-rules/default.nix b/pkgs/os-specific/linux/teck-udev-rules/default.nix index eec5eac344ef..e0beb09e02ee 100644 --- a/pkgs/os-specific/linux/teck-udev-rules/default.nix +++ b/pkgs/os-specific/linux/teck-udev-rules/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "udev rules for TECK keyboards"; inherit (teck-programmer.meta) license; - maintainers = [ lib.maintainers.lourkeur ]; + maintainers = [ lib.maintainers.bbjubjub ]; }; } diff --git a/pkgs/tools/misc/uwufetch/default.nix b/pkgs/tools/misc/uwufetch/default.nix index a7241e6488be..d0ae239d9ec2 100644 --- a/pkgs/tools/misc/uwufetch/default.nix +++ b/pkgs/tools/misc/uwufetch/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/TheDarkBug/uwufetch"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; mainProgram = "uwufetch"; }; } diff --git a/pkgs/tools/networking/hostapd-mana/default.nix b/pkgs/tools/networking/hostapd-mana/default.nix index 56527fb15531..2ca826314c57 100644 --- a/pkgs/tools/networking/hostapd-mana/default.nix +++ b/pkgs/tools/networking/hostapd-mana/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sensepost/hostapd-mana"; description = "A featureful rogue wifi access point tool"; license = licenses.bsd3; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index 556a3101cb65..cac350ff597a 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { description = "System to defeat internet censorship"; homepage = "https://snowflake.torproject.org/"; changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/raw/v${version}/ChangeLog"; - maintainers = with maintainers; [ lourkeur yayayayaka ]; + maintainers = with maintainers; [ bbjubjub yayayayaka ]; license = licenses.bsd3; }; } From 80feb21628e7ed3a3641359ea241b604352b1278 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Feb 2024 21:07:40 +0000 Subject: [PATCH 19/40] trufflehog: 3.67.5 -> 3.67.6 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index cfb6fb85b82b..c986dbab98cf 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.67.5"; + version = "3.67.6"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-163tIYqWUvfbN4Vh+nqQ98nHHFwEg0esJplBB5ivqOY="; + hash = "sha256-LKnFlgMbgp47mNkER+gE4PwEpqBY1txmhDpmcPCXH24="; }; - vendorHash = "sha256-Kp78cAg3zpxZkJlVAvaxbq6GvUH/4HTH6Xz9EIo9tc0="; + vendorHash = "sha256-/DKly5ZFrySYrjGywjsyQd5Ky1bQ+ZIJll0io6XC5+s="; ldflags = [ "-s" From 51e0677d8bd313b0359d6be9353100292cc70c2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Feb 2024 22:39:19 +0100 Subject: [PATCH 20/40] python311Packages.boschshcpy: 0.2.89 -> 0.2.90 Diff: https://github.com/tschamm/boschshcpy/compare/refs/tags/0.2.89...0.2.90 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 0fcf45b717ea..f3fda2ef3c8b 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.89"; + version = "0.2.90"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = "boschshcpy"; rev = "refs/tags/${version}"; - hash = "sha256-/BZz666b2qZ6Dzkw+l1OpoMP+MIsFzhohNutzZMooNQ="; + hash = "sha256-qI8fpQJ7fyZ6CX010cyPuoFj9UQM+jHOJ201GCjIwBU="; }; nativeBuildInputs = [ From d3514edb27a63d1e39014fdbbb02876d7f7481be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Feb 2024 22:42:18 +0100 Subject: [PATCH 21/40] python311Packages.growattserver: refactor --- pkgs/development/python-modules/growattserver/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 1c7e12fab2e7..83fb6de6fe65 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -3,12 +3,13 @@ , fetchFromGitHub , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "growattserver"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-V0EW3I0FIDx9urbxX/zh3A51B/BiDqUfsrKbKU9FKiE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; From 71a06d6afb938071b9d8b979c7d14d019d6e348a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Feb 2024 22:42:44 +0100 Subject: [PATCH 22/40] python311Packages.growattserver: 1.4.0 -> 1.5.0 Diff: https://github.com/indykoning/PyPi_GrowattServer/compare/refs/tags/1.4.0...1.5.0 Changelog: https://github.com/indykoning/PyPi_GrowattServer/releases/tag/1.5.0 --- pkgs/development/python-modules/growattserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 83fb6de6fe65..1cd8d8e735d4 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = "refs/tags/${version}"; - hash = "sha256-V0EW3I0FIDx9urbxX/zh3A51B/BiDqUfsrKbKU9FKiE="; + hash = "sha256-ATxXjIF5QRsdLuXZCOWMwvbBzawrhlYZ+wodITz36sE="; }; nativeBuildInputs = [ From c3d62a3650223c5d809c8fb2a05788b9160f17b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Feb 2024 23:06:37 +0100 Subject: [PATCH 23/40] python311Packages.hishel: 0.0.22 -> 0.0.24 Changelog: https://github.com/karpetrosyan/hishel/blob/0.0.24/CHANGELOG.md --- pkgs/development/python-modules/hishel/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index de75f1e46b17..4f8dae862c55 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -1,10 +1,12 @@ { lib , anysqlite +, boto3 , buildPythonPackage , fetchFromGitHub , hatch-fancy-pypi-readme , hatchling , httpx +, moto , pytest-asyncio , pytestCheckHook , pythonOlder @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.22"; + version = "0.0.24"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-2GboU1J0jvZUz20+KpDYnfDqc+qi0tmlypbWeOoYjX0="; + hash = "sha256-wup1rQ5MHjsBaTdfueP9y7QhutoO0xYeexZPDQpUEJk="; }; nativeBuildInputs = [ @@ -40,6 +42,9 @@ buildPythonPackage rec { redis = [ redis ]; + s3 = [ + boto3 + ]; sqlite = [ anysqlite ]; @@ -49,6 +54,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + moto pytest-asyncio pytestCheckHook trio From 56b61a15e66a2c986ea88a3b0b173f203b6516da Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 14 Feb 2024 22:22:48 +0000 Subject: [PATCH 24/40] btrfs-progs: 6.7 -> 6.7.1 Changes: https://github.com/kdave/btrfs-progs/releases/tag/v6.7.1 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index ef3ba227ea6b..6f154f7aeeca 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.7"; + version = "6.7.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-wn91UYW58tqzH0LoowPTa+0qPzNBzG117migplCiR2c="; + hash = "sha256-JNx7l08KV7oOyoD5dEC4QN+oWw8cssAb39l2WaSAsgA="; }; nativeBuildInputs = [ From 66be3ae85647363b4e780231d7ed3745e73aabb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Feb 2024 23:18:30 +0000 Subject: [PATCH 25/40] bdf2psf: 1.223 -> 1.225 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 268b877629d8..2d25464ad304 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.223"; + version = "1.225"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-T9tj91mLB3PNRmJs75ohGjvBt1C5wotQr++MCdmyWBI="; + sha256 = "sha256-QEu1USgoOrFE2dHWodfg0nu4HM5C3V/pcpBIKIRuZuQ="; }; nativeBuildInputs = [ dpkg ]; From 78d6ad3b20b76cb27d973583f005606cae3e4cb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Feb 2024 23:37:29 +0000 Subject: [PATCH 26/40] fastly: 10.8.0 -> 10.8.1 --- pkgs/misc/fastly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 3a1efa9c15be..7cf40d1265c3 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.8.0"; + version = "10.8.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-XlfTtA4jYFrs1W8pyulkqbhrRt8vS+oPB/g9/tIW8Ws="; + hash = "sha256-iT4pLzuIXlijQhFzIi5S+Gt6py9cZKTDs7/49Rs/+GI="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-sN6kJspIG3XKW71sTjINE+hoWHNbd8ZmVEXNcvuvThg="; + vendorHash = "sha256-EzryGtjLwxyqjVt544LFBEO8T3Shte60C8RO0Uo2Boc="; nativeBuildInputs = [ installShellFiles From bf65cfb3adfd569d19f69cf4eb125ee225c93903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Feb 2024 23:58:19 +0000 Subject: [PATCH 27/40] okteto: 2.25.1 -> 2.25.2 --- pkgs/development/tools/okteto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 1c7ba093b6aa..c604d997ef26 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.25.1"; + version = "2.25.2"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-HBXp66chq+SzdEb463awolf4Uv0ScHN6MjoziYyh4kA="; + hash = "sha256-6ss1dWHgvsp56Ua2AejJsLC5j7de7iW80m785+F9Ur4="; }; vendorHash = "sha256-+Adnveutg8soqK2Zwn2SNq7SEHd/Z91diHbPYHrGVrA="; From cb1b73c031ca4b9a13689af6b8353f926ea01507 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Feb 2024 03:27:49 +0000 Subject: [PATCH 28/40] erlang_24: 24.3.4.15 -> 24.3.4.16 --- pkgs/development/interpreters/erlang/24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/24.nix b/pkgs/development/interpreters/erlang/24.nix index 175640601e9a..4e7df413bb39 100644 --- a/pkgs/development/interpreters/erlang/24.nix +++ b/pkgs/development/interpreters/erlang/24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.15"; - sha256 = "sha256-1a/5jxTLDWlQHEMfKZoAO3wrg1U0wYBf+xXhyO/EnXA="; + version = "24.3.4.16"; + sha256 = "sha256-oLfidJPgWTz7AsJz+C4adXnxcow8C/M828os6aB4Z/c="; } From d41e5c00b42c7746b9d31a8ee18f04f944adcf96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Feb 2024 04:10:24 +0000 Subject: [PATCH 29/40] ibus-engines.typing-booster-unwrapped: 2.25.0 -> 2.25.1 --- .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 104cb7b5009f..3c05cc5cf06c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.25.0"; + version = "2.25.1"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-YGlXdnV2ugssEEccrm1nlylVoZwTspywp1VKawqVkGw="; + hash = "sha256-/FmmcEDmN03+lE3+nmIk8PCnpjQMFQBPtijSYiAfCmk="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; From bb208b22ab7a94d2f785eaaa3aa63148bfbc0f9a Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Wed, 24 Jan 2024 19:46:21 +0000 Subject: [PATCH 30/40] terra: llvmPackages_11 -> llvmPackages remove reference to llvmPackages_11 in preparation to drop LLVM11 Disable on linux aarch64 as it can not use llvm above 11 --- pkgs/development/compilers/terra/default.nix | 21 +++++++++++++++----- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index d53441a583c3..3f6934f04212 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, llvmPackages, ncurses, cmake, libxml2 , symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false -, libobjc, Cocoa, Foundation +, libffi, libobjc, libpfm, Cocoa, Foundation }: let @@ -42,16 +42,25 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmMerged ncurses libxml2 ] + buildInputs = [ llvmMerged ncurses libffi libxml2 ] ++ lib.optionals enableCUDA [ cuda ] + ++ lib.optional (!stdenv.isDarwin) libpfm ++ lib.optionals stdenv.isDarwin [ libobjc Cocoa Foundation ]; - cmakeFlags = [ + cmakeFlags = let + resourceDir = "${llvmMerged}/lib/clang/" + ( + if lib.versionOlder clangVersion "16" + then + clangVersion + else + lib.versions.major clangVersion + ); + in [ "-DHAS_TERRA_VERSION=0" "-DTERRA_VERSION=${version}" "-DTERRA_LUA=luajit" "-DTERRA_SKIP_LUA_DOWNLOAD=ON" - "-DCLANG_RESOURCE_DIR=${llvmMerged}/lib/clang/${clangVersion}" + "-DCLANG_RESOURCE_DIR=${resourceDir}" ] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON"; doCheck = true; @@ -88,6 +97,8 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ]; license = licenses.mit; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + # Linux Aarch64 broken above LLVM11 + # https://github.com/terralang/terra/issues/597 + broken = stdenv.isAarch64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47d842460f08..7fe378951a26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17224,7 +17224,6 @@ with pkgs; tbb = tbb_2020_3; terra = callPackage ../development/compilers/terra { - llvmPackages = llvmPackages_11; inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; }; From 3d538ec73cafc673a71c47a4b574b7b2e13693e9 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 14 Feb 2024 20:09:13 +0300 Subject: [PATCH 31/40] qt6: 6.6.1 -> 6.6.2 Refresh some patches, drop some more patches --- pkgs/development/libraries/qt-6/default.nix | 10 - pkgs/development/libraries/qt-6/fetch.sh | 2 +- .../libraries/qt-6/modules/qtmqtt.nix | 6 +- .../libraries/qt-6/modules/qtwayland.nix | 9 - .../libraries/qt-6/modules/qtwebengine.nix | 4 - ...-qtbase-qmake-fix-mkspecs-for-darwin.patch | 18 +- ...se-allow-translations-outside-prefix.patch | 13 +- .../patches/qtwebengine-libxml-2.12.patch | 29 -- pkgs/development/libraries/qt-6/srcs.nix | 314 +++++++++--------- 9 files changed, 175 insertions(+), 230 deletions(-) delete mode 100644 pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index a1d597adcd1d..3f1cf19c29ab 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -66,16 +66,6 @@ let revert = true; hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A="; }) - # CVE-2023-51714: Potential Integer Overflow in Qt's HTTP2 implementation - # https://www.qt.io/blog/security-advisory-potential-integer-overflow-in-qts-http2-implementation - (fetchpatch2 { - url = "https://download.qt.io/official_releases/qt/6.5/0001-CVE-2023-51714-qtbase-6.5.diff"; - hash = "sha256-0Xnolq9dWkKUrmLUlv15uQ9nkZXrY3AsmvChaLX8P2I="; - }) - (fetchpatch2 { - url = "https://download.qt.io/official_releases/qt/6.6/0002-CVE-2023-51714-qtbase-6.6.diff"; - hash = "sha256-+/u3vy5Ci6Z4jy00L07iYAnqHvVdqUzqVnT9uVIqs60="; - }) ]; }; env = callPackage ./qt-env.nix { }; diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 13ff1bef65a1..d7ef146a1957 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.2/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index bd8c0983282b..a9660b73710b 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,12 +5,14 @@ qtModule rec { pname = "qtmqtt"; - version = "6.6.1"; + version = "6.6.2"; + src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-6jQrUT1wLk6rhDIns0ubdUCZ7e/m38Oqvl8c1/sfWxI="; + hash = "sha256-R8B7Vt/XzI7+17DDZ+TVbqfGKdEfUMiLa1BqzIbo4OM="; }; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index de13977304e2..b5f1c71fdd75 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -4,7 +4,6 @@ , wayland , pkg-config , libdrm -, fetchpatch }: qtModule { @@ -12,12 +11,4 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; - patches = [ - # Fix potential crash issues when some submenus are expanded - # https://codereview.qt-project.org/c/qt/qtwayland/+/519344/ - (fetchpatch { - url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=aae65c885d8e38d8abc2959cded7b5e9e5fc88b3"; - hash = "sha256-FD1VaiTgl9Z1y+5EDpWYShM1ULoFdET86FoFfqDmjyo="; - }) - ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 068c04b4c89e..64b5b9738caa 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -134,10 +134,6 @@ qtModule { # Override locales install path so they go to QtWebEngine's $out ../patches/qtwebengine-locales-path.patch - - # Cherry-pick libxml 2.12 build fix - # FIXME: remove for 6.7 - ../patches/qtwebengine-libxml-2.12.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch index d7b41691370e..6cdbec5abfc7 100644 --- a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch @@ -13,7 +13,7 @@ Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin 6 files changed, 1 insertion(+), 415 deletions(-) diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b22..9909dae7260 100644 +index 61bea952b2..9909dae726 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -26,7 +26,7 @@ index 61bea952b22..9909dae7260 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index f364716717c..3b40328304d 100644 +index 0b64a586b9..3b40328304 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,9 +1,5 @@ @@ -39,12 +39,13 @@ index f364716717c..3b40328304d 100644 contains(TEMPLATE, .*app) { !macx-xcode:if(isEmpty(BUILDS)|build_pass) { # Detect changes to the platform SDK -@@ -15,269 +11,10 @@ contains(TEMPLATE, .*app) { +@@ -15,270 +11,10 @@ contains(TEMPLATE, .*app) { QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) } - - # Detect incompatible SDK versions +- # The CMake equivalent is in cmake/QtPublicAppleHelpers.cmake. - - isEmpty(QT_MAC_SDK_VERSION_MIN): \ - QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION @@ -310,7 +311,7 @@ index f364716717c..3b40328304d 100644 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a56..3b01424e67b 100644 +index e3534561a5..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -1,60 +1,2 @@ @@ -375,7 +376,7 @@ index e3534561a56..3b01424e67b 100644 -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index a32ceacb6ce..e69de29bb2d 100644 +index a32ceacb6c..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk @@ -1,27 +0,0 @@ @@ -407,7 +408,7 @@ index a32ceacb6ce..e69de29bb2d 100644 - endif -endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bbe..e69de29bb2d 100644 +index 3a9c2778bb..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -1,61 +0,0 @@ @@ -473,7 +474,7 @@ index 3a9c2778bbe..e69de29bb2d 100644 - cache($$tool_variable, set stash, $$tool) -} diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -index df191eb13c4..e69de29bb2d 100644 +index df191eb13c..e69de29bb2 100644 --- a/mkspecs/features/mac/toolchain.prf +++ b/mkspecs/features/mac/toolchain.prf @@ -1,5 +0,0 @@ @@ -482,6 +483,3 @@ index df191eb13c4..e69de29bb2d 100644 -sdk: load(sdk) - -load(toolchain) --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch b/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch index 40812599bb99..07f1973d7607 100644 --- a/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch +++ b/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch @@ -7,11 +7,11 @@ Subject: [PATCH 08/11] qtbase: allow translations outside prefix cmake/QtBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake -index 1dc576d27af..4348eb97c37 100644 ---- a/cmake/QtBuild.cmake -+++ b/cmake/QtBuild.cmake -@@ -30,7 +30,7 @@ function(qt_configure_process_path name default docstring) +diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake +index edc43f2f14..78fa219515 100644 +--- a/cmake/QtBuildPathsHelpers.cmake ++++ b/cmake/QtBuildPathsHelpers.cmake +@@ -134,7 +134,7 @@ function(qt_configure_process_path name default docstring) set(rel_path ".") elseif(rel_path MATCHES "^\.\./") # INSTALL_SYSCONFDIR is allowed to be outside the prefix. @@ -20,6 +20,3 @@ index 1dc576d27af..4348eb97c37 100644 message(FATAL_ERROR "Path component '${name}' is outside computed install prefix: ${rel_path} ") return() --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch deleted file mode 100644 index 3c3d59b488da..000000000000 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h -@@ -77,7 +77,12 @@ class XSLTProcessor final : public ScriptWrappable { - - void reset(); - -+#if LIBXML_VERSION >= 21200 -+ static void ParseErrorFunc(void* user_data, const xmlError*); -+#else - static void ParseErrorFunc(void* user_data, xmlError*); -+#endif -+ - static void GenericErrorFunc(void* user_data, const char* msg, ...); - - // Only for libXSLT callbacks ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -@@ -66,7 +66,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) { - // It would be nice to do something with this error message. - } - -+#if LIBXML_VERSION >= 21200 -+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { -+#else - void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { -+#endif - FrameConsole* console = static_cast(user_data); - if (!console) - return; diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index 61b73c649dfa..5fef072f3990 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -1,318 +1,318 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6/fetch.sh { fetchurl, mirror }: { qt3d = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qt3d-everywhere-src-6.6.1.tar.xz"; - sha256 = "0a9j8k1561hgsigpf3k5h9p788pab7lb38q7yrl1r9ql9zbsx17k"; - name = "qt3d-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qt3d-everywhere-src-6.6.2.tar.xz"; + sha256 = "10l5ldw8g8m1ig3hh78pwg749xqf2gw9vsi8p67gbkanmipfqx4i"; + name = "qt3d-everywhere-src-6.6.2.tar.xz"; }; }; qt5compat = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qt5compat-everywhere-src-6.6.1.tar.xz"; - sha256 = "1wn13filgwz9lh0jj7w8i9ma53vw4mbxj2c1421j65x4xnv1a78f"; - name = "qt5compat-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qt5compat-everywhere-src-6.6.2.tar.xz"; + sha256 = "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0"; + name = "qt5compat-everywhere-src-6.6.2.tar.xz"; }; }; qtactiveqt = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtactiveqt-everywhere-src-6.6.1.tar.xz"; - sha256 = "1v6g0hg5qfbvbvr9k5sn02l556c5mnnnak0bm1yrgqyw85qg2l4r"; - name = "qtactiveqt-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtactiveqt-everywhere-src-6.6.2.tar.xz"; + sha256 = "16vqb33s0dwxq1rrha81606fdwq1dz7az6mybgx18n7f081h3yl7"; + name = "qtactiveqt-everywhere-src-6.6.2.tar.xz"; }; }; qtbase = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz"; - sha256 = "1xq2kpawq1f9qa3dzjcl1bl6h039807pykcm0znl1zmjfx35n325"; - name = "qtbase-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz"; + sha256 = "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq"; + name = "qtbase-everywhere-src-6.6.2.tar.xz"; }; }; qtcharts = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtcharts-everywhere-src-6.6.1.tar.xz"; - sha256 = "1dii5amdzpm65mq1yz7w1aql95yi0dshm06s62yf3dr68nlwlmhi"; - name = "qtcharts-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtcharts-everywhere-src-6.6.2.tar.xz"; + sha256 = "1x7m87lxbza4ynf6dq7yshann6003302a5fxih5l5d07xri64j5i"; + name = "qtcharts-everywhere-src-6.6.2.tar.xz"; }; }; qtconnectivity = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtconnectivity-everywhere-src-6.6.1.tar.xz"; - sha256 = "0i86iqjx8z6qymbmilrmr2d67piinwlr2pkcfj1zjks69538sijv"; - name = "qtconnectivity-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtconnectivity-everywhere-src-6.6.2.tar.xz"; + sha256 = "1dzsvs0hngrz6b66r9zb4al5a4r6xxfd29i8g3jqmvw3b0452vx3"; + name = "qtconnectivity-everywhere-src-6.6.2.tar.xz"; }; }; qtdatavis3d = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtdatavis3d-everywhere-src-6.6.1.tar.xz"; - sha256 = "18hvlz8l55jzhpp1ph1slj472l65pk3qdhmhib6gybi2iv6kpp5r"; - name = "qtdatavis3d-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtdatavis3d-everywhere-src-6.6.2.tar.xz"; + sha256 = "0iqw5afx8y29kjprn1hlz0zr0qwc9j0m7my75qf1av800hlnnjii"; + name = "qtdatavis3d-everywhere-src-6.6.2.tar.xz"; }; }; qtdeclarative = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtdeclarative-everywhere-src-6.6.1.tar.xz"; - sha256 = "0p4r12v9ih1l9cnbw0am878kjfpr3f6whkamx564cn36iqrxgzvy"; - name = "qtdeclarative-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtdeclarative-everywhere-src-6.6.2.tar.xz"; + sha256 = "0k6qndjvkkx3g8lr7f64xx86b3cwxzkgpl6fr6cp73s6qjkyk763"; + name = "qtdeclarative-everywhere-src-6.6.2.tar.xz"; }; }; qtdoc = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtdoc-everywhere-src-6.6.1.tar.xz"; - sha256 = "0ndh1if6886m9z9kc2aa02q135ar0rmy4vgln4rkr3lyx4jaajwl"; - name = "qtdoc-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtdoc-everywhere-src-6.6.2.tar.xz"; + sha256 = "0hvv40y2h7xa7wj2cqz2rrsvy1xf2l95199vmgx4q27wgmn1xixg"; + name = "qtdoc-everywhere-src-6.6.2.tar.xz"; }; }; qtgraphs = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtgraphs-everywhere-src-6.6.1.tar.xz"; - sha256 = "0xv4alb93rdqzbhhvvhg2miwjyax81pf9n4p5irlcg2xrw1qv5n8"; - name = "qtgraphs-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtgraphs-everywhere-src-6.6.2.tar.xz"; + sha256 = "19j9hdpxrclsdwqqblp4bk94zd2a5rvxnf548hm7r03npznjvb26"; + name = "qtgraphs-everywhere-src-6.6.2.tar.xz"; }; }; qtgrpc = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtgrpc-everywhere-src-6.6.1.tar.xz"; - sha256 = "1k7hv2f1s628rfls2klxvd0b2rb304pysbcvvqfrwkkv4ys4akhw"; - name = "qtgrpc-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtgrpc-everywhere-src-6.6.2.tar.xz"; + sha256 = "1flfm8j5vw2j6xzms1b470mbqyab1nrnj4z9s4mgwnbsp4m5p85w"; + name = "qtgrpc-everywhere-src-6.6.2.tar.xz"; }; }; qthttpserver = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qthttpserver-everywhere-src-6.6.1.tar.xz"; - sha256 = "0k0jhgxfqq0l3jhrf5qyd38achvvv8x4zvx4jw0jl00m5zsv7zhv"; - name = "qthttpserver-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qthttpserver-everywhere-src-6.6.2.tar.xz"; + sha256 = "1qzw96y20qr1kc9wmys61wm568jsknvlgvh09bbqjcmm6dm3lhd2"; + name = "qthttpserver-everywhere-src-6.6.2.tar.xz"; }; }; qtimageformats = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtimageformats-everywhere-src-6.6.1.tar.xz"; - sha256 = "13qqj8251l9885mcaafg6plxcza4vd7sdkv2wrdkfbh7a24x0kmc"; - name = "qtimageformats-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtimageformats-everywhere-src-6.6.2.tar.xz"; + sha256 = "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i"; + name = "qtimageformats-everywhere-src-6.6.2.tar.xz"; }; }; qtlanguageserver = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtlanguageserver-everywhere-src-6.6.1.tar.xz"; - sha256 = "0vrywwjg5d2fx2kpjxmi6cm8vffpf0zg63zi3n9dz2d90db1yxmh"; - name = "qtlanguageserver-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtlanguageserver-everywhere-src-6.6.2.tar.xz"; + sha256 = "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3"; + name = "qtlanguageserver-everywhere-src-6.6.2.tar.xz"; }; }; qtlocation = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtlocation-everywhere-src-6.6.1.tar.xz"; - sha256 = "0acwkwcr5dixhwhd102kmh5yq4y3wk1kddfdb8ychy3jwdi2pgld"; - name = "qtlocation-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtlocation-everywhere-src-6.6.2.tar.xz"; + sha256 = "05glwmasg0rlhybzpb640iibcs6gyrqbs7h1ws4b5vgcmzzdq9cy"; + name = "qtlocation-everywhere-src-6.6.2.tar.xz"; }; }; qtlottie = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtlottie-everywhere-src-6.6.1.tar.xz"; - sha256 = "1j4zl2yz9pybh21wscfr56pahfrn4fnkvxdhkz03d2gpcj9hbjs9"; - name = "qtlottie-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtlottie-everywhere-src-6.6.2.tar.xz"; + sha256 = "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7"; + name = "qtlottie-everywhere-src-6.6.2.tar.xz"; }; }; qtmultimedia = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtmultimedia-everywhere-src-6.6.1.tar.xz"; - sha256 = "0jnvc09msjqr2zbyjj7fgilf7zg3sdldbppnj8b9c52pdwly5r3y"; - name = "qtmultimedia-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtmultimedia-everywhere-src-6.6.2.tar.xz"; + sha256 = "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572"; + name = "qtmultimedia-everywhere-src-6.6.2.tar.xz"; }; }; qtnetworkauth = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtnetworkauth-everywhere-src-6.6.1.tar.xz"; - sha256 = "0j8dq10wq6y02cz4lkqw60nqi600qr9ssb36n74mywr2bfa12gk9"; - name = "qtnetworkauth-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtnetworkauth-everywhere-src-6.6.2.tar.xz"; + sha256 = "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j"; + name = "qtnetworkauth-everywhere-src-6.6.2.tar.xz"; }; }; qtpositioning = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtpositioning-everywhere-src-6.6.1.tar.xz"; - sha256 = "1f0n721k4w6jiva8hhgpd29im2h5vsd2ypfbk1j53f0j7czwgnix"; - name = "qtpositioning-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtpositioning-everywhere-src-6.6.2.tar.xz"; + sha256 = "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd"; + name = "qtpositioning-everywhere-src-6.6.2.tar.xz"; }; }; qtquick3d = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquick3d-everywhere-src-6.6.1.tar.xz"; - sha256 = "08l4rsw7v0xvdmpm80wpxy74798j70r37853hdgipmi34bp0058m"; - name = "qtquick3d-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquick3d-everywhere-src-6.6.2.tar.xz"; + sha256 = "0f1sp7d1jzdzaxqs2l2yjprp0axcqbg2w82dza7wl4paan4rzp7w"; + name = "qtquick3d-everywhere-src-6.6.2.tar.xz"; }; }; qtquick3dphysics = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquick3dphysics-everywhere-src-6.6.1.tar.xz"; - sha256 = "0np14lkvc3y0y896m9f754pfi83k5jnmg5i76kgfc7bvipsvbiic"; - name = "qtquick3dphysics-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquick3dphysics-everywhere-src-6.6.2.tar.xz"; + sha256 = "10209x9hbr5bc4vlhhcvvfsmsn2h3dyb4rlg0f0gpllx68mr58ac"; + name = "qtquick3dphysics-everywhere-src-6.6.2.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquickeffectmaker-everywhere-src-6.6.1.tar.xz"; - sha256 = "0lr6vms6vrmaki4ssmclsxi8xp3qnysgygqgn83vg727qx9hj65c"; - name = "qtquickeffectmaker-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquickeffectmaker-everywhere-src-6.6.2.tar.xz"; + sha256 = "0lywm71wp943dk3w8zkklyxfk97w48v670zs6pc4pj4ja0ns37q7"; + name = "qtquickeffectmaker-everywhere-src-6.6.2.tar.xz"; }; }; qtquicktimeline = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquicktimeline-everywhere-src-6.6.1.tar.xz"; - sha256 = "0s71zycq3l9px8hig8g229ln91h9czhxvvbj6zmmnhkx694gaq1q"; - name = "qtquicktimeline-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquicktimeline-everywhere-src-6.6.2.tar.xz"; + sha256 = "06cr9p0hrq77ckqslxh0h3lpyw31fblyap1plcyyj8ssr1rm4klc"; + name = "qtquicktimeline-everywhere-src-6.6.2.tar.xz"; }; }; qtremoteobjects = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtremoteobjects-everywhere-src-6.6.1.tar.xz"; - sha256 = "16cmzc3cssfvqhvhc7lphbha00mdb1qykk877shgrh4bzyc5i7mq"; - name = "qtremoteobjects-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtremoteobjects-everywhere-src-6.6.2.tar.xz"; + sha256 = "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa"; + name = "qtremoteobjects-everywhere-src-6.6.2.tar.xz"; }; }; qtscxml = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtscxml-everywhere-src-6.6.1.tar.xz"; - sha256 = "15q8vlhd9yz33bdhm7md426a33px4dg8sa14ckirk4rryixcajw7"; - name = "qtscxml-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtscxml-everywhere-src-6.6.2.tar.xz"; + sha256 = "0gm4805570ds3jmkbwrjigbg93zc561bd5rc52r71042zzq84j89"; + name = "qtscxml-everywhere-src-6.6.2.tar.xz"; }; }; qtsensors = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtsensors-everywhere-src-6.6.1.tar.xz"; - sha256 = "1lwr6xw4flzcqvb017wl9g8p5yamf0z4zqx2wp4rmhrgbj0yw4xx"; - name = "qtsensors-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtsensors-everywhere-src-6.6.2.tar.xz"; + sha256 = "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa"; + name = "qtsensors-everywhere-src-6.6.2.tar.xz"; }; }; qtserialbus = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtserialbus-everywhere-src-6.6.1.tar.xz"; - sha256 = "1b7pkvs131vqls4bahqkwgnbrnb8pcrnii47ww2c589h1dimw52w"; - name = "qtserialbus-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtserialbus-everywhere-src-6.6.2.tar.xz"; + sha256 = "0g7sx81lrb5r2ipinnghq4iss6clkwbzjb0ck4ay6hmpw54smzww"; + name = "qtserialbus-everywhere-src-6.6.2.tar.xz"; }; }; qtserialport = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtserialport-everywhere-src-6.6.1.tar.xz"; - sha256 = "1n5fsb3ayn1xnf1s5l7f6j1nm2pcdjywy382qr451b5wbhyj7z4n"; - name = "qtserialport-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtserialport-everywhere-src-6.6.2.tar.xz"; + sha256 = "16j5fprmdzzc1snnj5184ihq5avg1s0jrqqcjk70dvmimsf0q7ms"; + name = "qtserialport-everywhere-src-6.6.2.tar.xz"; }; }; qtshadertools = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtshadertools-everywhere-src-6.6.1.tar.xz"; - sha256 = "1fvkbrw6gy8v2ql6qw1ra08wl6z64w34b9d886794m29ypj8ycq8"; - name = "qtshadertools-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtshadertools-everywhere-src-6.6.2.tar.xz"; + sha256 = "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2"; + name = "qtshadertools-everywhere-src-6.6.2.tar.xz"; }; }; qtspeech = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtspeech-everywhere-src-6.6.1.tar.xz"; - sha256 = "16aqjaf8c64l6qg0kz5hla6q2r7k9lryad7jy8jwyi2ir5921352"; - name = "qtspeech-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtspeech-everywhere-src-6.6.2.tar.xz"; + sha256 = "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0"; + name = "qtspeech-everywhere-src-6.6.2.tar.xz"; }; }; qtsvg = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtsvg-everywhere-src-6.6.1.tar.xz"; - sha256 = "0a4jw02v50fzbnrqnldz9djzn37rric06lrg2vrkqikas9bfp394"; - name = "qtsvg-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtsvg-everywhere-src-6.6.2.tar.xz"; + sha256 = "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss"; + name = "qtsvg-everywhere-src-6.6.2.tar.xz"; }; }; qttools = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qttools-everywhere-src-6.6.1.tar.xz"; - sha256 = "0jliy2pz6czjw0ircd8h37a5prinm1a8dvnawwclxas5fdd10fa9"; - name = "qttools-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qttools-everywhere-src-6.6.2.tar.xz"; + sha256 = "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76"; + name = "qttools-everywhere-src-6.6.2.tar.xz"; }; }; qttranslations = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qttranslations-everywhere-src-6.6.1.tar.xz"; - sha256 = "127f40wjm1q9clp2dj7vgyvv7nazb5c23akwgsr50wdd4bl051v6"; - name = "qttranslations-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qttranslations-everywhere-src-6.6.2.tar.xz"; + sha256 = "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna"; + name = "qttranslations-everywhere-src-6.6.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz"; - sha256 = "1akvip4h86r5j898w1yx0mnfgc78b1yqfygk8h25z613vqvdwg4r"; - name = "qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtvirtualkeyboard-everywhere-src-6.6.2.tar.xz"; + sha256 = "07nqds49g2x748jsk17cnd2ph81165xnzn70jwxd0gpbi3dzshk1"; + name = "qtvirtualkeyboard-everywhere-src-6.6.2.tar.xz"; }; }; qtwayland = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwayland-everywhere-src-6.6.1.tar.xz"; - sha256 = "1cb8amr9kmr4gdnyi1mzriv34xf1nx47y91m9v6cczy05mijvk36"; - name = "qtwayland-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwayland-everywhere-src-6.6.2.tar.xz"; + sha256 = "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv"; + name = "qtwayland-everywhere-src-6.6.2.tar.xz"; }; }; qtwebchannel = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebchannel-everywhere-src-6.6.1.tar.xz"; - sha256 = "0hz5j6gpj4m74j74skj0lrjqmp30ns5s240gr6rrinisaz6qfq7i"; - name = "qtwebchannel-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebchannel-everywhere-src-6.6.2.tar.xz"; + sha256 = "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x"; + name = "qtwebchannel-everywhere-src-6.6.2.tar.xz"; }; }; qtwebengine = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebengine-everywhere-src-6.6.1.tar.xz"; - sha256 = "149nwwnarkiiz2vrgydz99agfc0z08lrnm4hr8ln1mjb44la4vks"; - name = "qtwebengine-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebengine-everywhere-src-6.6.2.tar.xz"; + sha256 = "15h3hniszfkxv2vnn3fnbgbar8wb41ypgn4b4iz4iy6csar8f7fn"; + name = "qtwebengine-everywhere-src-6.6.2.tar.xz"; }; }; qtwebsockets = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebsockets-everywhere-src-6.6.1.tar.xz"; - sha256 = "0hq6gg67x84fb6asfgx5jclvv1nqhr4gdr84cl27xn3nk0s18xbq"; - name = "qtwebsockets-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebsockets-everywhere-src-6.6.2.tar.xz"; + sha256 = "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0"; + name = "qtwebsockets-everywhere-src-6.6.2.tar.xz"; }; }; qtwebview = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebview-everywhere-src-6.6.1.tar.xz"; - sha256 = "0v1598ycj1rgphb00r3mwkij8yjw26g0d73w2ijf8fp97fiippnn"; - name = "qtwebview-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebview-everywhere-src-6.6.2.tar.xz"; + sha256 = "0z3p1g26yg3dr3hhavwd5wz9b8yi838xj4s57068wykd80v145wb"; + name = "qtwebview-everywhere-src-6.6.2.tar.xz"; }; }; } From 0c6a93e45b4d0e562c4a3cf91952200bc196ccb6 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Thu, 15 Feb 2024 06:51:27 +0000 Subject: [PATCH 32/40] plumber: remove unneeded compile flag --- pkgs/by-name/pl/plumber/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix index b786fb65c8e1..542af243b431 100644 --- a/pkgs/by-name/pl/plumber/package.nix +++ b/pkgs/by-name/pl/plumber/package.nix @@ -22,8 +22,6 @@ buildGoModule rec { "-s" "-w" "-X github.com/streamdal/plumber/options.VERSION=${version}" - # remove once module in go.mod is renamed to github.com/batchcorp/streamdal - "-X github.com/batchcorp/plumber/options.VERSION=${version}" ]; meta = with lib; { From 11a28beb5377739f1e003bc97e0c83febff7feab Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 15 Feb 2024 07:57:44 +0100 Subject: [PATCH 33/40] openmolcas: bump boost version --- pkgs/applications/science/chemistry/openmolcas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 0aeb01c2916b..cefe83446662 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -13,7 +13,7 @@ , libxc , makeWrapper , gsl -, boost175 +, boost180 , autoPatchelfHook # Note that the CASPT2 module is broken with MPI # See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 @@ -93,7 +93,7 @@ stdenv.mkDerivation { armadillo libxc gsl.dev - boost175 + boost180 ] ++ lib.optionals enableMpi [ mpi globalarrays @@ -155,7 +155,7 @@ stdenv.mkDerivation { homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; license = with licenses; [ lgpl21Only bsd3 ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; mainProgram = "pymolcas"; }; } From cce29d540d972628e17ec84099dad353634cee93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 09:05:16 +0100 Subject: [PATCH 34/40] python311Packages.boto3-stubs: 1.34.40 -> 1.34.42 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 02fc617d1954..cfd2bf72f927 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.40"; + version = "1.34.42"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rQpnx4/mR80rYR8/gtryVp4WQ3gdU8vIafGAYuF3rig="; + hash = "sha256-wg/LCxaAvonBhZUaLIhAbn3NSKkYFCMbWfN9rWJJEIo="; }; nativeBuildInputs = [ From 9e2ece568106b2e5222f1bc8b7ca83503bbf5bec Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Thu, 15 Feb 2024 01:17:42 -0800 Subject: [PATCH 35/40] terraform: remove "-dev" suffix from `-version` output (#288878) --- pkgs/applications/networking/cluster/terraform/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 559cb30b3155..f143d2c3fca5 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -26,7 +26,7 @@ let inherit hash; }; - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" "-w" "-X 'github.com/hashicorp/terraform/version.dev=no'" ]; postConfigure = '' # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 From e39eed240b2f2347d02a643af7fd11ccab6d2128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Feb 2024 18:10:36 +0000 Subject: [PATCH 36/40] bloat: unstable-2023-12-28 -> unstable-2024-02-12 --- pkgs/servers/bloat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix index 3752b167188f..dfde129e8887 100644 --- a/pkgs/servers/bloat/default.nix +++ b/pkgs/servers/bloat/default.nix @@ -6,12 +6,12 @@ buildGoModule { pname = "bloat"; - version = "unstable-2023-12-28"; + version = "unstable-2024-02-12"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "1d61f1aa27376e778b7a517fdd5739a8c1976d2e"; - hash = "sha256-u75COa68sKhWeR3asQGgu2thQmDDGpJPmXLgnesQfNc="; + rev = "6ddec8db3ee73d3abdc85b6a2101020cf2455bce"; + hash = "sha256-NWi8vL1zyKgPlZo73qpR232r65foaYcjUKkVwyJ/C7c="; }; vendorHash = null; From 47f2adfe17d554beeaaffea77e3fa7d8c2a914dd Mon Sep 17 00:00:00 2001 From: Mateus Alves <98139059+redyf@users.noreply.github.com> Date: Thu, 15 Feb 2024 07:02:39 -0300 Subject: [PATCH 37/40] vimPlugins.staline-nvim: init at 2024-02-14 (#288879) --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 32e4d167625a..167758636738 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9459,6 +9459,18 @@ final: prev: meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; + staline-nvim = buildVimPlugin { + pname = "staline.nvim"; + version = "2024-02-14"; + src = fetchFromGitHub { + owner = "tamton-aquib"; + repo = "staline.nvim"; + rev = "a53f869278b8b186a5afd6f21680cd103c381599"; + hash = "sha256-GDMKzxFDtQk5LL+rMsxTGTyLv69w5NUd+u19noeO5ws="; + }; + meta.homepage = "https://github.com/tamton-aquib/staline.nvim/"; + }; + stan-vim = buildVimPlugin { pname = "stan-vim"; version = "2023-12-13"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 11107d93668d..186075eece6c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -73,6 +73,7 @@ https://github.com/jiangmiao/auto-pairs/,, https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, https://github.com/m4xshen/autoclose.nvim/,HEAD, +https://github.com/tamton-aquib/staline.nvim,main, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/nullishamy/autosave.nvim/,HEAD, https://github.com/rafi/awesome-vim-colorschemes/,, From bb661ae246ca22ae40757223ab90251a95a7757c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?= <33058747+GaetanLepage@users.noreply.github.com> Date: Thu, 15 Feb 2024 11:34:10 +0100 Subject: [PATCH 38/40] vimPlugins.baleia-nvim: init at 2024-01-06 (#289001) --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 167758636738..88eb709a96d4 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -16491,5 +16491,17 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + baleia-nvim = buildVimPlugin { + pname = "baleia-nvim"; + version = "2024-01-06"; + src = fetchFromGitHub { + owner = "m00qek"; + repo = "baleia.nvim"; + rev = "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495"; + sha256 = "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs="; + }; + meta.homepage = "https://github.com/m00qek/baleia.nvim/"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 186075eece6c..606f8cf6e121 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -79,11 +79,11 @@ https://github.com/nullishamy/autosave.nvim/,HEAD, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/ayu-theme/ayu-vim/,, https://github.com/taybart/b64.nvim/,HEAD, +https://github.com/m00qek/baleia.nvim/,HEAD, https://github.com/romgrk/barbar.nvim/,, https://github.com/utilyre/barbecue.nvim/,, https://github.com/chriskempson/base16-vim/,, https://github.com/nvchad/base46/,HEAD, -https://github.com/IogaMaster/neocord.git,main, https://github.com/jamespwilliams/bat.vim/,HEAD, https://github.com/vim-scripts/bats.vim/,, https://github.com/rbgrouleff/bclose.vim/,, @@ -513,6 +513,7 @@ https://github.com/Shougo/neco-vim/,, https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD, https://github.com/Shougo/neocomplete.vim/,, https://github.com/folke/neoconf.nvim/,HEAD, +https://github.com/IogaMaster/neocord.git/,main, https://github.com/KeitaNakamura/neodark.vim/,, https://github.com/folke/neodev.nvim/,HEAD, https://github.com/sbdchd/neoformat/,, @@ -575,7 +576,6 @@ https://github.com/MunifTanjim/nui.nvim/,main, https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, https://github.com/nvchad/nvchad/,HEAD, -https://github.com/altermo/ultimate-autopair.nvim.git,HEAD, https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, https://github.com/catppuccin/nvim/,,catppuccin-nvim https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, @@ -891,6 +891,7 @@ https://github.com/leafgarland/typescript-vim/,, https://github.com/jose-elias-alvarez/typescript.nvim/,, https://github.com/kaarmu/typst.vim/,HEAD, https://github.com/nvchad/ui/,HEAD,nvchad-ui +https://github.com/altermo/ultimate-autopair.nvim.git/,HEAD, https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, From 4a8def58feb660f2cf411b3f05fd1d2d45155427 Mon Sep 17 00:00:00 2001 From: Andrew Bruce Date: Thu, 15 Feb 2024 10:36:52 +0000 Subject: [PATCH 39/40] vimPlugins.elixir-tools-nvim: fix credo-language-server (#275505) Credo language server gets broken by patchShebangs in its current form. -S without a command in the path causes the 'elixir' part of this shebang to be removed. This is because the following line defaults to 'true', which produces a blank string: https://github.com/NixOS/nixpkgs/blob/b0d1fe9a32113e0269fae0ea6dd00e5604ccf6a9/pkgs/build-support/setup-hooks/patch-shebangs.sh#L91 --- pkgs/applications/editors/vim/plugins/overrides.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 21267a14230f..2bf8445ad250 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -549,6 +549,12 @@ ''; }); + elixir-tools-nvim = super.elixir-tools-nvim.overrideAttrs { + fixupPhase = '' + patchShebangs $(find $out/bin/ -type f -not -name credo-language-server) + ''; + }; + executor-nvim = super.executor-nvim.overrideAttrs { dependencies = with self; [ nui-nvim ]; }; From c3ef726ee171a1f78def8c4da8a2e3719efbbfa4 Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Thu, 15 Feb 2024 13:01:03 +0100 Subject: [PATCH 40/40] nixos/ldso: avoid instance of nixpkgs (#288509) Follow-up to #269551 Avoid creating a new instance of nixpkgs to access two variables. `pkgs.pkgsi686Linux` was being accessed whenever the feature is being used or not. A second instance of nixpkgs is being created in `nixos/modules/config/stub-ld.nix` and can be disabled by setting `environment.ldso32 = null` or `environment.stub-ld.enable = false`. Both combined fixes this error: error: attribute 'i686-linux' missing --- nixos/modules/config/ldso.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/ldso.nix b/nixos/modules/config/ldso.nix index 72ae3958d886..bd6f0dc5a83b 100644 --- a/nixos/modules/config/ldso.nix +++ b/nixos/modules/config/ldso.nix @@ -6,9 +6,9 @@ let libDir = pkgs.stdenv.hostPlatform.libDir; ldsoBasename = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker)); - pkgs32 = pkgs.pkgsi686Linux; - libDir32 = pkgs32.stdenv.hostPlatform.libDir; - ldsoBasename32 = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker)); + # Hard-code to avoid creating another instance of nixpkgs. Also avoids eval errors in some cases. + libDir32 = "lib"; # pkgs.pkgsi686Linux.stdenv.hostPlatform.libDir + ldsoBasename32 = "ld-linux.so.2"; # last (splitString "/" pkgs.pkgsi686Linux.stdenv.cc.bintools.dynamicLinker) in { options = { environment.ldso = mkOption {