diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f4f2f8e6b9ff..652942913ac8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20715,6 +20715,12 @@ github = "philipwilk"; githubId = 50517631; }; + philocalyst = { + name = "Myles Wirth"; + email = "milestheperson@posteo.net"; + github = "philocalyst"; + githubId = 114884788; + }; philtaken = { email = "philipp.herzog@protonmail.com"; github = "philtaken"; diff --git a/nixos/modules/hardware/hid-fanatecff.nix b/nixos/modules/hardware/hid-fanatecff.nix new file mode 100644 index 000000000000..b227eff5fb3c --- /dev/null +++ b/nixos/modules/hardware/hid-fanatecff.nix @@ -0,0 +1,19 @@ +{ lib, config, ... }: + +let + cfg = config.hardware.hid-fanatecff; + inherit (config.boot.kernelPackages) hid-fanatecff; + inherit (lib) maintainers mkEnableOption mkIf; +in +{ + options.hardware.hid-fanatecff = { + enable = mkEnableOption "hid-fanatecff, a Linux kernel driver that aims to add support for Fanatec devices"; + }; + + config = mkIf cfg.enable { + boot.extraModulePackages = [ hid-fanatecff ]; + services.udev.packages = [ hid-fanatecff ]; + }; + + meta.maintainers = with maintainers; [ rake5k ]; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d6725e526a32..8211bb7ebc24 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -74,6 +74,7 @@ ./hardware/gpgsmartcards.nix ./hardware/graphics.nix ./hardware/hackrf.nix + ./hardware/hid-fanatecff.nix ./hardware/i2c.nix ./hardware/infiniband.nix ./hardware/inputmodule.nix diff --git a/nixos/modules/services/networking/newt.nix b/nixos/modules/services/networking/newt.nix index 9caa45351958..8b7a8bfa5f84 100644 --- a/nixos/modules/services/networking/newt.nix +++ b/nixos/modules/services/networking/newt.nix @@ -21,6 +21,8 @@ let // { description = "value coercible to CLI argument"; }; + format = pkgs.formats.yaml { }; + blueprint-file = format.generate "blueprint.yml" cfg.blueprint; in { imports = [ @@ -48,13 +50,35 @@ in }; description = "Settings for Newt module, see [Newt CLI docs](https://github.com/fosrl/newt?tab=readme-ov-file#cli-args) for more information."; }; + blueprint = lib.mkOption { + inherit (format) type; + default = { }; + example = { + proxy-resources = { + jellyfin = { + name = "Jellyfin"; + protocol = "http"; + full-domain = "jfn.example.com"; + targets = [ + { + hostname = "localhost"; + method = "http"; + port = 8096; + } + ]; + auth.sso-enabled = true; + }; + }; + }; + description = "Blueprint for declarative settings, see [Newt Blueprint docs](https://docs.pangolin.net/manage/blueprints#blueprints) for more information."; + }; # provide path to file to keep secrets out of the nix store environmentFile = lib.mkOption { type = with lib.types; nullOr path; default = null; description = '' - Path to a file containing sensitive environment variables for Newt. See + Path to a file containing sensitive environment variables for Newt. See [Client credentials](https://docs.pangolin.net/manage/clients/credentials) for more information. These will overwrite anything defined in the config. The file should contain environment-variable assignments like: NEWT_ID=2ix2t8xk22ubpfy @@ -81,9 +105,10 @@ in environment = { HOME = "/var/lib/private/newt"; }; - # the flag values will all be overwritten if also defined in the env file serviceConfig = { - ExecStart = "${lib.getExe cfg.package} ${lib.cli.toCommandLineShellGNU { } cfg.settings}"; + ExecStart = "${lib.getExe cfg.package} ${ + lib.cli.toCommandLineShellGNU { } (lib.recursiveUpdate cfg.settings { inherit blueprint-file; }) + }"; DynamicUser = true; StateDirectory = "newt"; StateDirectoryMode = "0700"; diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index a76a642805bc..06638993e3de 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -16,13 +16,20 @@ let configFile = pkgs.writeText "chrony.conf" '' ${lib.concatMapStringsSep "\n" ( - server: "server " + server + " " + cfg.serverOption + lib.optionalString (cfg.enableNTS) " nts" + server: + (if lib.strings.hasInfix "pool" server then "pool " else "server ") + + server + + " " + + cfg.serverOption + + lib.optionalString (cfg.enableNTS) " nts" ) cfg.servers} ${lib.optionalString ( cfg.initstepslew.enabled && (cfg.servers != [ ]) ) "initstepslew ${toString cfg.initstepslew.threshold} ${lib.concatStringsSep " " cfg.servers}"} + ${lib.optionalString cfg.makestep.enable "makestep ${toString cfg.makestep.threshold} ${toString cfg.makestep.limit}"} + driftfile ${driftFile} keyfile ${keyFile} ${lib.optionalString (cfg.enableRTCTrimming) "rtcfile ${rtcFile}"} @@ -43,6 +50,20 @@ let ] ++ lib.optional cfg.enableMemoryLocking "-m" ++ cfg.extraFlags; + + dispathcerScriptFile = pkgs.callPackage ( + { + runCommand, + srcOnly, + }: + runCommand "10-chrony-onoffline" { } '' + cp ${srcOnly chronyPkg}/examples/chrony.nm-dispatcher.onoffline $out + substituteInPlace $out \ + --replace-fail '/usr/bin/chronyc' '${chronyPkg}/bin/chronyc' + chmod +x $out + patchShebangs $out + '' + ) { }; in { options = { @@ -134,8 +155,9 @@ in initstepslew = { enabled = lib.mkOption { type = lib.types.bool; - default = true; + default = false; description = '' + DEPRECATED. Consider using `services.chrony.makestep` instead. Allow chronyd to make a rapid measurement of the system clock error at boot time, and to correct the system clock by stepping before normal operation begins. @@ -153,12 +175,51 @@ in }; }; + makestep = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Allow chronyd to step the system clock if the error is larger than + the specified threshold. + ''; + }; + + threshold = lib.mkOption { + type = lib.types.either lib.types.float lib.types.int; + default = 0.1; + description = '' + The threshold of system clock error (in seconds) above which the + clock will be stepped. If the correction required is less than the + threshold, a slew is used instead. + ''; + }; + + limit = lib.mkOption { + type = lib.types.ints.positive; + default = 3; + description = '' + The maximum number of times the system clock will be stepped. + ''; + }; + }; + directory = lib.mkOption { type = lib.types.str; default = "/var/lib/chrony"; description = "Directory where chrony state is stored."; }; + dispatcherScript = lib.mkOption { + type = lib.types.bool; + default = config.networking.networkmanager.enable; + defaultText = lib.literalExpression "config.networking.networkmanager.enable"; + description = '' + Whether to install the chrony NetworkManager dispatcher script + to handle connectivity changes. + ''; + }; + extraConfig = lib.mkOption { type = lib.types.lines; default = ""; @@ -194,6 +255,13 @@ in home = stateDir; }; + networking.networkmanager.dispatcherScripts = lib.mkIf cfg.dispatcherScript [ + { + type = "basic"; + source = dispathcerScriptFile; + } + ]; + services.timesyncd.enable = lib.mkForce false; # If chrony controls and tracks the RTC, writing it externally causes clock error. diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 4ea87ca5372b..565f4a37c744 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -735,7 +735,7 @@ in echo "exit( \$this->getPrimaryDB()->tableExists( 'user' ) ? 1 : 0 );" | \ ${cfg.phpPackage}/bin/php ${pkg}/share/mediawiki/maintenance/run.php eval --conf ${mediawikiConfig} && \ - ${cfg.phpPackage}/bin/php ${pkg}/share/mediawiki/maintenance/install.php \ + ${cfg.phpPackage}/bin/php ${pkg}/share/mediawiki/maintenance/run.php ${pkg}/share/mediawiki/maintenance/install.php \ --confpath /tmp \ --scriptpath / \ --dbserver ${lib.escapeShellArg dbAddr} \ diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eed80d2a358d..cdfed1d762d2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1283,13 +1283,13 @@ "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50=" }, "tailscale_tailscale": { - "hash": "sha256-G8vSPFGtx9klRCW8Rab8UHR1AK1Kt421WMsCE0pohR0=", + "hash": "sha256-hw8psXRFtFkBF3x1gj/72bxcnFkuZ5RYXENNeiWB7gc=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.25.0", + "rev": "v0.26.0", "spdx": "MIT", - "vendorHash": "sha256-UWdPgXvJ68xRUNbAhBQ2SjGkerRlwNUjMA8Yu9EAowo=" + "vendorHash": "sha256-gc8JCbYzA0nz0JBSNBSZsK0VLTAPmXRhXW2MZiadC90=" }, "telmate_proxmox": { "hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=", diff --git a/pkgs/applications/video/qctools/default.nix b/pkgs/applications/video/qctools/default.nix index 0849d92401cb..b42469008eb6 100644 --- a/pkgs/applications/video/qctools/default.nix +++ b/pkgs/applications/video/qctools/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "qctools"; - version = "1.4"; + version = "1.4.1"; src = fetchurl { url = "https://mediaarea.net/download/source/${pname}/${version}/${pname}_${version}.tar.xz"; - hash = "sha256-1WqCP/4PV8hQT8ubPxHGTwZrRnOPm+msEPBGR4gkWhA="; + hash = "sha256-4HuNBCvN1BDjIsEyo8Lo/H1rNgCFygkXqo6yD3oDf18="; }; sourceRoot = "${pname}/Project/QtCreator"; diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix index 02ddfdee1e26..9db06c4c4176 100644 --- a/pkgs/by-name/ce/ceph-csi/package.nix +++ b/pkgs/by-name/ce/ceph-csi/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ceph-csi"; - version = "3.15.1"; + version = "3.16.0"; src = fetchFromGitHub { owner = "ceph"; repo = "ceph-csi"; - rev = "v${finalAttrs.version}"; - hash = "sha256-eLF/V6NaBU8r3ttJku4lSGrIuP2vao24rsAsEAWB0wk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-dVSztcnfofPkd4lv/WBZQNS6POHWdAeNqMta1p7G51c="; }; preConfigure = '' diff --git a/pkgs/by-name/co/cocom-tool-set/package.nix b/pkgs/by-name/co/cocom-tool-set/package.nix index 9ab545e01c4f..757d74a37ba6 100644 --- a/pkgs/by-name/co/cocom-tool-set/package.nix +++ b/pkgs/by-name/co/cocom-tool-set/package.nix @@ -16,11 +16,13 @@ stdenv.mkDerivation (finalAttrs: { env = { RANLIB = "${stdenv.cc.targetPrefix}gcc-ranlib"; - NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=implicit-int" - "-Wno-error=implicit-function-declaration" - "-std=gnu17" - ]; + NIX_CFLAGS_COMPILE = toString ( + [ + "-Wno-error=implicit-int" + "-Wno-error=implicit-function-declaration" + ] + ++ lib.optional stdenv.cc.isGNU "-std=gnu17" + ); }; autoreconfFlags = "REGEX"; diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index e9b98a9a5a7e..3b40b2d4f0d6 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2025-12-27"; + version = "0-unstable-2026-01-11"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "ec862e9c8acd30ec73eb9e11b8e849ed5b711e76"; - hash = "sha256-nFWOJnZKT5mr/Bf1r228v1Oexvy35bL2VS2JLPvJHp0="; + rev = "8a88fb5b8c75450d2e20ae1c7839d823bb1f6fad"; + hash = "sha256-hejdFLYJvANKOC4Jgr9XvYl/5kU9PiKSH5cWE6d6e/o="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index b5982a605336..a65002d09af3 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.234.0"; + version = "2.237.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-kj7KCgk4s9Ua//UPGXBh3pI91FTGC90bqMdUrvH4Bhc="; + hash = "sha256-udko0oiO5tLEDBKxkGiTRU0Qd/Yd0bvPB6iPM5wJ7Ls="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-FA5T95nii7pk36YwQQVMSJAvKgOWKFbGwKeyCuygDIQ="; + npmDepsHash = "sha256-2j/u++63qaOzvsgdhWeDsH+TUVmOLvgQQRNY14LZI2k="; nativeBuildInputs = [ prisma_6 diff --git a/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch b/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch new file mode 100644 index 000000000000..8bb7103962d6 --- /dev/null +++ b/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch @@ -0,0 +1,52 @@ +From ff7e9316ae220c002cc6d3cced0ae0786bcd0392 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Wed, 4 Feb 2026 15:36:17 +0800 +Subject: [PATCH 1/2] nix: use terracotta from nix + +--- + .../hmcl/terracotta/TerracottaBundle.java | 21 +++---------------- + 1 file changed, 3 insertions(+), 18 deletions(-) + +diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java +index 727edde9b..5b6e8b02f 100644 +--- a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java ++++ b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java +@@ -139,26 +139,11 @@ public final class TerracottaBundle { + } + + public Path locate(String file) { +- FileDownloadTask.IntegrityCheck check = files.get(file); +- if (check == null) { +- throw new AssertionError(String.format("Expecting %s file in terracotta bundle.", file)); +- } +- return root.resolve(file).toAbsolutePath(); ++ return Path.of("@TERRACOTTA_BIN@"); + } + + public AbstractTerracottaProvider.Status status() throws IOException { +- if (Files.exists(root) && isLocalBundleValid()) { +- return AbstractTerracottaProvider.Status.READY; +- } +- +- try { +- if (TerracottaMetadata.hasLegacyVersionFiles()) { +- return AbstractTerracottaProvider.Status.LEGACY_VERSION; +- } +- } catch (IOException e) { +- Logger.LOG.warning("Cannot determine whether legacy versions exist.", e); +- } +- return AbstractTerracottaProvider.Status.NOT_EXIST; ++ return AbstractTerracottaProvider.Status.READY; + } + + private boolean isLocalBundleValid() throws IOException { // FIXME: Make control flow clearer. +@@ -188,4 +173,4 @@ public final class TerracottaBundle { + } + return true; + } +-} ++} +\ No newline at end of file +-- +2.52.0 + diff --git a/pkgs/by-name/hm/hmcl/0003-nix-skip-terracotta-existence-check-on-darwin.patch b/pkgs/by-name/hm/hmcl/0002-nix-skip-terracotta-existence-check-on-darwin.patch similarity index 65% rename from pkgs/by-name/hm/hmcl/0003-nix-skip-terracotta-existence-check-on-darwin.patch rename to pkgs/by-name/hm/hmcl/0002-nix-skip-terracotta-existence-check-on-darwin.patch index 1df97fffc3d0..4100426ede5b 100644 --- a/pkgs/by-name/hm/hmcl/0003-nix-skip-terracotta-existence-check-on-darwin.patch +++ b/pkgs/by-name/hm/hmcl/0002-nix-skip-terracotta-existence-check-on-darwin.patch @@ -1,27 +1,27 @@ -From bcf95a23380424f2ca82649d93e9e0bdf8274b74 Mon Sep 17 00:00:00 2001 +From 110289f39d01713de5f8cd1e7146a36de8c35308 Mon Sep 17 00:00:00 2001 From: Moraxyc -Date: Fri, 31 Oct 2025 14:23:54 +0800 -Subject: [PATCH 3/3] nix: skip terracotta existence check on darwin +Date: Wed, 4 Feb 2026 15:40:50 +0800 +Subject: [PATCH 2/2] nix: skip terracotta existence check on darwin --- .../org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java -index 00626f8b6..59125962d 100644 +index 83debfc0a..fd4f851a7 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java -@@ -45,10 +45,6 @@ public final class MacOSProvider implements ITerracottaProvider { - public Status status() throws IOException { - assert binary != null; +@@ -44,10 +44,6 @@ public final class MacOSProvider extends AbstractTerracottaProvider { + @Override + public Status status() throws IOException { - if (!Files.exists(Path.of("/Applications/terracotta.app"))) { - return Status.NOT_EXIST; - } - - return binary.status(); + return bundle.status(); } -- -2.51.0 +2.52.0 diff --git a/pkgs/by-name/hm/hmcl/0002-nix-use-terracotta-from-nix.patch b/pkgs/by-name/hm/hmcl/0002-nix-use-terracotta-from-nix.patch deleted file mode 100644 index 651759ce63f0..000000000000 --- a/pkgs/by-name/hm/hmcl/0002-nix-use-terracotta-from-nix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 541d055bf55703aa9e2c5a5e04a397f1d25efe28 Mon Sep 17 00:00:00 2001 -From: Moraxyc -Date: Wed, 29 Oct 2025 00:09:56 +0800 -Subject: [PATCH 2/3] nix: use terracotta from nix - ---- - .../org/jackhuang/hmcl/terracotta/TerracottaNative.java | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaNative.java b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaNative.java -index 079537978..68954b09e 100644 ---- a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaNative.java -+++ b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaNative.java -@@ -47,7 +47,7 @@ public final class TerracottaNative { - - public TerracottaNative(List links, Path path, FileDownloadTask.IntegrityCheck checking) { - this.links = links; -- this.path = path; -+ this.path = Path.of("@TERRACOTTA_BIN@"); - this.checking = checking; - } - -@@ -130,9 +130,7 @@ public final class TerracottaNative { - - public ITerracottaProvider.Status status() throws IOException { - if (Files.exists(path)) { -- if (DigestUtils.digestToString(checking.getAlgorithm(), path).equalsIgnoreCase(checking.getChecksum())) { -- return ITerracottaProvider.Status.READY; -- } -+ return ITerracottaProvider.Status.READY; - } - - try { -@@ -144,4 +142,4 @@ public final class TerracottaNative { - } - return ITerracottaProvider.Status.NOT_EXIST; - } --} -+} -\ No newline at end of file --- -2.51.0 - diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index aa7a55dd59d2..1679c8df3e08 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; - version = "3.9.2"; + version = "3.10.2"; src = fetchurl { # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key. # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28 url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; - hash = "sha256-/thuAsPadixV2vkez3w9yhkDdpJra54WkhFYaeKH0GU="; + hash = "sha256-tmQN0kSjm8oU36ENHhgA649IohdG4ZDHyEaMPscd3nQ="; }; # - HMCL prompts users to download prebuilt Terracotta binary for @@ -63,38 +63,38 @@ stdenv.mkDerivation (finalAttrs: { # Terracotta downloads, package them into a patch jar that overrides # the original classes, and have it load the original jar. This preserves # the original jar’s integrity check and avoids modifying the upstream jar. - terracottaNativeJava = fetchurl { - name = "hmcl-terracotta-native-java-${finalAttrs.version}"; - url = "https://raw.githubusercontent.com/HMCL-dev/HMCL/v${finalAttrs.version}/${finalAttrs.terracottaNativeJavaPath}"; - hash = "sha256-sg8gBOMNdITmHeYByYriYp05ja1vtWPF/wuqdGmkgiA="; + terracottaBundleJava = fetchurl { + name = "hmcl-terracotta-bundle-java-${finalAttrs.version}"; + url = "https://raw.githubusercontent.com/HMCL-dev/HMCL/v${finalAttrs.version}/${finalAttrs.terracottaBundleJavaPath}"; + hash = "sha256-QXjo/NiYQyJfan15hnvJlBir9s9R6H+jHsr+K9M1oTw="; }; macOSProviderJava = fetchurl { name = "hmcl-macos-provider-java-${finalAttrs.version}"; url = "https://raw.githubusercontent.com/HMCL-dev/HMCL/v${finalAttrs.version}/${finalAttrs.macOSProviderJavaPath}"; - hash = "sha256-V8FNPPkq6/P3/HKcqKkAy6Ya1kUI3oEMfjEc8XdExgo="; + hash = "sha256-+Zji2B8ksT7P+IObyrM9q7vHPJVl5ZtH+v/J8Mfr0Q4="; }; - terracottaNativeJavaPath = "HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaNative.java"; + terracottaBundleJavaPath = "HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java"; macOSProviderJavaPath = "HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java"; dontUnpack = true; prePatch = '' - install -Dm644 $terracottaNativeJava $terracottaNativeJavaPath + install -Dm644 $terracottaBundleJava $terracottaBundleJavaPath install -Dm644 $macOSProviderJava $macOSProviderJavaPath ''; patches = [ - (replaceVars ./0002-nix-use-terracotta-from-nix.patch { + (replaceVars ./0001-nix-use-terracotta-from-nix.patch { TERRACOTTA_BIN = lib.getExe terracotta; }) - ./0003-nix-skip-terracotta-existence-check-on-darwin.patch + ./0002-nix-skip-terracotta-existence-check-on-darwin.patch ]; buildPhase = '' runHook preBuild # Build only classes we modified - javac -cp $src -d out $terracottaNativeJavaPath $macOSProviderJavaPath + javac -cp $src -d out $terracottaBundleJavaPath $macOSProviderJavaPath # Extract MANIFEST.MF from original jar # We need Main-Class, Add-Opens, etc diff --git a/pkgs/by-name/hm/hmcl/update.nix b/pkgs/by-name/hm/hmcl/update.nix index 1f65d2578cec..351702bae382 100644 --- a/pkgs/by-name/hm/hmcl/update.nix +++ b/pkgs/by-name/hm/hmcl/update.nix @@ -35,7 +35,7 @@ writeShellApplication { fi nix-update hmcl --version="$version" - update-source-version hmcl --source-key=terracottaNativeJava --ignore-same-version + update-source-version hmcl --source-key=terracottaBundleJava --ignore-same-version update-source-version hmcl --source-key=macOSProviderJava --ignore-same-version ''; } diff --git a/pkgs/by-name/ip/iptsd/package.nix b/pkgs/by-name/ip/iptsd/package.nix index d40cb5b42910..eecabac7b8df 100644 --- a/pkgs/by-name/ip/iptsd/package.nix +++ b/pkgs/by-name/ip/iptsd/package.nix @@ -6,11 +6,13 @@ meson, ninja, pkg-config, + cairomm, cli11, eigen, hidrd, inih, microsoft-gsl, + sdl2-compat, spdlog, systemd, udevCheckHook, @@ -38,11 +40,13 @@ stdenv.mkDerivation (finalAttrs: { dontUseCmakeConfigure = true; buildInputs = [ + cairomm cli11 eigen hidrd inih microsoft-gsl + sdl2-compat spdlog systemd ]; @@ -63,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dservice_manager=systemd" "-Dsample_config=false" - "-Ddebug_tools=" "-Db_lto=false" # plugin needed to handle lto object -> undefined reference to ... ]; diff --git a/pkgs/by-name/li/libLAS/package.nix b/pkgs/by-name/li/liblas/package.nix similarity index 99% rename from pkgs/by-name/li/libLAS/package.nix rename to pkgs/by-name/li/liblas/package.nix index 0f61c70c5f7a..3826a46af7ed 100644 --- a/pkgs/by-name/li/libLAS/package.nix +++ b/pkgs/by-name/li/liblas/package.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "libLAS"; + pname = "liblas"; version = "1.8.1"; src = fetchurl { diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index 8ab98a9ec81c..f5c3544abd52 100644 --- a/pkgs/by-name/me/mediawiki/package.nix +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -1,6 +1,7 @@ { lib, stdenvNoCC, + fetchpatch, fetchurl, nixosTests, }: @@ -14,6 +15,19 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-4vEmsZrsQiBRoKUODGq36QTzOzmIpHudqK+/0MCiUsw="; }; + patches = [ + # Fix installation with postgres + (fetchpatch { + url = "https://gerrit.wikimedia.org/r/changes/mediawiki%2Fcore~1231289/revisions/4/patch?download"; + decode = "base64 -d"; + postFetch = '' + substituteInPlace $out \ + --replace "/Installer/" "/installer/" + ''; + hash = "sha256-bhfw5CW4EEpr2GTGda3va+EmM/vK6AqBfyoCcsSiqNQ="; + }) + ]; + postPatch = '' substituteInPlace includes/installer/CliInstaller.php \ --replace-fail '$vars = Installer::getExistingLocalSettings();' '$vars = null;' diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix index 476090110b92..2bd381fdd2f4 100644 --- a/pkgs/by-name/ml/mlkit/package.nix +++ b/pkgs/by-name/ml/mlkit/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mlkit"; - version = "4.7.18"; + version = "4.7.21"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-OACdbHwg3sEAVw+Fje0tWVHh7Xy6C/WdOQHfexOezlo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-c1GdM3K6dgY0EgHu01adBXwAxuMehRfo73Lo71couJ4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mockoon/package.nix b/pkgs/by-name/mo/mockoon/package.nix index 4bb7d5f50f25..2f8c17c04583 100644 --- a/pkgs/by-name/mo/mockoon/package.nix +++ b/pkgs/by-name/mo/mockoon/package.nix @@ -6,11 +6,11 @@ let pname = "mockoon"; - version = "9.4.0"; + version = "9.5.0"; src = fetchurl { url = "https://github.com/mockoon/mockoon/releases/download/v${version}/mockoon-${version}.x86_64.AppImage"; - hash = "sha256-BnzeCJIuVvbrdS5X6Or2t2QjwE+S9/jZOfgsjbtBoZU="; + hash = "sha256-I+ilXk2WPZECz/jpxfrIokBgeh6bFFPJnLPwuy+CyvA="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/mu/murex/package.nix b/pkgs/by-name/mu/murex/package.nix index 2557b4fe5f9d..2f7bc0768d6b 100644 --- a/pkgs/by-name/mu/murex/package.nix +++ b/pkgs/by-name/mu/murex/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "murex"; - version = "7.1.4143"; + version = "7.2.1001"; src = fetchFromGitHub { owner = "lmorg"; repo = "murex"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-wLEEyRnV0ERji+HPgtu6NgZSgKu0B6MErL+8KX1lUhw="; + sha256 = "sha256-Ua5KEtT1HXRCqW4MwB0dYCd03DBrliEfgiSmcp+vZS8="; }; - vendorHash = "sha256-ttBC4ZSoOcfauSNo5WTt/Ln3dn94VvdhYEFCzAli0dU="; + vendorHash = "sha256-MaBBi2Qi7s9lfRWmnYkyr7PtwzC7ZL0jmyUXzISOXVg="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix index 7746fd543d1e..e80bb821385d 100644 --- a/pkgs/by-name/ni/nixpkgs-review/package.nix +++ b/pkgs/by-name/ni/nixpkgs-review/package.nix @@ -22,14 +22,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nixpkgs-review"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; tag = finalAttrs.version; - hash = "sha256-SGykze7xkurdrqwMvXZU4E7VAuEcHCKqtlXAdaQrr1M="; + hash = "sha256-AYizZ36di7DOtmaqMtWTvMVfe4DqJfCdhvxypweEArs="; }; build-system = [ diff --git a/pkgs/by-name/nu/nushell-plugin-bson/package.nix b/pkgs/by-name/nu/nushell-plugin-bson/package.nix new file mode 100644 index 000000000000..d0208edde789 --- /dev/null +++ b/pkgs/by-name/nu/nushell-plugin-bson/package.nix @@ -0,0 +1,37 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + llvmPackages, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "nu_plugin_bson"; + version = "26.1100.0"; + + src = fetchFromGitHub { + owner = "Kissaki"; + repo = "nu_plugin_bson"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3Uu2YF5fnNvRP4+9GpLYjzZt7lg0kCbBl4bk4l5rEuY="; + }; + + cargoHash = "sha256-iORPlIP9kDLlJkm09SZn2lO3bWcj/Q/g+dBd2CPWiOg="; + + nativeBuildInputs = [ + llvmPackages.libclang + ]; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + passthru.update-script = nix-update-script { }; + meta = { + description = " Nushell plugin for BSON (Binary JSON) format `from bson` and `to bson`"; + homepage = "https://github.com/Kissaki/nu_plugin_bson"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ philocalyst ]; + mainProgram = "nu_plugin_bson"; + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; +}) diff --git a/pkgs/by-name/op/openscenegraph/package.nix b/pkgs/by-name/op/openscenegraph/package.nix index 95e35c44172c..53f4aeb4d97a 100644 --- a/pkgs/by-name/op/openscenegraph/package.nix +++ b/pkgs/by-name/op/openscenegraph/package.nix @@ -48,7 +48,7 @@ vncSupport ? false, libvncserver, lasSupport ? false, - libLAS, + liblas, luaSupport ? false, lua, sdlSupport ? false, @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional svgSupport librsvg ++ lib.optional pdfSupport poppler ++ lib.optional vncSupport libvncserver - ++ lib.optional lasSupport libLAS + ++ lib.optional lasSupport liblas ++ lib.optional luaSupport lua ++ lib.optional sdlSupport SDL2 ++ lib.optional restSupport asio diff --git a/pkgs/by-name/pr/prl-tools/package.nix b/pkgs/by-name/pr/prl-tools/package.nix index 7b7b719a530d..7a0ffc0fb7d1 100644 --- a/pkgs/by-name/pr/prl-tools/package.nix +++ b/pkgs/by-name/pr/prl-tools/package.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "26.2.1-57371"; + version = "26.2.2-57373"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-mmZsaLYaA9OjYwfZ75Be59n8Ve2DjdG6fGqgx8NpdLI="; + hash = "sha256-QsMMPzF7RRw2etxHLiOHc8ofSrO+rk/3T1Y3+zAnwnM="; }; hardeningDisable = [ diff --git a/pkgs/by-name/re/rewaita/package.nix b/pkgs/by-name/re/rewaita/package.nix index cb461ef5680d..9a1227893b5b 100644 --- a/pkgs/by-name/re/rewaita/package.nix +++ b/pkgs/by-name/re/rewaita/package.nix @@ -17,7 +17,7 @@ nix-update-script, }: let - version = "1.1.0"; + version = "1.1.1"; in python3Packages.buildPythonApplication { pname = "rewaita"; @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication { owner = "SwordPuffin"; repo = "Rewaita"; tag = "v${version}"; - hash = "sha256-B3CxtGKLvlGORae1b7vMDFbvNntVO24yrzbiHzOP28k="; + hash = "sha256-T9GQuhMkCEUFX2BpTTQ+zKhDpSxtVKuncITtm7nqzyY="; }; postPatch = '' diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 91f71a07f0a8..bfdd09d8538c 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -13,29 +13,19 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2026-01-30"; + version = "0-unstable-2026-02-06"; pyproject = true; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "ad42b553bf80e645f4a5cddf7d9391a501d12371"; - hash = "sha256-ZHMJ3Ns27tiF/ez4XVNVOkdMw7Rc6xCaJphewttM914="; + rev = "b5bb27f231e5f24b3985cd7cbd3f371486c21a11"; + hash = "sha256-y52R+MzPCa0zo52hZ/wnBacLLbF9k6P8UeVFobR+uUQ="; }; nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "certifi" - "flask" - "flask-babel" - "httpx-socks" - "lxml" - "markdown-it-py" - "msgspec" - "typer-slim" - "whitenoise" - ]; + pythonRelaxDeps = true; preBuild = let diff --git a/pkgs/by-name/su/suricata/package.nix b/pkgs/by-name/su/suricata/package.nix index 17222d57d76f..b4c2782e8eb2 100644 --- a/pkgs/by-name/su/suricata/package.nix +++ b/pkgs/by-name/su/suricata/package.nix @@ -38,11 +38,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "suricata"; - version = "8.0.2"; + version = "8.0.3"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/suricata-${finalAttrs.version}.tar.gz"; - hash = "sha256-nUUMosrb4QGZPpkDOmI0nSvanf2QpqzBvLbMbbdutVE="; + hash = "sha256-PZp7gDuXwR4GDzNJsXm+qv1vlrjIqVCF2f3AjIIoF9k="; }; patches = lib.optionals stdenv.hostPlatform.is64bit [ diff --git a/pkgs/by-name/wi/wiringpi/package.nix b/pkgs/by-name/wi/wiringpi/package.nix index 5fa4ca174f72..8cea11bad067 100644 --- a/pkgs/by-name/wi/wiringpi/package.nix +++ b/pkgs/by-name/wi/wiringpi/package.nix @@ -7,12 +7,12 @@ }: let - version = "3.16"; + version = "3.18"; srcAll = fetchFromGitHub { owner = "WiringPi"; repo = "WiringPi"; tag = version; - hash = "sha256-NBHmRA+6Os6/IpW8behbgpVjtN8QF9gkffXU2ZVC8ts="; + hash = "sha256-7zDknn2UUR2Dt3BUJ9YI0LAjRedVyUPJAiIBiRyyphQ="; }; mkSubProject = { diff --git a/pkgs/by-name/wi/witr/package.nix b/pkgs/by-name/wi/witr/package.nix index b22c6fde110e..62cd99a12c1d 100644 --- a/pkgs/by-name/wi/witr/package.nix +++ b/pkgs/by-name/wi/witr/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "witr"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "pranshuparmar"; repo = "witr"; tag = "v${finalAttrs.version}"; - hash = "sha256-0OjGVdZ6WZbEtrOmkygsA5UdPya3feGNQ3jdCvxiTM0="; + hash = "sha256-myVl7mphBAc4BnWL62+X3hSfAkk/s0CmsZlM65n0HN0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 09df550969a4..4ee650fb3a38 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -43,7 +43,7 @@ # io modules cgns, adios2, - libLAS, + liblas, gdal, pdal, alembic, @@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: { ) python3Packages.pythonImportsCheckHook; buildInputs = [ - libLAS + liblas alembic imath c-blosc diff --git a/pkgs/development/python-modules/buildcatrust/default.nix b/pkgs/development/python-modules/buildcatrust/default.nix index 957b0a7c41fc..2b859b5ad3f8 100644 --- a/pkgs/development/python-modules/buildcatrust/default.nix +++ b/pkgs/development/python-modules/buildcatrust/default.nix @@ -6,17 +6,17 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "buildcatrust"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GYw/RN1OK5fqo3em8hia2l/IwN76hnPnFuYprqeX144="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ lukegb ]; }; -} +}) diff --git a/pkgs/os-specific/linux/hid-fanatecff/default.nix b/pkgs/os-specific/linux/hid-fanatecff/default.nix new file mode 100644 index 000000000000..9ccdb93cc322 --- /dev/null +++ b/pkgs/os-specific/linux/hid-fanatecff/default.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + kernelModuleMakeFlags, + bashNonInteractive, + linuxConsoleTools, + nix-update-script, +}: + +let + moduleDir = "lib/modules/${kernel.modDirVersion}/kernel/drivers/hid"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "hid-fanatecff"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "gotzl"; + repo = "hid-fanatecff"; + tag = finalAttrs.version; + hash = "sha256-aVuTnrxw7zWMZ1U21DUKDvcYlIp7iHJHaX8ijmUd/TE="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + postPatch = '' + mkdir -p $out/{lib/udev/rules.d,${moduleDir}} + + sed -i '/depmod/d' Makefile + substituteInPlace Makefile \ + --replace-fail '/etc/udev/rules.d' "$out/lib/udev/rules.d" + + substituteInPlace fanatec.rules \ + --replace-fail '/usr/bin/evdev-joystick' '${lib.getExe' linuxConsoleTools "evdev-joystick"}' \ + --replace-fail '/bin/sh' '${lib.getExe bashNonInteractive}' + ''; + + makeFlags = kernelModuleMakeFlags ++ [ + "KVERSION=${kernel.modDirVersion}" + "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "MODULEDIR=$(out)/${moduleDir}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Linux module driver for Fanatec driving wheels"; + homepage = "https://github.com/gotzl/hid-fanatecff"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ rake5k ]; + platforms = lib.platforms.linux; + mainProgram = "hid-fanatecff"; + }; +}) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index b3aa9f4c363b..1af4dce118a6 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mcelog"; - version = "208"; + version = "210"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; tag = "v${finalAttrs.version}"; - hash = "sha256-UBWgdRrSNkocreyFs61IxtdbUrL1UGn2gJswqXjWhlY="; + hash = "sha256-RcIcEu9Y6ggYHDP46hMA/HBXq447gYbOzCcyEAiBDNM="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b1967573f896..99140c757a51 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -87,14 +87,6 @@ let ]; }); - imageio = super.imageio.overridePythonAttrs (oldAttrs: { - disabledTests = oldAttrs.disabledTests or [ ] ++ [ - # broken by pyav pin - "test_keyframe_intervals" - "test_lagging_video_stream" - ]; - }); - gspread = super.gspread.overridePythonAttrs (oldAttrs: rec { version = "5.12.4"; src = fetchFromGitHub { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7b5701eebc67..febec33d6424 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -996,6 +996,7 @@ mapAliases { libixp_hg = throw "'libixp_hg' has been renamed to/replaced by 'libixp'"; # Converted to throw 2025-10-27 libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # Added 2025-08-28 libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28 + libLAS = liblas; # Added 2026-02-08 liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20 libmesode = throw "'libmesode' has been removed because it was deprecated and archived upstream. Consider using 'libstrophe' instead"; # Added 2026-01-15 libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b4fe9c25fb7..1de21131f455 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9095,6 +9095,7 @@ with pkgs; nushellPlugins = recurseIntoAttrs { gstat = callPackage ../by-name/nu/nushell-plugin-gstat/package.nix { }; + bson = callPackage ../by-name/nu/nushell-plugin-bson/package.nix { }; formats = callPackage ../by-name/nu/nushell-plugin-formats/package.nix { }; polars = callPackage ../by-name/nu/nushell-plugin-polars/package.nix { }; query = callPackage ../by-name/nu/nushell-plugin-query/package.nix { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 43335fb607bd..d0273b4efa10 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -463,6 +463,8 @@ in nct6687d = callPackage ../os-specific/linux/nct6687d { }; + hid-fanatecff = callPackage ../os-specific/linux/hid-fanatecff { }; + new-lg4ff = callPackage ../os-specific/linux/new-lg4ff { }; zenergy = callPackage ../os-specific/linux/zenergy { };