Merge master into staging-next

nixos/modules/services/system/swapspace.nix

@@ -9,11 +9,27 @@ let
   cfg = config.services.swapspace;
   inherit (lib)
     types
+    mkIf
     mkOption
     mkPackageOption
     mkEnableOption
     ;
-  configFile = pkgs.writeText "swapspace.conf" (lib.generators.toKeyValue { } cfg.settings);
+  inherit (pkgs)
+    makeWrapper
+    runCommand
+    writeText
+    ;
+  configFile = writeText "swapspace.conf" (lib.generators.toKeyValue { } cfg.settings);
+  userWrapper =
+    runCommand "swapspace"
+      {
+        buildInputs = [ makeWrapper ];
+      }
+      ''
+        mkdir -p "$out/bin"
+        makeWrapper '${lib.getExe cfg.package}' "$out/bin/swapspace" \
+          --add-flags "-c '${configFile}'"
+      '';
 in
 {
   options.services.swapspace = {
@@ -28,6 +44,13 @@ in
       ];
       description = "Any extra arguments to pass to swapspace";
     };
+    installWrapper = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        This will add swapspace wrapped with the generated config, to environment.systemPackages
+      '';
+    };
     settings = mkOption {
       type = types.submodule {
         options = {
@@ -92,8 +115,8 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ cfg.package ];
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ (if cfg.installWrapper then userWrapper else cfg.package) ];
     systemd.packages = [ cfg.package ];
     systemd.services.swapspace = {
       wantedBy = [ "multi-user.target" ];

nixos/tests/swapspace.nix

@@ -1,10 +1,10 @@
 import ./make-test-python.nix (
-  { pkgs, lib, ... }:
+  { lib, ... }:
 
   {
     name = "swapspace";
 
-    meta = with pkgs.lib.maintainers; {
+    meta = with lib.maintainers; {
       maintainers = [
         Luflosi
         phanirithvij
@@ -38,6 +38,9 @@ import ./make-test-python.nix (
       machine.wait_for_unit("swapspace.service")
       machine.wait_for_unit("root-swapfile.swap")
 
+      # ensure swapspace wrapper command runs
+      machine.succeed("swapspace --inspect")
+
       swamp = False
       with subtest("swapspace works"):
         machine.execute("mkdir /root/memfs")

pkgs/applications/editors/jetbrains/source/build.nix

@@ -32,6 +32,13 @@
 }:
 
 let
+  kotlin_2_0_21 = kotlin.overrideAttrs (oldAttrs: {
+    version = "2.0.21";
+    src = fetchurl {
+      url = oldAttrs.src.url;
+      sha256 = "sha256-A1LApFvSL4D2sm5IXNBNqAR7ql3lSGUoH7n4mkp7zyo=";
+    };
+  });
 
   jbr = jetbrains.jdk-no-jcef-17;
 
@@ -147,7 +154,7 @@ let
     sourceRoot = "${src.name}/platform/jps-bootstrap";
     nativeBuildInputs = [ ant makeWrapper jbr ];
     patches = [ ../patches/kotlinc-path.patch ];
-    postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt";
+    postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin_2_0_21}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt";
     buildPhase = ''
       runHook preInstall
 
@@ -234,7 +241,7 @@ stdenvNoCC.mkDerivation rec {
     substituteInPlace \
       platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt \
       --replace-fail 'JPS_PLUGIN_CLASSPATH_HERE' '${kotlin-jps-plugin-classpath}' \
-      --replace-fail 'KOTLIN_PATH_HERE' '${kotlin}'
+      --replace-fail 'KOTLIN_PATH_HERE' '${kotlin_2_0_21}'
     substituteInPlace \
       platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt \
       --replace-fail 'JDK_PATH_HERE' '${jbr}/lib/openjdk'
@@ -259,7 +266,7 @@ stdenvNoCC.mkDerivation rec {
     export JPS_BOOTSTRAP_COMMUNITY_HOME=/build/source
     jps-bootstrap \
       -Dbuild.number=${buildNumber} \
-      -Djps.kotlin.home=${kotlin} \
+      -Djps.kotlin.home=${kotlin_2_0_21} \
       -Dintellij.build.target.os=linux \
       -Dintellij.build.target.arch=x64 \
       -Dintellij.build.skip.build.steps=mac_artifacts,mac_dmg,mac_sit,windows_exe_installer,windows_sign,repair_utility_bundle_step,sources_archive \
@@ -275,7 +282,7 @@ stdenvNoCC.mkDerivation rec {
     runHook preBuild
 
     java \
-      -Djps.kotlin.home=${kotlin} \
+      -Djps.kotlin.home=${kotlin_2_0_21} \
       "@java_argfile"
 
     runHook postBuild

pkgs/by-name/bs/bsdgames/package.nix

@@ -8,14 +8,15 @@
   bison,
   less,
   miscfiles,
+  fetchpatch,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bsd-games";
   version = "2.17";
 
   src = fetchurl {
-    url = "mirror://ibiblioPubLinux/games/${pname}-${version}.tar.gz";
+    url = "mirror://ibiblioPubLinux/games/bsd-games-${finalAttrs.version}.tar.gz";
     hash = "sha256-Bm+SSu9sHF6pRvWI428wMCH138CTlEc48CXY7bxv/2A=";
   };
 
@@ -27,10 +28,31 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # Remove UTMPX support on Makefrag file
-    (fetchurl {
+    # Follow All patches from http://t2sde.org/packages/bsd-games.html
+    # May be removed in the next version
+    (fetchpatch {
+      url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/delay_output-sym.patch";
+      hash = "sha256-qbtp2cJVmEuxbTgpXM2gRHSNLE25OCmNxK+aeBBPRBw=";
+    })
+    (fetchpatch {
       url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch";
-      sha256 = "1k3qp3jj0dksjr4dnppv6dvkwslrgk9c7p2n9vipqildpxgqp7w2";
+      hash = "sha256-oioJ5M7DAUVzX8k998p2h/APn8azw9Z8txmBuly2ouw=";
+    })
+    (fetchpatch {
+      url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/hotfix-gcc43.patch";
+      hash = "sha256-9pkJmEOmM5vd/5nm3AlsbJNX0oX1kCtFrmciGpStvlA=";
+    })
+    (fetchpatch {
+      url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/hotfix-glibc.patch";
+      hash = "sha256-yNL88XORTXl2qSYTlYCYDN2G++TzBxywBpYdK+ufwrA=";
+    })
+    (fetchpatch {
+      url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/hotfix.patch";
+      hash = "sha256-UFXvtfVzJLRWvzbv0gaoVdt0vZOUj4UWWqoCZL/BDqE=";
+    })
+    (fetchpatch {
+      url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/postfix-bsd.patch";
+      hash = "sha256-Noqq+FpSJb3heejGGHyLYYkHB3fC4qCv/p1XMfEGdx8=";
     })
   ];
 
@@ -59,7 +81,7 @@ stdenv.mkDerivation rec {
     bsd_games_cfg_pager=${less}
     EOF
 
-    sed -e s/getline/bsdgames_local_getline/g -i $(grep getline -rl .)
+    sed -e '/sigpause/d' -i hunt/hunt/otto.c
   '';
 
   postConfigure = ''
@@ -67,6 +89,7 @@ stdenv.mkDerivation rec {
        -e "s,-o root -g root, ," \
        -e "s,-o root -g games, ," \
        -e "s,.*chown.*,true," \
+       -e 's/install -c -m 2755/install -Dm755/' \
        -e 's/INSTALL_VARDATA.*/INSTALL_VARDATA := true/' \
        -e 's/INSTALL_HACKDIR.*/INSTALL_HACKDIR := true/' \
        -e 's/INSTALL_DM.*/INSTALL_DM := true/' \
@@ -74,6 +97,10 @@ stdenv.mkDerivation rec {
        Makeconfig install-man
   '';
 
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
   meta = {
     homepage = "http://www.t2-project.org/packages/bsd-games.html";
     description = "Ports of all the games from NetBSD-current that are free";
@@ -81,4 +108,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ viric ];
     platforms = with lib.platforms; linux;
   };
-}
+})

pkgs/by-name/co/codeql/package.nix

@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.19.4";
+  version = "2.20.0";
 
   dontConfigure = true;
   dontBuild = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-eRRZwtrTOWsebDm5uAj/ABFrlbov39e6Xeb+K7WAIG8=";
+    hash = "sha256-c9O4rmAuCBuFeM8R2ha6wBCAnGwYRdapNpPhlSvgYjg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/de/deja-dup/package.nix

@@ -11,6 +11,7 @@
   itstool,
   desktop-file-utils,
   glib,
+  glib-networking,
   gtk4,
   coreutils,
   libsoup_3,
@@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libsoup_3
     glib
+    glib-networking
     gtk4
     libsecret
     libadwaita

pkgs/by-name/fb/fbvnc/gcc14-fix.patch

@@ -0,0 +1,25 @@
+diff --git a/vncauth.c b/vncauth.c
+index 79c4448..6348007 100644
+--- a/vncauth.c
++++ b/vncauth.c
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "vncauth.h"
+diff --git a/vncauth.h b/vncauth.h
+index 86dc455..7fdb8d4 100644
+--- a/vncauth.h
++++ b/vncauth.h
+@@ -25,6 +25,8 @@
+ #define CHALLENGESIZE 16
+ 
+ extern int vncEncryptAndStorePasswd(char *passwd, char *fname);
++extern int vncEncryptAndStorePasswd2(char *passwd, char *passwdViewOnly, char *fname);
+ extern char *vncDecryptPasswdFromFile(char *fname);
++extern int vncDecryptPasswdFromFile2(char *fname, char *passwdFullControl, char *passwdViewOnly);
+ extern void vncRandomBytes(unsigned char *bytes);
+ extern void vncEncryptBytes(unsigned char *bytes, char *passwd);

pkgs/by-name/fb/fbvnc/package.nix

@@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-oT7+6kIeFDgU6GbcHYQ6k0jCU84p8fTEVgUozYMkeVI=";
   };
 
+  patches = [
+    # GCC 14 errors on missing function definitions
+    # https://github.com/zohead/fbvnc/pull/3
+    ./gcc14-fix.patch
+  ];
+
   makeFlags = [
     "CC:=$(CC)"
   ];

pkgs/by-name/fn/fna3d/package.nix

@@ -7,14 +7,14 @@
 }:
 stdenv.mkDerivation rec {
   pname = "fna3d";
-  version = "24.12";
+  version = "25.01";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FNA3D";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-ieodMkzBDPq8WCTEyPMENFxoGwrknWV6qsVCZmi0TwQ=";
+    hash = "sha256-0BD3aFIg3miBhGr6YuWJyrRxWsNnPNIFNiZSzPalJ/c=";
   };
 
   buildInputs = [ SDL2 ];

pkgs/by-name/li/libsigrokdecode/package.nix

@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libsigrokdecode";
-  version = "0.5.3-unstable-2023-10-23";
+  version = "0.5.3-unstable-2024-10-01";
 
   src = fetchgit {
     url = "git://sigrok.org/libsigrokdecode";
-    rev = "0c35c5c5845d05e5f624c99d58af992d2f004446";
-    hash = "sha256-1kQB7uk2c+6Uriw+1o6brThDcBLoCdPV0MVWAha7ohk=";
+    rev = "71f451443029322d57376214c330b518efd84f88";
+    hash = "sha256-aW0llB/rziJxLW3OZU1VhxeM3MDWsaMVVgvDKZzdiIY=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/mi/mise/package.nix

@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mise";
-  version = "2024.12.17";
+  version = "2025.1.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
     rev = "v${version}";
-    hash = "sha256-kdI7GEtUlVUJYN7ch8RjG1aWBMDkvLkdUGfyqWv4yAQ=";
+    hash = "sha256-q6kzDs2YBeO3H/4LuKszkelT1SKfe5yK8j5yG41WHQQ=";
   };
 
-  cargoHash = "sha256-7ORbX2rWZ4tuf7qQo5lwTpHGFNCpo8R5ywJDdBjZcMU=";
+  cargoHash = "sha256-c/PgxIdLrKfDdeHL3HNuhvmgtSsFr/lhMPR6r2NVWBg=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/op/openlinkhub/package.nix

@@ -0,0 +1,40 @@
+{
+  buildGoModule,
+  lib,
+  fetchFromGitHub,
+  udev,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "openlinkhub";
+  version = "0.4.4";
+
+  src = fetchFromGitHub {
+    owner = "jurkovic-nikola";
+    repo = "OpenLinkHub";
+    tag = version;
+    hash = "sha256-MpG2RJdzDGaoXfN8YdxqXttpsjAEslN5xGdkWyDWX/c=";
+  };
+
+  proxyVendor = true;
+
+  vendorHash = "sha256-nDE3GUZl5OBSlhRpJBixUbWhhFMeieidNrSIzOOB/9g=";
+
+  buildInputs = [
+    udev
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/jurkovic-nikola/OpenLinkHub";
+    platforms = lib.platforms.linux;
+    description = "Open source interface for iCUE LINK Hub and other Corsair AIOs, Hubs for Linux";
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    license = lib.licenses.gpl3Only;
+    mainProgram = "OpenLinkHub";
+    changelog = "https://github.com/jurkovic-nikola/OpenLinkHub/releases/tag/${version}";
+  };
+}

pkgs/by-name/pq/pql/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pql";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "runreveal";
     repo = "pql";
     rev = "v${version}";
-    hash = "sha256-xNWwjDdnF4+IvS814iJlqCFYNOGNF2nHEnnbRqxJsjM=";
+    hash = "sha256-/112LQfIkya/9hzq3nxtpdSarHIshPw4mezNcKm4xyI=";
   };
 
-  vendorHash = "sha256-j/R+1PWfX+lmm99cHWSuo+v8RxKg089Bvb4rFHpmpfE=";
+  vendorHash = "sha256-hYCbwDChI7pnc9aZ/i2PffTwSBjUjc0Qc71D4EfUOI8=";
 
   ldflags = [
     "-s"

pkgs/by-name/ro/robotframework-tidy/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "robotframework-tidy";
-  version = "4.14.0";
+  version = "4.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MarketSquare";
     repo = "robotframework-tidy";
-    rev = "refs/tags/${version}";
-    hash = "sha256-FsZraD0Kn9e6J0XzJsm4m0dIXHi86AWGad13ggqm3h4=";
+    tag = version;
+    hash = "sha256-PNf0K1+kjijvJ53UCKkC2LyjBJOroDPdtYjcXbRU1VI=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

pkgs/by-name/si/simdutf/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "5.7.1";
+  version = "5.7.2";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CrWFs8fjgkvElbsvfS3jOyk1G+fBQB1lt63EvU6p11c=";
+    hash = "sha256-rSEl5g9FZiOrYRoHkBAUbMWE1kZvl3pbhkskzoMbIb0=";
   };
 
   # Fix build on darwin

pkgs/by-name/sw/swapspace/package.nix

@@ -10,14 +10,14 @@
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "swapspace";
   version = "1.18.1";
 
   src = fetchFromGitHub {
     owner = "Tookmund";
     repo = "Swapspace";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-KrPdmF1H7WFI78ZJlLqDyfxbs7fymSUQpXL+7XjN9bI=";
   };
 
@@ -45,21 +45,24 @@ stdenv.mkDerivation rec {
     install --mode=444 -D 'swapspace.service' "$out/etc/systemd/system/swapspace.service"
   '';
 
-  # Nothing in swapspace --help or swapspace’s man page mentions
-  # anything about swapspace executing its arguments.
-  passthru.binlore.out = binlore.synthesize swapspace ''
-    execer cannot bin/swapspace
-  '';
-  passthru.tests = {
-    inherit (nixosTests) swapspace;
+  passthru = {
+    # Nothing in swapspace --help or swapspace’s man page mentions
+    # anything about swapspace executing its arguments.
+    binlore.out = binlore.synthesize swapspace ''
+      execer cannot bin/swapspace
+    '';
+    tests = {
+      inherit (nixosTests) swapspace;
+    };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Dynamic swap manager for Linux";
     homepage = "https://github.com/Tookmund/Swapspace";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ Luflosi ];
+    changelog = "https://github.com/Tookmund/Swapspace/releases/tag/v${finalAttrs.version}";
     mainProgram = "swapspace";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ Luflosi ];
   };
-}
+})

pkgs/by-name/tm/tmuxp/package.nix

@@ -7,12 +7,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "tmuxp";
-  version = "1.49.0";
+  version = "1.50.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Fip2HnwIa03khiYlL5FkhVo84oS0OSD9f79bEFLBoNc=";
+    hash = "sha256-v7k0S0dMmpmwZkCJhPKiE+sEtVkOL+tE4Io66EIEXP0=";
   };
 
   build-system = with python3Packages; [

pkgs/by-name/va/vacuum-go/package.nix

@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "vacuum-go";
-  version = "0.14.3";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     rev = "refs/tags/v${version}";
-    hash = "sha256-EVAfaZ/cbhBKSoAlrNP2QOM/2zKFxhe2uBoVfB4DL4c=";
+    hash = "sha256-OsujmYu0QNyfyj6W8+aPcV4xsjpwZDWSJC7WjIw+rOc=";
   };
 
-  vendorHash = "sha256-M9+AKgZwqnOtejIHdBF8MAWg2sJLX2cJtNdMZylp1UE=";
+  vendorHash = "sha256-xTqrKkCRO6lUbzXI4/UrBoZsKU9mQW8cMrnZ2X3wzog=";
 
   env.CGO_ENABLED = 0;
   ldflags = [

pkgs/by-name/wa/warp-terminal/versions.json

@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-CrRt7fLoZ9LR3fD7xXBzlRFf4CAjQjokU5UaHNJnVNA=",
-    "version": "0.2024.12.18.08.02.stable_03"
+    "hash": "sha256-Un5dqYt3kGh3ODZnP2nskfzhma7KkpZXJTqPfwcZ4Dw=",
+    "version": "0.2024.12.18.08.02.stable_05"
   },
   "linux_x86_64": {
-    "hash": "sha256-0A9EPkDp77tpfrRuXV2rVPaXMYbY7erbKBd6IT9CTFQ=",
-    "version": "0.2024.12.18.08.02.stable_03"
+    "hash": "sha256-U14TFQg72vfizYu8qXjH+JafL5aWndz1sbMSF3TD/+E=",
+    "version": "0.2024.12.18.08.02.stable_05"
   },
   "linux_aarch64": {
-    "hash": "sha256-IlqpK8IbtSMKGNspKj2Rq2Jzlyc7RYcfRaoYY9Akhdk=",
-    "version": "0.2024.12.18.08.02.stable_03"
+    "hash": "sha256-lbZawoh9VUhNlbs+pxUu5pdWsizq9B1UPBsaNxUSs20=",
+    "version": "0.2024.12.18.08.02.stable_05"
   }
 }

pkgs/by-name/zf/zfs-replicate/package.nix

@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  python3Packages,
+  fetchFromGitHub,
+  lz4,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "zfs_replicate";
+  version = "4.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "alunduil";
+    repo = "zfs-replicate";
+    tag = "v${version}";
+    hash = "sha256-VajMSoFZ4SQXpuF1Lo6S9IhxvspCfUwpNw5zg16uA3M=";
+  };
+
+  # For compression to work, both local and remote systems must have lz4 installed.
+  # This hard codes the path to the lz4 binary when running it on the local system.
+  postPatch = ''
+    substituteInPlace zfs/replicate/compress/command.py \
+      --replace-fail \
+        '("/usr/bin/env - lz4 | ", "/usr/bin/env - lz4 -d | ")' \
+        '("${lib.getExe lz4}  | ", "/usr/bin/env - lz4 -d | ")'
+  '';
+
+  build-system = with python3Packages; [
+    poetry-core
+  ];
+
+  dependencies = with python3Packages; [
+    click
+    stringcase
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    hypothesis
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  doCheck = true;
+
+  disabledTestPaths = lib.optionals stdenv.isDarwin [
+    # AssertionError: Expected SystemExit or FileNotFoundError
+    "zfs_test/replicate_test/cli_test/main_test.py"
+  ];
+
+  meta = {
+    description = "ZFS Snapshot Replication";
+    homepage = "https://github.com/alunduil/zfs-replicate";
+    changelog = "https://github.com/alunduil/zfs-replicate/blob/v${version}/CHANGELOG.md";
+    mainProgram = "zfs-replicate";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ alunduil ];
+  };
+}

pkgs/development/compilers/kotlin/default.nix

@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, makeWrapper, jre, unzip }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "kotlin";
   version = "2.1.0";
 
   src = fetchurl {
-    url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
+    url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
     sha256 = "sha256-tmmNVyitj57c3QFhfWOAcxkdigMTnMU4o5G043Wa0pc=";
   };
 
@@ -40,4 +40,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ SubhrajyotiSen ];
     platforms = lib.platforms.all;
   };
-}
+})

pkgs/development/libraries/physics/lhapdf/default.nix

@@ -53,8 +53,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "General purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files";
-    license = licenses.gpl2;
-    homepage = "http://lhapdf.hepforge.org";
+    license = licenses.gpl3;
+    homepage = "https://www.lhapdf.org";
     platforms = platforms.unix;
     maintainers = with maintainers; [ veprbl ];
   };

pkgs/development/libraries/physics/lhapdf/maintainer.sh

@@ -6,8 +6,8 @@ set -xe
 
 BASE_URL="https://lhapdfsets.web.cern.ch/current/"
 
-for pdf_set in `curl -L $BASE_URL 2>/dev/null | "$SED" -n -e 's/.*<a href=".*\/\([^"/]*\.tar\.gz\)".*/\1/p' | sort -u`; do
-    echo -n "    \"${pdf_set%.tar.gz}\" = \""
+for pdf_set in `curl -L $BASE_URL 2>/dev/null | "$SED" -n -e 's/.*<a href="#" data-url="\([^"/]*\.tar\.gz\)".*/\1/p' | sort -u`; do
+    echo -n "  \"${pdf_set%.tar.gz}\" = \""
     nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n'
     echo "\";"
 done

pkgs/development/libraries/physics/lhapdf/pdf_sets.nix

@@ -35,6 +35,7 @@ lib.mapAttrs mkPdfSet {
   "ABMP16_4_nnlo" = "1cw52ijyrhgvyqc28pp278bavy9acvs6qywysgc7qjifygb14mca";
   "ABMP16_5_nlo" = "0s7yz85fjfkmmxj3xdkhz5658n3nx8rr4yjz4hrqbcy00zdcscr2";
   "ABMP16_5_nnlo" = "0iyypvj4645g7nh8w6v88pz37p81bxilgc4p7wlkaa90hiq0wrk0";
+  "ABMP16_5_nnlo_high_x" = "06nldc7x3z7z27d6pz8hyy04p9nh2y9djnj3hbnpnx52qkmiw4vk";
   "ABMP16als112_5_nnlo" = "17kg6gvl09p5gm99yb9d8hkl1q51904qflsziv3r5ybxs18ym5g8";
   "ABMP16als113_5_nnlo" = "1gaiyq70zxx7c7c0gkkad3ygbhdwc563al2a6ksy78q8is3bhdy9";
   "ABMP16als114_5_nlo" = "0vnwbz6v2d02d5r34ysd7b4d22h948f3zri2n3yj93k6za9y42gw";
@@ -67,6 +68,11 @@ lib.mapAttrs mkPdfSet {
   "ATLASepWZVjet20-EIG" = "0lvd3zkmisx95rbjx7r9wkk0s0mxvaybp3pk66sxrxf1bj1l9r52";
   "ATLASepWZVjet20-MOD" = "1iyb50isdsy3a5wnlm0185z9bfs6nxwlcl1aqlh4h3j1dbmz4ba9";
   "ATLASepWZVjet20-PAR" = "1kfqii7sbcs8zdsyd9kiy3r233nawc9yfc23fb6ql0xcwfzpyb1d";
+  "ATLASpdf21_T1" = "06p9lzchprnfnx79djz6hdgv4hpvghmylxx2a41a8kp10bshc0gd";
+  "ATLASpdf21_T3" = "0apfbydnakn898m7ny5vcp2jgnlfh79zxkcsdpzm7va2zvh686wm";
+  "CGMP_B-hadron_NNLO_as_0118" = "00j7rm20kyf6k2j45inb478bjikml6jf1h34ynfda9fhh5vv20ks";
+  "CGMP_B-hadron_to_Jpsi_NNLO_as_0118" = "087gszpxj43db1am005d4aavwr858y2vr2yf71aw1581j7ln7grv";
+  "CGMP_B-hadron_to_muon_NNLO_as_0118" = "026j6y0jglh0sdivrq3cmmrlydq3d6fw4780wll3m8i5mz3aal61";
   "CJ12max" = "1vk2zkaiqbl6fixaxy7mrggmmxv7lvnw736lxm5sh25dapg6s8ag";
   "CJ12mid" = "0s2558ihypn0l9qqx25qwnawbc7fkbi2wwwhbyb108rjk2klaf8v";
   "CJ12min" = "1kdla638m3axr65ndid9irmqhby4gl084r297xw3jxxlrb0b7hj9";
@@ -229,7 +235,12 @@ lib.mapAttrs mkPdfSet {
   "CT18ANNLO_as_0122" = "1nbkgb0wmjh2bfx944sqb810sn4bb0ppxgv2aw2y93jbfyx7x4ry";
   "CT18ANNLO_as_0123" = "1rlxn70mc299v596y0dwp9a1pdy1yz0r8367cjw5l97y46yxhjrh";
   "CT18ANNLO_as_0124" = "0sfkvhyxp9sqf75wj91h9h59vcs2y2n4qchsg0marjy849xxh6qb";
+  "CT18FC" = "1ashbdgym3z27c217hhy6xmrmgg2899nlj881b4v0kbv3fhkwnbh";
+  "CT18LO" = "0gqyr8bd3v8xw9smwnsprg0yzkf6wsi4jsyi2gjcix6hxf8pbhz3";
   "CT18NLO" = "04y2p6vz484l3yv6381pfavqs3xh78h3jn6bg7ncp5vywwqp44n9";
+  "CT18NLO_NF3" = "07dbi10qrkc0jqjcfir6j38zj56jvimarry6a9xxk3zp3idqb15g";
+  "CT18NLO_NF4" = "1psg0vw0waff06pcghiliaa8afrjlgwmmc9xsf6gd1c47kk86qgw";
+  "CT18NLO_NF6" = "04dmgjjlv15zzanwsjgm4wpsjzhiqaldz225iq6vs1szw5x1zdp8";
   "CT18NLO_as_0110" = "0nrydk44sp7hgabn6xk6r2hnkir7mgddcsbbnqmpwmq3x0xz27pn";
   "CT18NLO_as_0111" = "17xwzcj4n1bmfwz02n2g8afzxc4lp5diij00f2w50pqh2w7vj6g9";
   "CT18NLO_as_0112" = "0a6lsmpz3c1z7dm593nb3r9q7dgpskkls2i6wpdlrrg6s6cr8rmq";
@@ -246,6 +257,9 @@ lib.mapAttrs mkPdfSet {
   "CT18NLO_as_0123" = "1bl6rf69gjnblvfdh5p8flax9qb65vk25hcfjw2r7qwdz3dxs6sr";
   "CT18NLO_as_0124" = "18mhpn4l3qqg9v79z2vz4jc8w3za726fndfl6sbc9mf94jy72chm";
   "CT18NNLO" = "1shkah5ma0hp101aklkz2p8n9y4i4sv6zwa5ifzyj3bgz1020l5f";
+  "CT18NNLO_NF3" = "1lrmdiccsiqq1awhszd4vyrm1xbvknnya88c2qh10q63z7r01xin";
+  "CT18NNLO_NF4" = "1dkr3w0m8gxk302p1bvv06wx9vplb15zjdwfgayavr3sj2axm4xs";
+  "CT18NNLO_NF6" = "1ivddp2sv8w25sl62gl3fmswp9ii8jjxg246m7igh0hpz35p9b65";
   "CT18NNLO_as_0110" = "0v7nsjcm1q7hgj726zlvfydl3arqkwyddd20z3g0nwdqcimv3qs9";
   "CT18NNLO_as_0111" = "118444ygv03ryhbb28njbsayvv0rdlcb9djja6p62kk6rnbwi1wz";
   "CT18NNLO_as_0112" = "0djxkvwk628sxgf62bff40m2m6vgzs08jss61f90rscvj6gxid5b";
@@ -294,6 +308,9 @@ lib.mapAttrs mkPdfSet {
   "CT18XNNLO_as_0123" = "02kak35pj6c4hml75na7452ryashfclglhahclzkpq8gs72l5w91";
   "CT18XNNLO_as_0124" = "03wym12nvwdcr13dz6d2gr4bz3csffnn21zfdld42fsyq4glx431";
   "CT18ZNLO" = "0iv8laks2ymn5fygk6k9lxm3s7fld5g292n9bfkhn3nmcfxczi03";
+  "CT18ZNLO_NF3" = "0nplvmpd0crhb7526z373mb5z00057p3adsx2kgiqd6q644si1x7";
+  "CT18ZNLO_NF4" = "0253bs83sjzp099sxymzqzs3p7f3czcn1x3bwj4wlv4jvf7wd057";
+  "CT18ZNLO_NF6" = "02gyxj2mg3jk87yaw3j6szl7n3grgphw89wyp4fc6g87rgsh9lnj";
   "CT18ZNLO_as_0110" = "1d0j9nmn9mk90698pxqlpgz7c7cyxswc88n89cr2h8mgcg2w8g2v";
   "CT18ZNLO_as_0111" = "17l7j1j2x529mhk0andkdh83k9z6kg9v3ccfna08i7d4iilsdfrs";
   "CT18ZNLO_as_0112" = "1b8mi0jwln2wvysrkbm1fvay053d17dzvlj9fkz36xmr03bv5mvj";
@@ -310,6 +327,9 @@ lib.mapAttrs mkPdfSet {
   "CT18ZNLO_as_0123" = "14cl8fmkl6jav7byqwcfa1z2ml6lnn6pzp0w4nqy75gc7wxsba0m";
   "CT18ZNLO_as_0124" = "18riha0fflfbsgh7nnc3ghm8cpzpcss0z6l48d28bbq0i7caqad7";
   "CT18ZNNLO" = "0zsqrpab6vgcinsxjq3rqdadig5flxzk61wc1aa9rwnkbpm1paa5";
+  "CT18ZNNLO_NF3" = "0kgac920jn9c2klhzbv6ydlmg4qn673kw0jbixa6ar4ka7ap0rpy";
+  "CT18ZNNLO_NF4" = "0b5bx8lv2816l5lpzkrx3l592ynk2v8pmm9mhygmpcympyanxwjr";
+  "CT18ZNNLO_NF6" = "1w5s8sg1lg2mgaxya0xk5pqbzg3xaqwryxs1sl3rzqlvjkqg4ca6";
   "CT18ZNNLO_as_0110" = "06qzlfshx8gwrhnmjfvz6sxq7h2is1dqvx5sz8jxrr1gl7gl92h9";
   "CT18ZNNLO_as_0111" = "08k101cn9x9y44zcpn6iql85qqx89rv7xjhvak4y6s309p9rlnzi";
   "CT18ZNNLO_as_0112" = "1c72mz93kha8mdfdcwj8fs8dqqylxmmc4vs7fjf9h7xbrqzmss7m";
@@ -325,6 +345,12 @@ lib.mapAttrs mkPdfSet {
   "CT18ZNNLO_as_0122" = "1bd4193ggv4nb48d0mw2n93ia30h4myfy197k9b0m3qc90xjq77z";
   "CT18ZNNLO_as_0123" = "0r2vri1brq0xcrpj0cg9hf9kwhkh2czmimrsg5bfvx35adiiis19";
   "CT18ZNNLO_as_0124" = "1wq0nz9jfb5fmzwnnh0xyra2j62kb5xpmh2nyy8ih4lvxhgi16mg";
+  "CT18qed_neutron" = "0fvf13n1srxpzm2y0dd4ay2izb8q7hldf9fcppcp1002nf5wg0h3";
+  "CT18qed_neutron_elastic" = "1pjap6sxh5mp6xf6ha0hrl5kkj1qyckkls100axxsd64d6df2q0z";
+  "CT18qed_neutron_inelastic" = "177i6zxyw8r173gpzkn8vclkw06dgj5lg83yspj0n6j1kfszr38h";
+  "CT18qed_proton" = "01z8kil3xflzjp4gf30577dcqmby534sx1czrkvm51g1dx1h3alq";
+  "CT18qed_proton_elastic" = "1cdxhjmhdpgb8hs0ibz8hbb9p1i5c8kykw5qg9qz3zjsgxhn24vk";
+  "CT18qed_proton_inelastic" = "03i5gjj673pxc0qy48p0qwjlhrwsjvgf4702x0hg5nyqpqw4inm2";
   "EPPS16_B_90CL_Au_hess" = "0ab3pnv8fq45mdp29m6lfmrhhnr88k6qvkq6lwxmn17k39v8j9w4";
   "EPPS16_B_90CL_Pb_hess" = "1cjc79sygpxnir3qw9n6cdwvd3flfn11ajqs5y64svrpsqcx5ng0";
   "EPPS16_B_c_90CL_Au_hess" = "1ijvnglq4wrjhhvksyd60s7c6nv50vwyk5vd8c3gs0qr8yz1fk69";
@@ -363,6 +389,23 @@ lib.mapAttrs mkPdfSet {
   "EPPS16nlo_CT14nlo_Pt195" = "14v1gicvm8i8z9d98rlv5rbhaglkbi9fhs3z465p4d764al6znnc";
   "EPPS16nlo_CT14nlo_Sn119" = "10nxn6rdp7svsrkdcdwxryjmirn1s871yj1w493adpfcy3chqw9k";
   "EPPS16nlo_CT14nlo_W184" = "1x8ndmkzmnl79vz1bgi9972190x03asvgnls6qiz746xl37q4ky7";
+  "EPPS21nlo_CT18Anlo_Ag108" = "1fb4m3x7c5bipv50cj1i3izpda0lxah7wihsh11i5b8daxdny8wg";
+  "EPPS21nlo_CT18Anlo_Al27" = "03v7rr4sf6i987yx1xy6qmhfrgz0k9b3ddza443q4agc0qx4w945";
+  "EPPS21nlo_CT18Anlo_Ar40" = "1wmm7naw1cb7j5jwd6k2li0jsqjcssag4andx5grd665vl9izsyz";
+  "EPPS21nlo_CT18Anlo_Au197" = "0a7szqg7rb9pjmcd36z5w8qzpp9cxzhh98hd71qn178ijhmw2adm";
+  "EPPS21nlo_CT18Anlo_Be9" = "1jpx260m7zzafcwddbk3b590sh7c5a7fbz4sjqgy0jgyhvvcrm4m";
+  "EPPS21nlo_CT18Anlo_C12" = "0xds8wp4ncwbkahkf4wy2myf1ccwm6zcf6n2xy89zhddz7f3bzsk";
+  "EPPS21nlo_CT18Anlo_Ca40" = "1fj4ggsab6m52r3zfw8yyc3gr5vlyzdd8m8w7j46mkvg1hb712w1";
+  "EPPS21nlo_CT18Anlo_Cu64" = "1125d3alfikxs26sk9zm89damb1qxp62azsmbrsm6glpxy55jvzm";
+  "EPPS21nlo_CT18Anlo_Fe56" = "0xg0rgdffbnar4gaq7xdnh6rayvma7znf6njn6hwd9zmi6ha04m7";
+  "EPPS21nlo_CT18Anlo_He3" = "1v2r1lxqlp8bb80b2dqjs00jd6k102zhfjsy4sy1ra97fv6s2ism";
+  "EPPS21nlo_CT18Anlo_He4" = "07in45vd0wmpv03447vmidbxi76pvlm85k74kc4vgwkijp6y9dyc";
+  "EPPS21nlo_CT18Anlo_Li6" = "0s6qbik9rigbgvjnk5qxxlg4r3sji2kikd45hhaxn7pnimpmzzhs";
+  "EPPS21nlo_CT18Anlo_O16" = "1mxi57b35hw2hdf2cqdzl4gbvbbg03y3v0dhfc1x6fdxny53900y";
+  "EPPS21nlo_CT18Anlo_Pb208" = "11vjm08ql8c6zc2samvnxfqa8368ibj3jvrmc2p6msa18f8yyrhi";
+  "EPPS21nlo_CT18Anlo_Pt195" = "06kwyjszvm1y53q0iankjagypxyp9gwncsyqb1m2lpv72lar371g";
+  "EPPS21nlo_CT18Anlo_Sn119" = "0d6jid5zf0b0j1b0ch00n1qlnrgknn8z9i14nx9yg58y9l5mzr2w";
+  "EPPS21nlo_CT18Anlo_W184" = "15ss4j6cicp9z7mlpwc9r51r53ksrrzk53l8yyxjq2xwrba0l66q";
   "GKG18_DPDF_FitA_LO" = "0ql03hp30wfaw9gfyska0v5vf4p3n2dsxvkapjqnyfl01ad6vjw2";
   "GKG18_DPDF_FitA_NLO" = "0n9khzvhyxfwbl758vzy8jgyqkgcgl328m657vlami3w22hmpbrz";
   "GKG18_DPDF_FitB_LO" = "0s15ia8mcn00xl28rhdxjigpq0ai80a831366sx0w7qx44bb5n0p";
@@ -472,9 +515,19 @@ lib.mapAttrs mkPdfSet {
   "LUXqed17_plus_PDF4LHC15_nnlo_100" = "18y3pa6gjmcv2s21si9a5dvbq6xxqphbqz5qiy39c62g2zf8512c";
   "LUXqed17_plus_PDF4LHC15_nnlo_30" = "1bnwlxr8p4xmr36zd2flhqssil6w7jh50k46j0mxfnd8jgxgwn6n";
   "LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib";
-  "MAPFF10NLOPIm" = "0w875dh5klqgggcr84g0g7qmh4q2xim8nrf0xdnfc665xww7v4my";
-  "MAPFF10NLOPIp" = "1493k3p7b03sw0n7va60vqxcry2b3xgpww6fnk2gx8b4w1632yn2";
-  "MAPFF10NLOPIsum" = "0x6sashkhg1hs7wy6fyln12s1f4yavvc90zv4k7rclbah4hr75wm";
+  "MAP23Pion_PRVnlo" = "0hjlswv2dj9pa3xr5w4pka3kpjjydgz390k84rz91mb5rl25bf92";
+  "MAPFF10NLOKAm" = "0sp5gyk2ja4ckbqph2373awicbcs7pi8g925d5yia7hhvy2hp3z3";
+  "MAPFF10NLOKAp" = "15y9ix1jiq03k5y8sv5a5j1kszc6ha0ahyk7p41qbrdv6w75xn35";
+  "MAPFF10NLOKAsum" = "0yyz6qhh8pg0xirds90w0had2ij8b9d90d78df4r8ax96arhp12h";
+  "MAPFF10NLOPIm" = "1nz2fiy186kxcl64cqrii9chrxm2bqs4c4b4xjy18mk7f5z1i3c1";
+  "MAPFF10NLOPIp" = "1w6kk5sppn9mmjqaa419rknpvc68vqza8i4bdc83cn262wqqgf30";
+  "MAPFF10NLOPIsum" = "0v0brfw8gc2qsf8qnfp5h6mcfbr54zjva8mrp9xd8m3askf7qpzv";
+  "MAPFF10NNLOKAm" = "1p0rik42376c3as6zka47vckym5v0m88r8snmj5sdaa6kggp9par";
+  "MAPFF10NNLOKAp" = "0fx5abjyjz0abhlfcaiik5f4n2brwwknmkiak3qancf9qpg6f4f3";
+  "MAPFF10NNLOKAsum" = "1rppj4phmz74d40qdzfgdhh349s1cghvjqmkawr8y5gilgilgw36";
+  "MAPFF10NNLOPIm" = "029qj9asj4pzx1zymijxhyiz9c6rmcyywqyzl2h14433f25a28c9";
+  "MAPFF10NNLOPIp" = "05zibjyyyp2vcy22jn0yw3hpq7sc1ljim0qz8mlm37y2jfgkgsm7";
+  "MAPFF10NNLOPIsum" = "0p3sgznfx4kgmpl4s9qqcrkwdv8l7slaa5600ax422d67ikhsfln";
   "METAv10LHC" = "1vn4wnx1blz6wylbzirswdqqf0knmyh1pcfh62wvj695mh7i0w16";
   "METAv10LHCH" = "1p4wy7m1ksz0r1fylwz3cbq7jl8s58v817n3d898l83ic2ghp4vj";
   "METAv10LHCHfull" = "1w623939fjdyx1316rxyaavf6kmxff19himr00br57jrw3v49nfg";
@@ -530,48 +583,57 @@ lib.mapAttrs mkPdfSet {
   "MRST2004qed_proton" = "10z0cr8pnr0lfxxi916naiz381a2cqn461jblfzvvddwqmqbllbc";
   "MRST2007lomod" = "13ar6hzw9al20zlm8lg0hvwmgrmv0dbam820gm36rj8p7i33qlr6";
   "MRSTMCal" = "0kbyp4rypw8jm28zfpvf0grvfvxmsrp3grwsmfxpa2c38x6la3rq";
-  "MSHT20lo_as130" = "0ivjvqabk9jnrlrczjlqywmijx5ql8wy579j77qkl1vhv7sqccm1";
+  "MSHT20an3lo_as118" = "0k4qwayl1v51i7j4pymz2zc7q7f3r1l49gv4yjbcdkfahpv7137k";
+  "MSHT20an3lo_as118_Kcorr" = "1wfjv53kmkbfbp0q3qp8rznfsxcqjd769b16y688f87y49nb8q8x";
+  "MSHT20an3lo_as_smallrange" = "01y648a0c6y9lizffv2ynbww7is6fa401nslfn8zj2gnnpw683h9";
+  "MSHT20lo_as130" = "0gcrsmqi70n9maznigdqbhwrgm1pk191wf6p8zsssy03rfxkfzff";
   "MSHT20nlo_as118" = "1qwbwcq8p4hrprz4ib18mp5142b0lbyyzc1bf5a4iq5jjvi5qm93";
   "MSHT20nlo_as120" = "10y1a6iryahrafzdqskypjrnad6xxq08gm72pa9yc61xdy6andc6";
-  "MSHT20nlo_as120_mbrange_nf3" = "0548pw6lkwwqhlrg7c4cyqh76bcyz78yh06fs7crdbx7hfl47cj7";
-  "MSHT20nlo_as120_mbrange_nf4" = "0pg49mad4845llj49a1piaggd8wpwb2s4ar7jydlhrv7im886by4";
-  "MSHT20nlo_as120_mbrange_nf5" = "0148agm89p7pwzdfjk8gjdaicll30xhz6sawca632kp5qwyd4g3d";
-  "MSHT20nlo_as120_mcrange_nf3" = "187hgg8klk5jhcadiy8viyrfi0jfb3i18jckv6d7nsapixz1wgkz";
-  "MSHT20nlo_as120_mcrange_nf4" = "12pjy0igjcsih100g238v143kq5cjjm5a13cghcipgcz2w4ldglf";
-  "MSHT20nlo_as120_mcrange_nf5" = "00mipn9ndnw1k4nx6pmxb95wddmh98hg9k0317vlirxrf2n2jy7g";
-  "MSHT20nlo_as120_nf3" = "1zy0j9qc28xpav3gx24r6r02zfz49r11ic66hkyq83d3q3fj751b";
-  "MSHT20nlo_as120_nf4" = "0fpyf9s9ppb6w49chsmb2xfp9gwkx3ky9v8gwwqxli9fpzsc2ywn";
+  "MSHT20nlo_as120_mbrange_nf3" = "0p72rbgqwrsp408lmrbkkp108kfkvfglgysky56fyh096zlfsr7x";
+  "MSHT20nlo_as120_mbrange_nf4" = "0grmrxpmn7mrib64b8ammi8md9zqksic1zdph3k7qpf2x5jx3rfj";
+  "MSHT20nlo_as120_mbrange_nf5" = "1f55lqy79fbmcah1k8sgncb366ys3yhw52zir1iwd59pxrpk75hz";
+  "MSHT20nlo_as120_mcrange_nf3" = "1i7mvq055pqv3ppdj5wbsglbp33gd7fj7i48qbqv5l1kljx0jp79";
+  "MSHT20nlo_as120_mcrange_nf4" = "03wp26lcvksmdp4c2021wnkrs0z0f0vfrrqq6d77mj3b2r9rxqf6";
+  "MSHT20nlo_as120_mcrange_nf5" = "12pswr87izbrs1sc44vj0lf6dd2zq7zj5lbga671w6dgmaqs9biy";
+  "MSHT20nlo_as120_nf3" = "1y23arhnambkag5pvmwyprnzws19x3jcxv7fh6n9basizl38fpgl";
+  "MSHT20nlo_as120_nf4" = "1a3vm1vx9m48wryjfgafj2jixzizlas3qb4iighln20ya8ga2xf3";
   "MSHT20nlo_as_largerange" = "1f57dvxas2c6qnv38ysnsyf0y8imafnrxkcqh3b0an19mkln5mmg";
   "MSHT20nlo_as_smallrange" = "1rygvj33g84whl24kgpqa47g11c48l93jlnpzqq8f5zr1ijqcq7i";
-  "MSHT20nlo_as_smallrange_nf3" = "1d6cr1akc25mwfyghvn1986i60l76fxb8fd02h7f4pl4lmnn6i8n";
-  "MSHT20nlo_as_smallrange_nf4" = "08js1l5g6knjx3813i0rf34xfjkbn3mdsrbawzkn00vf49xzcxdj";
-  "MSHT20nlo_mbrange_nf3" = "1bwl4inshg5h3sslss4lgvcqahb5q0n794ag73hyacxd1kmx7d2z";
-  "MSHT20nlo_mbrange_nf4" = "1sm995pzzr601wcs4rjgjs6alm74vc23szgmkqa5dvxghw7x8w55";
-  "MSHT20nlo_mbrange_nf5" = "1sal7iqma7770593ifxypl9zapvba693asc8m2fjsbgpbfjjid60";
-  "MSHT20nlo_mcrange_nf3" = "0lmv6m8m7zv0s8kjfm8parr9xlfy39dhwxn71z33f5x6cyp08zlg";
-  "MSHT20nlo_mcrange_nf4" = "0875zfv0dws8n44fqawa1jp5p8b9vky8yyq48wijhrcph8qbxbrx";
-  "MSHT20nlo_mcrange_nf5" = "0qjvam29zwibx54fgijry58vdwqkiwyavdwn736bmckjycncnv8p";
+  "MSHT20nlo_as_smallrange_nf3" = "199is3r6is4g0jfjgw2v95pwsnvp9h6smg75jldgnnpj6giiwaxm";
+  "MSHT20nlo_as_smallrange_nf4" = "1d0l15f3vzc6vcv2gklm1nrs18315v3fch90q5gx9vqsxqv0img6";
+  "MSHT20nlo_mbrange_nf3" = "1ymndpasxp5zr5yvwrmgp9q23fzcx434nnhqlb1sms1fpzngrs0w";
+  "MSHT20nlo_mbrange_nf4" = "04fv7paincahgvnqdbg2pf3adrs0plccb92qcj7w16vyppw7963h";
+  "MSHT20nlo_mbrange_nf5" = "0jlzc62vlv92ibgxfn6mwfnxdf91ak6ns97lsni3v75x6a71gcx1";
+  "MSHT20nlo_mcrange_nf3" = "0k3bxs4sfba851m27xz7zq9njncxw0yq9fk2ivqrqnqk7mq5hkv8";
+  "MSHT20nlo_mcrange_nf4" = "11ndwp5vis2j786isp5sjrm1cc40hd4jbrd9bj1d95p4f4dk6hm8";
+  "MSHT20nlo_mcrange_nf5" = "1nvr4iaa4l15v4y7778yad44qnanxgfln9cqd70d69zzldd1hgc3";
   "MSHT20nlo_nf3" = "1v0mzsa2sxp0g3m3d8yqcs7dgi74am6cpx79f341ahpwybz5x829";
-  "MSHT20nlo_nf4" = "1lyii55adqaah6sm8b778q8scaq5yjycq3s8jdi3k48z8m23zqng";
-  "MSHT20nnlo_as118" = "1yz0003ixjg97974648qba5d37vb4fhzzmq4k9xh4c37pnc3kgyn";
+  "MSHT20nlo_nf4" = "0p1zpjnyd3l20i9ws5m20p78i9bd0d4ag6z1mw07isffpid3a3lm";
+  "MSHT20nnlo_as118" = "0ksk54cg05prqpnc49kjd5drfw1gvm7741gf3ib29zgp39f78avp";
   "MSHT20nnlo_as_largerange" = "014a9x6zsw3w7b6w3v6lg8qxdjicxslr79bnagi6ci0skqs2v7z9";
   "MSHT20nnlo_as_smallrange" = "1bv7cbdynp6dm5c9v7r32gqy1lch4428apw426pr0d7xpm0abnxv";
-  "MSHT20nnlo_as_smallrange_nf3" = "0n1j9dd069qdmgmd85m7wp29g96cnbgsdxrvlh6y51q063lkqbwb";
-  "MSHT20nnlo_as_smallrange_nf4" = "1jkdl3rd933czz753qbi7yvszg376r6bvwq2inqbslnzfkfav5bh";
-  "MSHT20nnlo_mbrange_nf3" = "095zcxhpfhlsb67ki4j6a8z4d1r5hzx92xlzprwkwd4v5ya4f732";
-  "MSHT20nnlo_mbrange_nf4" = "1114z5a0pk9svps918zifff23difxf37rbmr3jnzxnyp1vfgzws7";
-  "MSHT20nnlo_mbrange_nf5" = "12i6m01bmnzqadi6jg5gmah1jliq4wr4p0vpjgmpgyagsk4drx4b";
-  "MSHT20nnlo_mcrange_nf3" = "01wq537083dr9ibiahwdwdaxj0j2ys211m478w9wgvihdjjvjvvv";
-  "MSHT20nnlo_mcrange_nf4" = "04abrnlnbr94lksn29w9ws9a3b6sqkqvi9awmbk4715dxk2amnpk";
-  "MSHT20nnlo_mcrange_nf5" = "0za255xi66a1mfch2b91qqmsr305m0kvs4rzvqlzf7k0v141j90y";
-  "MSHT20nnlo_nf3" = "10yx59r32q4rl0yn4gpc29z8xskbvizkdr7k219qf16lnv892jpa";
-  "MSHT20nnlo_nf4" = "17d10rba8b0aqi1npnx93j1995has5sw2l4izd6lly3yhjynbgp6";
-  "MSHT20qed_nnlo" = "05c2hjgysyvkcyqg1lq3y00hqixgc8w984zivxkr76nj5csyf6m3";
-  "MSHT20qed_nnlo_elastic" = "0in0y27gn4k9h6ya77krhizv8rg3i6s3d6h4bk0fhz91hbi4l3gh";
-  "MSHT20qed_nnlo_inelastic" = "0vna0gbadf92w3xngb8gnsxd3lil8m029as8260wlki2axm4gqlw";
-  "MSHT20qed_nnlo_neutron" = "1hiq7m8j7736477vfs18mqwhkxyvjmcrs7jiqysa8v6rmhb4bali";
-  "MSHT20qed_nnlo_neutron_elastic" = "06dbvsysszpbvabgafb569vq88q1sm9mvz1iwv1m2b9vzin2ixiy";
-  "MSHT20qed_nnlo_neutron_inelastic" = "0gfh6nhl4vq4qz1jhnv5vhhz4h4wlkwgj4ffjqll6jqa5anfhbqr";
+  "MSHT20nnlo_as_smallrange_nf3" = "0w73vw53s15c0kxrhbkaig7jiy08fy29cbv8i52mlz0l85c289d6";
+  "MSHT20nnlo_as_smallrange_nf4" = "127jil9rz03vi1qmj68ysx9aa892sar5g9s6j8s35wdh9sk0b6nx";
+  "MSHT20nnlo_mbrange_nf3" = "00cfyfwkwbql5bfvwdaznffwfgyk22d0wyrwnjbvdj83iwnzgixb";
+  "MSHT20nnlo_mbrange_nf4" = "0l39l7hvc2lv252zdx2kgwsgb544li47bdcfdzngpwmysc3q5p8a";
+  "MSHT20nnlo_mbrange_nf5" = "1r27nqv9j3552ykfaw5pjky3v95ayki2wlwp7x3mhh36wrw7ld18";
+  "MSHT20nnlo_mcrange_nf3" = "19cd3srs47wjphwlk69g3dfz7jpj9v67zck9zh8cm9pg3lzqsmpr";
+  "MSHT20nnlo_mcrange_nf4" = "1c54191mfjaxb8l95xmw2nbfvxiif7p3xzzzv1sd2gxfp80rbak0";
+  "MSHT20nnlo_mcrange_nf5" = "10s8ghzvmdlg3vzwmfgfv04yaq7y0lysj7ks1d5nd2c165ws8d0x";
+  "MSHT20nnlo_nf3" = "1mhqa5h308na71bcmvgyjy5r1r00sfx6ghrpvrxi5bpd6q5jzm4p";
+  "MSHT20nnlo_nf4" = "02s55yavzrw2dhh2v7zaww5laj3mg7ccdc6mpsjxaqv75a1501rp";
+  "MSHT20qed_an3lo" = "1c3fhkjlvvvi999dmwv1z8dkxihi2c0nxjy7bhblpi88iib83prn";
+  "MSHT20qed_an3lo_elastic" = "0g2gaw8i006bvay3qy0nnnlsk1a6390x5hc0gyzivnmbhr8796n5";
+  "MSHT20qed_an3lo_inelastic" = "0zij1m285qc4wm03m5fwq98lna6gz11d0pk2qrs6ndp9cdidpqwp";
+  "MSHT20qed_lo" = "1xh8smg5p2kr99i3h2sbn9ragsmjy7a384fmv0c56yy6ii69vib4";
+  "MSHT20qed_lo_elastic" = "0086y9qmgmyfy2fl0ymva3fd5s6lq9yllshfa55jpmq0mhd976bz";
+  "MSHT20qed_lo_inelastic" = "1s3b0v5l8pf8n55065rh2a569k5rqh3cw1rl5p9c3kk0g2ng68q1";
+  "MSHT20qed_nnlo" = "0g22mii5mmikawskiblcw8lclkgm3f009c0kp3mvwdjmj745mkvr";
+  "MSHT20qed_nnlo_elastic" = "06j3vyr5nw768iw7fy3xl1k3qs7h2frn5680dj8xawy8chgdyszn";
+  "MSHT20qed_nnlo_inelastic" = "0aznly86vdb9cyshzq3lbki66dffddhbbv2acs31bfx25cn1220j";
+  "MSHT20qed_nnlo_neutron" = "1r8v2wdhpl1ny7dzwhsj94j333sgyaczk7jrw5rhghlkahvy506y";
+  "MSHT20qed_nnlo_neutron_elastic" = "0fvrq3jfv0650322m3ymlb42xb107xgb8n9n89kv5biz4adhifvv";
+  "MSHT20qed_nnlo_neutron_inelastic" = "1scgfpzlx9mldk52di2q52174bmlbp9pb2i2q8zn6q5dm4xh4y2l";
   "MSTW2008CPdeutnlo68cl" = "1x2y7hl8ckplx175bp3wi04xafm44dd7vzfgnmvvai1x0072xi51";
   "MSTW2008CPdeutnnlo68cl" = "1szsdqjkmny30mpw4pdzi97vj7i55agxm285dvnkzp06ycgp1ld3";
   "MSTW2008lo68cl" = "0j12mv286r4ds9v7piqh4n44yjnc51hm74lqa4vv5xznxhibng7l";
@@ -929,12 +991,31 @@ lib.mapAttrs mkPdfSet {
   "NNPDF31_nnlo_pch_hessian_pdfas" = "08baysni2lhbpr1scx7h0zf64gyncj2ahcv4y86142gl4zqrafvp";
   "NNPDF31_nnlo_pch_pdfas" = "09mw3gr7dz0vwdnralaplvlz2c464lmdizf673xsb0wlm12pqf6g";
   "NNPDF31_nnlo_pdfas" = "0l92q3xhdk5nrnhkmrirxnvplj531rdpnblnacd759cl4hgxcs2q";
+  "NNPDF40MC_lo_as_01180" = "0xzaki3jwzjapfrfbj4qz9ihr64ylcxcijdxw8g034wc5j30mw98";
+  "NNPDF40MC_lo_as_01180_qed" = "11ybdvqsfxhlf6kr6hckciykjnski6kr88f4fz4vi5bc2ncidy87";
+  "NNPDF40MC_nlo_as_01180" = "1cwpyndmzpgz04ghmh1lcsh5h2hg43z5zj2hgrb1q1n0cyvnyb4d";
+  "NNPDF40MC_nlo_as_01180_qed" = "06zk4l876xb01lpmw6g7m205avzzsccnalcigs09hrk9a0507aab";
+  "NNPDF40MC_nnlo_as_01180" = "1m86xnl6xfpxkysgx8hp4a9k3q7vc910dbfyz5iamlmzisb97p8h";
+  "NNPDF40MC_nnlo_as_01180_qed" = "1fhva206sfibjn7imyapj1p5zppffvkqyqqndb28p3gb97lhi4an";
+  "NNPDF40_an3lo_as_01180" = "1an8243d5dr24p7sd7g86a5k8cwbd56wwih74zgymb3z73cslkwg";
+  "NNPDF40_an3lo_as_01180_hessian" = "0pr6arrjcdvwf335ibzvkfgav2abcf1iyzvz9wpp9g47z31bxzd7";
+  "NNPDF40_an3lo_as_01180_mhou" = "01pd4h2rk3a8cwq1lfgqn5hxz3rylwdr2x0knw33bpw8r4bvhgpp";
+  "NNPDF40_an3lo_as_01180_mhou_hessian" = "00asvfpkz7asg1h0gyv0sr9y2llafnbm7drjc75n3rx7109bbrxg";
+  "NNPDF40_an3lo_as_01180_mhou_pdfas" = "1qkpk1vz1pk2n7hal9l5fnvk05sfxwagn9g0yl2yyxyaa6nps088";
+  "NNPDF40_an3lo_as_01180_mhou_pdfas_hessian" =
+    "0q3sqpr31b8r54087yg2j9ikpc3jrnibb58yf37sk3f1rfk06fwq";
+  "NNPDF40_an3lo_as_01180_pdfas" = "0gm7cw33lyj0gcnvawm95pxq5h3kx76m3dh0c9j7msk8lsh5a9zi";
+  "NNPDF40_an3lo_as_01180_pdfas_hessian" = "167ifn4g0g9v7q2br7f6m49m51qbhkxz1hzh7gllznn0f7xii58c";
+  "NNPDF40_an3lo_as_01180_qed" = "0sxz4vdyjfp0lz012rhl50flhjsgfpm95xzypdcxf45lmwsca6z8";
+  "NNPDF40_an3lo_as_01180_qed_mhou" = "1ynp4lc0z90a98sjv957ga01l1hids0633n94v5khws99jd2v70d";
   "NNPDF40_lo_as_01180" = "0m630n5i7s0qnlxzk6ka43qfp6ipz2jgzr7ys42hdb66kg3z5lkc";
   "NNPDF40_lo_pch_as_01180" = "0wrvmcgdaipi7vy7j85yszaa3c57hs3xll9lfn9cdbjscvmsx6x5";
   "NNPDF40_nlo_as_01170" = "14j21qryc25k1jk4ypdcr3cgfkhyy4hsb57hy8x5pggfwc2w3f36";
   "NNPDF40_nlo_as_01180" = "0399bnxvgl2h2ini198jmzjjb179f6dpxfv5x8imlfl515llivx2";
+  "NNPDF40_nlo_as_01180_mhou" = "0vdjsvly9bhm5zchbwn86yi0s9cyq0lwfrlg8rlim4pxp0lj303d";
   "NNPDF40_nlo_as_01180_nf_4" = "01kwziiyg8vbl26znv7khqdckm501d7ccxlkq1y0cd9s1f5ff8xi";
   "NNPDF40_nlo_as_01180_nf_6" = "1gv8anb3vqpzdymp9g69702x64pbh6l2rn9257hdpz4i4m98rsjy";
+  "NNPDF40_nlo_as_01180_qed" = "1059ng62jgm629js80a4mf7036bs9n0nsjq4k5saj8bzfx4alrms";
   "NNPDF40_nlo_as_01190" = "0wf8p2i4mxs3hkqvxg1clj082yinbdgccr6qx5kbwkzsck4yybar";
   "NNPDF40_nlo_nf_4_pdfas" = "1ia9glingyds6bj6yxy867ahriqdhfkxczzc4nki933h6jbj74bf";
   "NNPDF40_nlo_pch_as_01180" = "0gad0hjq9kwiymc9pljj4z52jsg794m3knb38zj9icgjk0p9lwxm";
@@ -945,8 +1026,11 @@ lib.mapAttrs mkPdfSet {
   "NNPDF40_nnlo_as_01180" = "1bhysjkji0k7xy9njarkfvxff05kjl1byhkknxv0875p2znzkpva";
   "NNPDF40_nnlo_as_01180_1000" = "04yai94qwd7187wg26icwf2wbwi20747l6zikd66ygsz9n34xn9y";
   "NNPDF40_nnlo_as_01180_hessian" = "0cmpqgaz341hif0gdkzq8mnfh9apxn1zxjwa12fk5svbig9i1a81";
+  "NNPDF40_nnlo_as_01180_mhou" = "1s5p6z34ijd0dv1jml8n0rfh5gs2f6axvjqd7h5qwbwm7fl9zz2r";
   "NNPDF40_nnlo_as_01180_nf_4" = "1aj5y3fyvna2jwxbsrgr2cbc452aprxnwv78vh3ph20jlnww20pd";
   "NNPDF40_nnlo_as_01180_nf_6" = "0bf6s6s0w7l592bm87mazwff05d8s4qlblzl9yj91am3xlv0cvn1";
+  "NNPDF40_nnlo_as_01180_qed" = "17ihm4hr2p4qilm2j8sk5icczs90ga44ls5c9sqhdlrgq6nc18ql";
+  "NNPDF40_nnlo_as_01180_qed_mhou" = "16rniv3xkfcsxsjjsrw9ly54ls4jx1mi7zrbn798zcacmxwpsppw";
   "NNPDF40_nnlo_as_01185" = "0y1xn9qcv2l81sbz9rayzrpd1bjsdyixr42lzfgmqbq45sw2m04n";
   "NNPDF40_nnlo_as_01190" = "1ibz4yfrw1n8plq4gi03yxi9afaca2yprxfk2y9lvbkycn608d0q";
   "NNPDF40_nnlo_as_01200" = "1cfcn819aali7ylv9y6yb2ggqy0yghyj0dys9lf9gv5wiqjwh5q2";
@@ -957,6 +1041,44 @@ lib.mapAttrs mkPdfSet {
   "NNPDF40_nnlo_pdfas" = "16d81h0pzxzgwwrfjghmradx4bijf08xbrdn79y9bxf6czacm8n6";
   "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8";
   "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8";
+  "NNSFnu_Ag_highQ" = "02hapqyaab60bbbz2011cyhsiyffcs4h0qvj8rcrfjizbwgdvzkf";
+  "NNSFnu_Ag_lowQ" = "0wnikk26l17rm1g1clxnpfk31xxq0l1d8abbi54xhi8bhkmkf94l";
+  "NNSFnu_Al_highQ" = "0r1w871c49ismmawy9akvn8gg5lj0xf5d9rmy36bhh1s88wxgfwc";
+  "NNSFnu_Al_lowQ" = "0wqmdiwfvdr4xp8mpsg72y17s0649d5w0fj4jhbm08algdwh7i5b";
+  "NNSFnu_Ar_highQ" = "0ffx07zpm6gfnw7qpai9h0hs8igm3mpfkc89za233v4fm5j1wq53";
+  "NNSFnu_Ar_lowQ" = "169a44bwpm5hp2mkwxvmklzwahql48fv0qn9si79pblga0qjhapk";
+  "NNSFnu_Au_highQ" = "0424ccwqmzhi54311cbv9bbdsi2yrbkg92rz868ri7yzzny9fd9v";
+  "NNSFnu_Au_lowQ" = "1gycdn116ca8wwfwxh6gjb9r516snmssz1ahsac0r0gaa0f2h9r5";
+  "NNSFnu_Be_highQ" = "139jq8klzlnqlj5dgkba6l93kslncbr8whq9kl3ylpd7ypkwlydh";
+  "NNSFnu_Be_lowQ" = "1b6k3ghmwbdqr6wsn0r42hymr7shyhxdymkvb6cp2vfilwh02w9s";
+  "NNSFnu_C_highQ" = "07hpmcahk75n1d6f5q9rg2pqjz631zpw1sjn3sx1cqfsqnd88bjv";
+  "NNSFnu_C_lowQ" = "1048azj11ji9q0ab0gk59krmdsbl803j5k31a60227jv32pmq4q8";
+  "NNSFnu_Ca_highQ" = "08d3w72l7ax4xf7552m1zfkn82kbn2ndkdcyjyvjnlv0vzq0yw5y";
+  "NNSFnu_Ca_lowQ" = "12xj8kl4naxf4hpskgjdx0gwj9i0xjbpq6dvbhgff32rmii6ycs4";
+  "NNSFnu_Cu_highQ" = "1awxqzkrfpi9mcqxzrdw1spg9xxaslp4wahqb96fvzjfvkq1gbs5";
+  "NNSFnu_Cu_lowQ" = "1d0k6gfcp5sy5v71hwqav6x7i9jb6y6dn3slivk5ap4ps7szngrr";
+  "NNSFnu_D_highQ" = "1qs77jl5ipjbc946ifrg01csfcfd321dlgd5zc7gmm4yjk5ipriz";
+  "NNSFnu_D_lowQ" = "1rgd1q5f0n9l6ka38fg6ldx2x7rm66s4izfgrkbjk0nd858vbasw";
+  "NNSFnu_Ea_highQ" = "0jv4aijsvrx304y34akpwqs21g56113ich4r3pvs6jhwzb7drh92";
+  "NNSFnu_Ea_lowQ" = "0a2vi1y5yh17y1lvwihg4map0qcsic4m832c3i3h50f1a7mfdqcf";
+  "NNSFnu_Fe_highQ" = "01ly2p9yjv8cnj1dknngsmfn950fwqj8adb4idpf93myj80s4431";
+  "NNSFnu_Fe_lowQ" = "085zx3c9l9iipznph9j9jdgkg4bl86qz6iv93n55x67p6md8jrwv";
+  "NNSFnu_He_highQ" = "16i60mjkfv2w2bw0ps5mfkd5w9y5nvl9x71grkqlqh4a7mc7k8d9";
+  "NNSFnu_He_lowQ" = "1xd6w1s2kwc0kxars535c5dgvhvj3sanvd13znyyvwxfnq1ia493";
+  "NNSFnu_Li_highQ" = "0sx9wy7s5h797zcjc4k1bbspsrsbz9l8yj5c3w0vk7mrmj0mwn4d";
+  "NNSFnu_Li_lowQ" = "0di710fg1mwkcpy6hj92hkd8prsw8i0nbg9l3d7cmz4a05l2ivlv";
+  "NNSFnu_N_highQ" = "01x48ksx64ks1dcsfr6di0qfa752az4rls1rwdbb1hq9fx5lpckn";
+  "NNSFnu_N_lowQ" = "0glsrc8y4g47sdyk1bhn5nggibp8ma8ng3d6b0igq6bmmdv3qh4i";
+  "NNSFnu_O_highQ" = "0l6m3d86kc8h0br1j39pkjjfh0j55bypl5ys4s9m0vxpm9ixy9h4";
+  "NNSFnu_O_lowQ" = "13ahpn0gi8zrw9r2pz7qr5hypbjd1ydjzv27wdyq47h8v971jkka";
+  "NNSFnu_Pb_highQ" = "0gq3jg8b0k2jvkayc9hjs27c1adr8ii93m97cjmkgxp964hihhxi";
+  "NNSFnu_Pb_lowQ" = "1yy864yjlr8bzvqprrrnh2ja330s2bpasz9kzb5lrj3i754cjb5p";
+  "NNSFnu_Sn_highQ" = "0n30hc505ajmlnfbscpyhngcigfl1jkgcgy76jf0lxvs9xfrfdfc";
+  "NNSFnu_Sn_lowQ" = "0mp3fi6808x7hyf27n1kcr8vxyj304j6h0dy7d9z65v5acivn5ii";
+  "NNSFnu_W_highQ" = "0yw1ifmzjqzfaqws8krvzgp977jsy930sf80fns4r4n04nwi7kmd";
+  "NNSFnu_W_lowQ" = "0hxh5yklq9kxkgf53qkvyv6xsx1ml9hd03pss5cahz8f6a5qj188";
+  "NNSFnu_Xe_highQ" = "0rgdjxvp1wg8q2yki8gi70ba87q4pr2nw191ywdcq3cqar6dznkq";
+  "NNSFnu_Xe_lowQ" = "08rnyhvv3ibzfj1srkyjygni831cz0j43g6mkka3605fvl2iqwpw";
   "PDF4LHC15_nlo_100" = "0m9d4zy7608iryqy1ypgkr1d3yhw2wv1nrrc70zrfih7x0fp7lz7";
   "PDF4LHC15_nlo_100_pdfas" = "05wyqyh9y32sxflq69igcnnsl0ifnkyw3vnnnjn6kscl8h8hs7lp";
   "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72";
@@ -1008,6 +1130,28 @@ lib.mapAttrs mkPdfSet {
   "TUJU19_nnlo_56_26" = "1kqc6v6qq6wl3nls31gn5nrzwfl9kshm2bbak771c3xvjsgvjpdy";
   "TUJU19_nnlo_64_29" = "166k8swsysr7x5rgivi6k04q4p8njb2ny7xj7xjqhkgxrznc8jzq";
   "TUJU19_nnlo_7_3" = "0q9vswr0s3k15abghx3cccf1ays0601n1438pwqgd5xz8981ngm5";
+  "TUJU21_nlo_12_6" = "071lk1am7w6kkaygc48ddhmpdizb0x2g3z1wcp71cd4gpzzsvgia";
+  "TUJU21_nlo_131_54" = "0y5lrdg3m3qwimhhsvvvycb18w6msy5ghvm7y3algfq66jsi9xsh";
+  "TUJU21_nlo_14_7" = "0l9gc0rgx1cva23fnsmacdcw4xymvdbrdb76rml8qfbz359d8rh8";
+  "TUJU21_nlo_16_8" = "1fhdxf8lkml370rwjms7yvysspbnwzf51hnrwv24l3b0l21akck9";
+  "TUJU21_nlo_197_79" = "1f6z6gmvvpcd8g2gv7847qd1i60y2cb8r4wrzh7yrvcvf0p438pn";
+  "TUJU21_nlo_1_1" = "0ff1bpmm1l1wy2l80i9wk8d49kmjirf1fsqclvhbih8nbnaxrmvw";
+  "TUJU21_nlo_208_82" = "1lwsr5jx54596mzff8xnh697s7xh6kvw2q8lm77paxb2r4072pvc";
+  "TUJU21_nlo_27_13" = "03xq2cpp0jbfncw3j2c4xfwhj69vrrah9ps2wqh19xghml16cfgp";
+  "TUJU21_nlo_2_1" = "1hwhfif6ga1jwqw4lm1hznl9m3b9ipd2w08s88v10d5yr4nl1ajh";
+  "TUJU21_nlo_4_2" = "1gi1gr4avj9dhh3gv62nqakr2gby9030b49nbrygs8ilkmck59j9";
+  "TUJU21_nlo_56_26" = "1p4dys06zdac54nql9vn3cflk53ri5w477ar631pl6mr1alv0pry";
+  "TUJU21_nnlo_12_6" = "04fdbjd70biss7i1qn7dbcmfing81rsmq1r51hvwfcj67ni8sgzk";
+  "TUJU21_nnlo_131_54" = "027y4lx69iiy2y3yljn08jj0paf080c8ki0gh0qlg1681icsax36";
+  "TUJU21_nnlo_14_7" = "1b81ay90b8h238k0zpgwqczybrqqz3sfa4qxg9d4znqxdz1rl7s5";
+  "TUJU21_nnlo_16_8" = "1m1ghq91d32xglkdafswi2b7plvirwy6hnlqyaqvvj1jk1hzi3fj";
+  "TUJU21_nnlo_197_79" = "10gblrpf623r9pjv17cxdyrfkjis5yv325s183i6nwyvj3dsnq8p";
+  "TUJU21_nnlo_1_1" = "1xkp100bjazwkl7k951n5cdi1mmjw15s10i675cl2q249nn7ld6b";
+  "TUJU21_nnlo_208_82" = "0jdsvl9h09wy7q83cw56xg5g57x8vrfbp8ar95q3fq1389cy3gnx";
+  "TUJU21_nnlo_27_13" = "1ql5b6i4fbw0hbb6k1m9hcq4w0k5xldh9ggkj5z9nwckr5cvcbx5";
+  "TUJU21_nnlo_2_1" = "125s2kxksiynqcqsvk2i0piib9wh37nr6hnshwskw4aspm3p7zhc";
+  "TUJU21_nnlo_4_2" = "181hjn00190h851yskgcd27b2cb1zmyy91rva2z743i6mz1hka7a";
+  "TUJU21_nnlo_56_26" = "1dzgdlkadpwajd9z7pfwq55zqi1fg3qi9z41zayhppgz5p63c9zm";
   "abkm09_3_nlo" = "0h268l7j1zkxm2nacari10f86lpha511xhgrg0q9r8hc47sw2vxs";
   "abkm09_3_nnlo" = "1gzhvblckskscql53pfxp79qclhhhhm45sqjhc9jrm1bp3x52w8i";
   "abkm09_4_nlo" = "0yq3gy0qgnk5dh0hh3ldrf5bqzx5wpkhw509nvz5arlh0bfwhyg4";
@@ -1051,162 +1195,210 @@ lib.mapAttrs mkPdfSet {
   "nCTEQ15FullNuc_7_3" = "1ncarbncfkqk6l3rx3zg34a3sj7mpm2diqsafyldpn92cw66bcs2";
   "nCTEQ15FullNuc_84_42" = "1z719mcx5lnx2ciwlnxxhgc4s00jrr9sfrxcimh69sj14hmzgx0d";
   "nCTEQ15FullNuc_9_4" = "180ipb4m2zy54h7n4s0jwqk9k6562bygvnv7mg9dp2f7vf5317a1";
-  "nCTEQ15HIX_108_47" = "0iqv6rsvvr5mqiaddn2cs6psrslw6ncqxca993v0z0hng9ahnnwd";
-  "nCTEQ15HIX_119_50" = "0gxdr596gk69sb76r90p5ksvx9bk4axj21qrsyxjf1bmgdg2rv72";
-  "nCTEQ15HIX_12_6" = "0vkkz3hq0irvfb08cpdijfvv17bcvzaba5c1bf8kwx1i2zl5s6xz";
-  "nCTEQ15HIX_131_54" = "0pbm6390cdglxqzrpl2slv65m943m32i10c49pf70fg68x3l2dff";
-  "nCTEQ15HIX_14_7" = "1yshwpa3zzzmf7s5v3c3130ysm1wciicz202hrraz4px102h8a06";
-  "nCTEQ15HIX_184_74" = "1wy1691pc776kv456cbjl5x5rg2z7cycyfny24caq1qvjifvbr94";
-  "nCTEQ15HIX_197_79" = "0ckbp8cw49ch78q4nsm1fccn6nizpipdp8q85nnipql53xsnr4zm";
-  "nCTEQ15HIX_1_1" = "13sfws9cmrsnp26mx4m2n03gary2m10l67bd8xic8pykgpr8c695";
-  "nCTEQ15HIX_208_82" = "0fqvzpqszkyqb4f2y44hrdj7rvadbqj6y8fzkl9xzk432lalm8w5";
-  "nCTEQ15HIX_27_13" = "0z356q82x6cm52f3qym7vkajlkf2amkz87as0jvfiygvi4gnilcn";
-  "nCTEQ15HIX_2_1" = "117dgz8nx1j64xgqlp40zmgpg0z8b0p1j75d1llvshmksba43avb";
-  "nCTEQ15HIX_3_2" = "1k1hxpcg39hrh629ml2kwnhir6pq41rpic48njq2lagmrcdpbn52";
-  "nCTEQ15HIX_40_20" = "0q1ggww4a5cdf802737kh7igb0br3q50xw205v4b5p7v237wsiym";
-  "nCTEQ15HIX_4_2" = "0n9zf4yxvp3b3ryxbkdw0yilsb21nrjh40ms883d6j42slzhf37f";
-  "nCTEQ15HIX_56_26" = "1z39vjgp6jryvqaxv6jq05jj0lfxsj212g17amch65pgxm4l7cwg";
-  "nCTEQ15HIX_64_29" = "1iy1g1226irrjxz9wwabwd6x0712dm1aap7ka6fy9wwwbn87f6d8";
-  "nCTEQ15HIX_6_3" = "0ljq0h0cdwbfvlpd40v2nypklimw4hh6k999mnyxqfvq47m13ffl";
-  "nCTEQ15HIX_7_3" = "1y9k2snzymzgs26ayfn2c8n6isqzqq14pzf05xvlxmc3k1fbsfyx";
-  "nCTEQ15HIX_84_36" = "130g553b22s7plgy51n56az05v1pnfgrg5knpg1knx8xr8a9xhh5";
-  "nCTEQ15HIX_9_4" = "05igk9g2i1gm7d7npdwd7y3k7xf39scx1mwiw4m39b52kbq7kszp";
-  "nCTEQ15HIX_FullNuc_108_47" = "1h2x2h2n02nwinf8ba3yyqa61384p4g29ib8vnrzwzc7q34940i0";
-  "nCTEQ15HIX_FullNuc_119_50" = "0m5z036py2m1863k62pzysjdr92dhyiwmb8lxgky5skd7514rrsd";
-  "nCTEQ15HIX_FullNuc_12_6" = "13rsl7lczf5qzjgy8m3dp4f1gyib2ffvf86iwci91sq51sma5kk9";
-  "nCTEQ15HIX_FullNuc_131_54" = "1bsi3y6b7sxykwablgghqc89s3vxrvjr9y4bvhwcm21c2i4y6vbp";
-  "nCTEQ15HIX_FullNuc_14_7" = "0w93qfiqdnzvrry9ddpbqcy6y16sszxfmvvgdy6r8i8py8dzfkyr";
-  "nCTEQ15HIX_FullNuc_184_74" = "1q93f9rvlc4z3hzfhdmmxlyqfschrf99a0xyrc78rq1z2pfgmm9b";
-  "nCTEQ15HIX_FullNuc_197_79" = "0kb2lnvh8mq25i5pkfis86ggs0s6hmpmyqqgimhcsamk8xnf2pcv";
-  "nCTEQ15HIX_FullNuc_1_1" = "1nk792chip0iamc6dlqgqqlc2qlxlbgvgnhsvbmzkmmzvp2ji961";
-  "nCTEQ15HIX_FullNuc_208_82" = "1l038nhnwc0pd7sq4yki3sjrrn66bsvqkvba2j3kf4f852gsyswr";
-  "nCTEQ15HIX_FullNuc_27_13" = "1gdb09429xn5n07qqjch9x1cnq4xinf05wla8fsq69qr7bcdq9mp";
-  "nCTEQ15HIX_FullNuc_2_1" = "0fnbpwv8qzgchc2r2gcjgw9yh4r94vm1rzbwj1f6ahbwrsl4rfp3";
-  "nCTEQ15HIX_FullNuc_3_2" = "1r1s7ljwa169nbgc1439cj0gkaqza6ilx3x4gyq2jg9byz30khzx";
-  "nCTEQ15HIX_FullNuc_40_20" = "13p7mnh2h8abih8y24rfapnrsd036pc8xy8qm82j8g4bk0j5jacx";
-  "nCTEQ15HIX_FullNuc_4_2" = "0j1w7d11ybmpfci79lz99i94szxf5xn6z4kxvh8hly3qlcgn636j";
-  "nCTEQ15HIX_FullNuc_56_26" = "08wds8afv0fzlaxck5i2d3pzvi5nqnc1jmq58fpnc7i0g238wl8k";
-  "nCTEQ15HIX_FullNuc_64_29" = "0w4hn5iwqa65lnf6mhihx5qrq4wpcqw04ii3jphy79l58j3i1iam";
-  "nCTEQ15HIX_FullNuc_6_3" = "1ki2cfsg0wmvfkzv2j9akiyl4d4b8v3d6f65iryxakjkhqj6vvgx";
-  "nCTEQ15HIX_FullNuc_7_3" = "14mx5lh278p3zdc572bhxw9sc6n7ga0ak0ch85h3lx9zwg2a1m5i";
-  "nCTEQ15HIX_FullNuc_84_36" = "0hyxyhb2mn64fwmijigw8m3v5zlj52hf2hicvx4gcq0lw063jxj4";
-  "nCTEQ15HIX_FullNuc_9_4" = "17pydzll5lgs974gz4bchl2wxc9ixfpnqjrsidzksl4jf03gn77z";
-  "nCTEQ15WZSIH_108_54" = "02z08pzvl8fa0bi6ddrlbknj0iryimw02r40z0nn7p8xf99qabhz";
-  "nCTEQ15WZSIH_119_59" = "0r03k6j6nd2mvdkidw4gx1xm1s9hil9z5kanxsn2hzp30ab971db";
-  "nCTEQ15WZSIH_12_6" = "00d4lis1qas1k8yzfb3dbqgvy9ynv7h9lx67ys3mj1ws5fqyn5al";
-  "nCTEQ15WZSIH_131_54" = "10frai6qmzvp8xpkanl1qlpnc6chf6k5j70f4pw4abw8ycbjymij";
-  "nCTEQ15WZSIH_14_7" = "02qd5x041p6n8rzv5l446481jb9vkc5nrc018vcg41735azr0d0p";
-  "nCTEQ15WZSIH_16_8" = "164ciyxkrxp33r5nrkl86gq0jvdzm90hf602raamn1b5l5yrnadl";
-  "nCTEQ15WZSIH_184_74" = "00nrwb8q6sa3zwbdc9mx4jz5ndibml84lfz8gad9vhy20zayyh3q";
-  "nCTEQ15WZSIH_197_79" = "03hzr05vhb0l58iv9c2743c688ygagy1bi5a7zqn8nilsmykbvag";
-  "nCTEQ15WZSIH_197_98" = "1mdlhp643z0gkjpj2jdi5zdd4qxxjqsy93rkv69cn1x5abawdl8l";
-  "nCTEQ15WZSIH_1_1" = "13wskph284niaxqx92yaa4jg749ry6y98ds1ifvwc9970iccdnk2";
-  "nCTEQ15WZSIH_207_103" = "0mpc6msqqjbcs756zd426xgzxmmmcmk8cp8wh2mpagib1drrg1x8";
-  "nCTEQ15WZSIH_208_82" = "130bs9y9337pmgwi1ix0ar2xvhfhl4rs0626kbin5yrxhdy7rpha";
-  "nCTEQ15WZSIH_27_13" = "1r01sbzixlrqxkjp9kx3s4zgsd48myivyc70p7ha83i1qrq50g7w";
-  "nCTEQ15WZSIH_2_1" = "1qlh3zxbg13sq187k1fmssan00ifmqr0q2l7i45vc8jz3mk70098";
-  "nCTEQ15WZSIH_3_1" = "057zyvlxz3hwlwgydccl2y124bvc6iwqqgav2jqw0r53a39rc25g";
-  "nCTEQ15WZSIH_40_20" = "11psi56yk2yd75v396j68hfdacsnxvng2bw4v9g4afbjv9697jgr";
-  "nCTEQ15WZSIH_4_2" = "0g4rvlgksw5gf6a7zh7yzsi2sq5jqkwbrx6d7jgz7zpg8jkg4qrz";
-  "nCTEQ15WZSIH_56_26" = "12d0bj92b615kzadxwivp1q0j906m2rlcxfflwgwg21sv9axhi4l";
-  "nCTEQ15WZSIH_56_28" = "12yx9v87y59qf14005fmj55n38xnhlvc7qgcrgfsicmdbx3ncm5x";
-  "nCTEQ15WZSIH_64_32" = "02w3a4sbygc72acxnfc6lhird4nxcgq5dprfldg10h7f9lr7441y";
-  "nCTEQ15WZSIH_6_3" = "05x3cknlnc1kbqnmi3hk6fjgx07dhl7b36rg3abaqn4yg65i79sj";
-  "nCTEQ15WZSIH_7_3" = "0d6cmpv6csysr96knip033mw7sg56ls1gcq8gvz2qy7isj167gx7";
-  "nCTEQ15WZSIH_84_42" = "15zva7n91p6s98kkhcfsvws20s26fl1bvjql8m1n1c2d5pr29wj5";
-  "nCTEQ15WZSIH_9_4" = "04cs89s2m99p31jkc2k4f5i5rr0l4fpa6a41d59zvknhgfy74yvw";
-  "nCTEQ15WZSIH_FullNuc_108_54" = "1wk8vhhlzj3wrb994s66q5zmwxhcy9vxpyks36s3jr5729jxk1j1";
-  "nCTEQ15WZSIH_FullNuc_119_59" = "1rrkj7inah6bg03mmxgza39z40ghdr8km9hy5v5b69bvqcyr42a3";
-  "nCTEQ15WZSIH_FullNuc_12_6" = "14wgacbimifnaji6byq1cds9zz266a63bvv616b0n06391plvzff";
-  "nCTEQ15WZSIH_FullNuc_131_54" = "0k6gncwq4l5avlnr4qpvakklysi6g855yqksylc42ndlgjm4jxfy";
-  "nCTEQ15WZSIH_FullNuc_14_7" = "1mlffwsn3f942flxvvi0rp63xlcrq88ir9vffmkzh3br3qpm4q41";
-  "nCTEQ15WZSIH_FullNuc_16_8" = "1ga0kijnlzjz98j32bakcan89bfhbhq8y08d84d90xpgaqkpb9z2";
-  "nCTEQ15WZSIH_FullNuc_184_74" = "1nhly8065kabzjjkapr75vafx46f1zl21xc6fdcv15a2qwx54n0p";
-  "nCTEQ15WZSIH_FullNuc_197_79" = "0l9c684f427b8hhwm68swh78n6104nbpdxq6v50zipwc6df0j6w9";
-  "nCTEQ15WZSIH_FullNuc_197_98" = "0vc285bd21arpmaykb6baspzr8ak42yx9h4j0sx2vj07l648g5hi";
-  "nCTEQ15WZSIH_FullNuc_1_1" = "13gbjq46f5cdpdr902nxv261hqw041f7ryxbwgvxr3k2zm7h8fw0";
-  "nCTEQ15WZSIH_FullNuc_207_103" = "08m08pcz0f72nd7zcrvi8cl5va49djlvdff1w4is4gmsb44khyv2";
-  "nCTEQ15WZSIH_FullNuc_208_82" = "04x5icmidi1p3j8bdarl3sj0ak6g2ygyc5wmkkn9g80qqn4mxwva";
-  "nCTEQ15WZSIH_FullNuc_27_13" = "0x4iv1kxb5lp514qm1nr3k32m68aw7sgy12nhdjhy2dv018snd8n";
-  "nCTEQ15WZSIH_FullNuc_2_1" = "177qv17wv15sr1zcm2p6av20h32cjkspf4jj3jvvvgvks947n7dl";
-  "nCTEQ15WZSIH_FullNuc_3_1" = "0aawk1ppg3nhl5n6gpdi6l1rw53l2x2sv3fwjz5821b6d7cmb9f6";
-  "nCTEQ15WZSIH_FullNuc_40_20" = "1271dlp580a5gm29sv6b8plpc8d06j57x2xrfjyp7kafxa1158ii";
-  "nCTEQ15WZSIH_FullNuc_4_2" = "0sv20zpzbinrz5biia1g3jzgyq0wbqaqrmrhhcyg2yxg9z48vgca";
-  "nCTEQ15WZSIH_FullNuc_56_26" = "1wz1vwy2q85qz85kdy9gzzhnvv0jy4iazzavf9janz2xzw7833gg";
-  "nCTEQ15WZSIH_FullNuc_56_28" = "01y0f2bz5yxmfd719fq8s1i3q5wb0dd81l0qkllpa961db83zmz2";
-  "nCTEQ15WZSIH_FullNuc_64_32" = "1a93nqx26pj9kyvy66dmm4ib2pl5qwf03420q84zdl1hlcgaszzc";
-  "nCTEQ15WZSIH_FullNuc_6_3" = "157j927a4x53gcam5kmpcpkyk76qgdlszxa4bcj9wlqrygwxsk3k";
-  "nCTEQ15WZSIH_FullNuc_7_3" = "0l369wpd3gcb6i452w2hsjvidz80xl623xf1g1p8d2485nrvh6jm";
-  "nCTEQ15WZSIH_FullNuc_84_42" = "1nikb7yk35s27g43k1wlgcfxqfyjf40csn8a6aiabliqdfjacaqv";
-  "nCTEQ15WZSIH_FullNuc_9_4" = "0nnxf32kllwvm3fyjlswnyjx8cpsanx15qwsn03z6d67wx2f87sw";
-  "nCTEQ15WZ_108_47" = "0v1s95f0wxyz73pfv5z6hc4mslxb7ml6imjmkhn2p9yx5mvk94qf";
-  "nCTEQ15WZ_108_54" = "0zqw1p1sls58v7aacmwamlic0vsjyjijfam6bas5lh92rrmcf9h6";
-  "nCTEQ15WZ_119_50" = "1wwx1rsjhd8rqrvyq68r70issnsby8zrlr8d76br3622mxqr83a7";
-  "nCTEQ15WZ_119_59" = "11hckxdqyfrbsv3lc12q8zjysr2nw9mhx438ff13azp93ha7h1v6";
-  "nCTEQ15WZ_12_6" = "0naqqy223p6gyw2r1qy5fs185dhmxzmb3zmkx3bbccqnspk7qcnz";
-  "nCTEQ15WZ_131_54" = "0fi4sjv7rs90yac1zmnlf38dv5ry9zwzxrjwakpzh00irxw0cz8r";
-  "nCTEQ15WZ_14_7" = "1k4sc588n3rd8fvcvwhxzc405iqj28xzv7y1md45kz1c7m6qy4cj";
-  "nCTEQ15WZ_16_8" = "0ndjlgbggbk3zk5bm9nm726ci1v8b3qfy3gag14jmp7q780zyhmy";
-  "nCTEQ15WZ_184_74" = "08cdkqbjihls2sg4waj9rxg7nvs0mjzxfv3dx1jppiw6f7ljjzrr";
-  "nCTEQ15WZ_197_79" = "0ss7wgvx8rv03x1g10c516i0yd65njc7qjh19maij49aizf1fd4l";
-  "nCTEQ15WZ_197_98" = "0vlyjqlj9plniim0z7mdhia307i296iha94l8b3iqgzyp9553gly";
-  "nCTEQ15WZ_1_0" = "13wnm5sz1sf3hng70j8d3ml53knrx9b7wrg2h6x947jl51flrkh4";
-  "nCTEQ15WZ_1_1" = "0pllq4zdgjaklad9j87vilx8gapzfhjh478gcw479ahgjcbbbxxp";
-  "nCTEQ15WZ_207_103" = "088d8sr9mq9q4bi0ipxznbm3k2b2k347bj9k5fxsb27f4dl5d0jp";
-  "nCTEQ15WZ_207_82" = "0cxagqav2q6kwq83syiad67nmzzkmrg9q0hlshbz6bjlcqmdi4jr";
-  "nCTEQ15WZ_208_82" = "1c7vacsr2m6r7dy1b439c46xgxjqvq1gj9y68p2vargm5az444sz";
-  "nCTEQ15WZ_20_10" = "1y38sqjgsjrfhmyhf688jir2hgkk871sjz8dm89lm5g7m5c1mgmq";
-  "nCTEQ15WZ_27_13" = "0gb2zg5j3jcqjisa3nzsbif4rfi8vshl5vq2vq93d2132qgpzq3l";
-  "nCTEQ15WZ_2_1" = "04nhmrvy2m4a2i8b5qadsg8h51k171df1kb7mdqn3hjzga7lg0j7";
-  "nCTEQ15WZ_3_1" = "00aansn8jjh8yqyhr2fx8h453nahrdf8j1j0qgny1n1mhad4mc56";
-  "nCTEQ15WZ_3_2" = "1pk6gp5a1g15zn5w00l89liz4w7w4xsmpcdk4x50vc7k5phy6vj7";
-  "nCTEQ15WZ_40_18" = "0m58lby911lxqy6rvvs959qg5gjbppnfxl34hn81glc0lr90qiz6";
-  "nCTEQ15WZ_40_20" = "0dnk9yikivxd557bpi9j7dbpwkf4sk49bg8lf0lxf86bdmi2l330";
-  "nCTEQ15WZ_4_2" = "00rr4qwwp7i419sy5wr6f2lz82121ilrvvj0js45bvcqknx26c7i";
-  "nCTEQ15WZ_56_26" = "09qjjavqjwrh9adkz6yhcjjiy55dg6c7imnbsi8qxi8xspz8nqq3";
-  "nCTEQ15WZ_56_28" = "0pdqsrj4dphjb50r3v95wp1drc8rkdgsbisgg430dj9xaa703ijr";
-  "nCTEQ15WZ_64_29" = "1qjvvfzv5nfjp1k1kdv2kz5pjssr2avrnjlxznqvlxwgs7rv8p7v";
-  "nCTEQ15WZ_64_32" = "172whqdyyvqxyr3lijw2v45y8nvc0vk7z47i9xfmcydi2qfz8g3s";
-  "nCTEQ15WZ_6_3" = "0kr0cf8aqwsn4x8kjwihsynvb99i8bdp4g91digbgcfpp02jyvgd";
-  "nCTEQ15WZ_7_3" = "1c76h9xfflfihqyxi9a6dlmg1gwwr2wh93mfac3a3jnx73981gq3";
-  "nCTEQ15WZ_84_36" = "1cvykpl9r41dwahjv3kik98y6sx53wiyyzywqc87mhnlx1x5876f";
-  "nCTEQ15WZ_84_42" = "1jslkk9wc0fzbm6s5czpmaf004pndwc2ggwnxgkga2idn45204xz";
-  "nCTEQ15WZ_9_4" = "0farphic6jyzc5x3ja715wdmvv5rfcgil1c49i8fxqlap5mlgv89";
-  "nCTEQ15WZ_9_4_iso" = "01zxmn50r14n1a5gq75pia8mz4ibyqhyjl5d31kv3h69xgdrlizc";
-  "nCTEQ15WZ_FullNuc_108_47" = "0yl5ll4j3mr6nhiz9ynn9w3hybgwdypg0b8zwsxz1rjcr3c8bmz5";
-  "nCTEQ15WZ_FullNuc_108_54" = "1c8cdilw9n91apqj9lrv9j6hf6mcg3ndndchc96d5svrqlqk4fg6";
-  "nCTEQ15WZ_FullNuc_119_50" = "19lb71cmmi4fvpb0bxmz0ipjlzg6b5hrlwiml4bj5r65km46whyk";
-  "nCTEQ15WZ_FullNuc_119_59" = "0r9cwy2znpl59ynv2av6whjl3igm4b19rzh6sjqsm6a85d5jjdpc";
-  "nCTEQ15WZ_FullNuc_12_6" = "1972j8lziq1ckwq2s7qpcf9g7mg3762kfrnbdjf4ilfw5b2b9i9n";
-  "nCTEQ15WZ_FullNuc_131_54" = "06w9yl6a11ir8qjyxaakyzs8b51hf3jhm8nj5nvrh4f6cicp1g66";
-  "nCTEQ15WZ_FullNuc_14_7" = "095x9pphc9lx71hlhpwcb71p8wx3b1pnv6qd3s6992visismyb02";
-  "nCTEQ15WZ_FullNuc_16_8" = "005h4mbf9c7d9w61pmgghpxb5yh63i6cbyxyylngznbbbaxggjcc";
-  "nCTEQ15WZ_FullNuc_184_74" = "0niyiq85bmbr596gfrsmf79rksql7n2gqdxw72yrki5ywc3iy4sr";
-  "nCTEQ15WZ_FullNuc_197_79" = "0vbgg6m0b1wlrsx2c5xxga0crz0nwvcq9a88f032yjzihh6rscjd";
-  "nCTEQ15WZ_FullNuc_197_98" = "0sf4q5bb4b44zkbxq51pf0xhpldr5dj5d0gqpqs40qkdlmkb9z7k";
-  "nCTEQ15WZ_FullNuc_1_0" = "1il9j3ggn9kc8k8jpql46lw5c9lq45ngaip45vqppgvl3zcrc4fv";
-  "nCTEQ15WZ_FullNuc_1_1" = "0nxvm11qlapnpdkkymqhy86axcvcx84r9hk0dswa2ji5gmk18jww";
-  "nCTEQ15WZ_FullNuc_207_103" = "05qqg6ckkhv30nfbs5rdpiwz7dkgywjrd8a9gr3skvlayj2bisni";
-  "nCTEQ15WZ_FullNuc_207_82" = "0s27py7i2h0va79q9ivmgrpwk5pxrjx9csyad76fc7pmvi4xsgjl";
-  "nCTEQ15WZ_FullNuc_208_82" = "1xygz9px4jwz3vkbx86384775vhiqqv5l2rp2qi42zy8y8ijwaqd";
-  "nCTEQ15WZ_FullNuc_20_10" = "06bgr8r6pz8cpvqbncjaazxw7j2qzhh183brs7r5mi6yckg318gz";
-  "nCTEQ15WZ_FullNuc_27_13" = "1qrs82jscmxyhqkd4fa2kjglzgig23kqwc7r2n8p23352ggcsn9x";
-  "nCTEQ15WZ_FullNuc_2_1" = "0jxam0p1ypd3x8l83d2f14h2av9wk1r69prfhl6pgd6pdh3nx2gh";
-  "nCTEQ15WZ_FullNuc_3_1" = "0kjgsiidi33p442bpp1g6sss62qn4pj90ag4hcmdqsdf5m9vpc5s";
-  "nCTEQ15WZ_FullNuc_3_2" = "0srxdvk5jh4ga4r8hniikzanfa8fh65xc4g51arxwd9sda4n0mqb";
-  "nCTEQ15WZ_FullNuc_40_18" = "1x7d1cpglijq4rag57m8sp6qyzn3c7r3zs5z9jqarsaqc9wv2ypw";
-  "nCTEQ15WZ_FullNuc_40_20" = "1l58bvdhqs9i4mgc39dw9c13rsh5vq5vh6zq8xk35150cbysiwza";
-  "nCTEQ15WZ_FullNuc_4_2" = "0s1zdn5r9hk7bjk2ggn7bhrzq2iaxspdhmwi9rq1xbsk7n8k3wif";
-  "nCTEQ15WZ_FullNuc_56_26" = "15ilca90cvw7p3w1xr15jynqnvnyw8zhpydhyq11x1kc647bgirm";
-  "nCTEQ15WZ_FullNuc_56_28" = "16bs4yq4jr4y3431csabgps6330gcw1ymgm2161z4nmmyp988w1g";
-  "nCTEQ15WZ_FullNuc_64_29" = "17wqyn8g5zbrm6ywvqn2y5kphy9xwbgijwlzxsni5k821nzmjyxn";
-  "nCTEQ15WZ_FullNuc_64_32" = "0ivyka1g2cj6ign8wm28pzim3saas3bvnxqhixxkr91m1gl40b86";
-  "nCTEQ15WZ_FullNuc_6_3" = "00v5wydvrvw1fgbzc436cap7amk8yr7dj5wf3ykyd6415vxmlzl3";
-  "nCTEQ15WZ_FullNuc_7_3" = "06z2p0gx988q5w4d3c0qx6pj7lp6mqlz1qrnwy5lf4i4i4vcqkkx";
-  "nCTEQ15WZ_FullNuc_84_36" = "0rfn82f8f9f6bgngrs67maip2kfhy42i4ppa904d7dspyqkgfa31";
-  "nCTEQ15WZ_FullNuc_84_42" = "14lyhhc5jwccqnz85msaqzdx7cn2vxkvm2l9mf1p2kmgy7p5jis3";
-  "nCTEQ15WZ_FullNuc_9_4" = "1895lr4yydzk4cry5wnjhpl6gs2kcspjlm2mv2y00sb7gzinjs94";
-  "nCTEQ15WZ_FullNuc_9_4_iso" = "0kvjk4wvw98w7y02ishjacn9frncspl6rsxlzcd4y2pdk1ckr29i";
+  "nCTEQ15HIX_108_47" = "1w4vglhfsy4rnlsihf71fpgzdbn1rlx8qfxwg9lai63xf74wf8zg";
+  "nCTEQ15HIX_119_50" = "10nv6zpjx63anxsny926w3cd1wl7xcrdqsq4d120z8hdxlcc6x5x";
+  "nCTEQ15HIX_12_6" = "1m0app8zanpfap0i3ynj3ymspa9ma4zjvjpq2vsnbb1mmkaqkvsf";
+  "nCTEQ15HIX_131_54" = "0clfkn1mw2cg4nj1pwmpi4cqrpnsagq06yh8cbp5bw7m3pvll3rk";
+  "nCTEQ15HIX_14_7" = "1i57rckkv08jh7qyi22lzliy5vmlrh8vwx5x7f9zjlbslghcmx26";
+  "nCTEQ15HIX_184_74" = "0ffs7p6cdw1405246ajriy3sb7nkb6vxjl2rcgspvdhsvpq4wiki";
+  "nCTEQ15HIX_197_79" = "0aa1qq4mrq6zzp4glrnamkdgppcmjd6fq9v6kyg2xmafzbk7crn6";
+  "nCTEQ15HIX_1_1" = "0zzsz4ryh5wrbd96fsj63gmzib1m78r478i11kxfy13h3v6n796j";
+  "nCTEQ15HIX_208_82" = "0sxafxjpmrmlgwiygnsavzgggc7sl3svwj4fsq2cjgkq9g1ny7xf";
+  "nCTEQ15HIX_27_13" = "1lg693mznr4dcs7wsh5qqrjz0mn2abjg9iry235gxl68lfb36hr1";
+  "nCTEQ15HIX_2_1" = "0dklyy54hqjnix59m896xrd28m1mcc9d1gr39idwxwp7vah8h2xh";
+  "nCTEQ15HIX_3_2" = "1cm32w3lqssbm2r4k57v68kjrr9w545wfk3k9bld55qffcc2di0z";
+  "nCTEQ15HIX_40_20" = "1d2jrfvfdm064wnxy7jrwz300hwwc8r1gyclmdp3rjwyvymbml5b";
+  "nCTEQ15HIX_4_2" = "00xp5rch1gn2cj37xqf1iai3zx0l2ix8w1fxqnzf63vpkmfiylws";
+  "nCTEQ15HIX_56_26" = "1f6bi5jmhxbfs5zg2g14j883cpk49jgplhq4fdnjpf9fzhkgvrnw";
+  "nCTEQ15HIX_64_29" = "1f8afd14y2hqngk7wfrf453vvqa15mcbsaijx9cb4hs89jl21jpm";
+  "nCTEQ15HIX_6_3" = "0hkckivc90ixzyyw9m5r59vv05n5cyqfqmnvnchrliv8v81i1v7s";
+  "nCTEQ15HIX_7_3" = "1hjw9akqqnjnj5wzans6yg3w3v5r0q58c21gaan0qgcy4rdqnb5z";
+  "nCTEQ15HIX_84_36" = "1rp65mh33vf2l19ybzbkyahbwxc2anj3hwx1akzwcb34g91wbxzm";
+  "nCTEQ15HIX_9_4" = "1jka1pxq9i7gv5rcisrj4lblii3rh4ngfgkna0cjjzl820dccb7l";
+  "nCTEQ15HIX_FullNuc_108_47" = "12gxzi7dsn8lzrsxfdmscdmnxqsalcj100ndzfdr31bgi4rriylf";
+  "nCTEQ15HIX_FullNuc_119_50" = "1qa11k6irwlbqagxcfgiamp04rw4l5mw7w01znjyf9q14ir4bw72";
+  "nCTEQ15HIX_FullNuc_12_6" = "1szmby3m8lch9jlvdgmwcbbrdi81k9cam63xmrhpfz7m81ns1p1k";
+  "nCTEQ15HIX_FullNuc_131_54" = "0xz57hwzxkqfbgs6ki9ypfiqd2l0yfs86znmknkpzi88wm1lpj5x";
+  "nCTEQ15HIX_FullNuc_14_7" = "1j80ihnxkqiyrk8rch1svs5g8cyw9hnzn562nxi6jsxhd8pmb5v6";
+  "nCTEQ15HIX_FullNuc_184_74" = "005jcyl3h6jv944swq035hfb9mkn7jlg7v1k424507wi4j0f1vj9";
+  "nCTEQ15HIX_FullNuc_197_79" = "0h5dbrcx44f14ybs6hi46px6d323sz0gpss60s4fb5r0p10l40ds";
+  "nCTEQ15HIX_FullNuc_1_1" = "169a4g1qdi462lb9p1abk29fis6jzdp5vxx4liqs82qf90p2r8sp";
+  "nCTEQ15HIX_FullNuc_208_82" = "1rpyrfcl5391kzlplxfrs6m8rhd8icfq6ki6brmy9awhb35hyhn4";
+  "nCTEQ15HIX_FullNuc_27_13" = "1n0inp61zkdhjha5gplks59p1wbqzw67l3mkl1md2bhwhbfjij46";
+  "nCTEQ15HIX_FullNuc_2_1" = "0lx3df0s3ad9crc4ff5qf46w8paknyj248hfbighn3mz89kvwx85";
+  "nCTEQ15HIX_FullNuc_3_2" = "1jv5f093rpp1z32nzddhknw7zdqz54xrf2vpgihvqcc10ca57xkz";
+  "nCTEQ15HIX_FullNuc_40_20" = "0iypyij62ms5znhi6dbzv8n8grq3ky0gm0v3grvlp7jw7vf94p0a";
+  "nCTEQ15HIX_FullNuc_4_2" = "1h62kdixqq4kjnm4m5p3cv2awnc4i1gl6b0cv1567hy6bjw86w9b";
+  "nCTEQ15HIX_FullNuc_56_26" = "0rfjyf8ka2205r4980g50nns78xky8s7jyisdbaif3s4f7aan9wn";
+  "nCTEQ15HIX_FullNuc_64_29" = "0dasf251w5f4ch8w2cva2xxa3y64gbh7aq288fga0s2fysgdfmqk";
+  "nCTEQ15HIX_FullNuc_6_3" = "0bbl3lsg43lxsga8ghzmgckn5qnhha46rh5wp4v1bvw0sip3s0xl";
+  "nCTEQ15HIX_FullNuc_7_3" = "1g50bvfj7xlw9h6p7i6fwwrlr47ixnw68zj9awaxicqihfvdxis5";
+  "nCTEQ15HIX_FullNuc_84_36" = "12cw4rsjj4c152xp502aavgq8akx0h8ynanw5h88vcwyl8xr479h";
+  "nCTEQ15HIX_FullNuc_9_4" = "0pli0np6mzc04jkzsfa4kjxqdng94qfms3xpbcycrffdq3hanvl6";
+  "nCTEQ15HQ_108_54" = "1slpvz1lniqvgs9ikh266i6vl20mk05diz1ps5wlb89c4kw45i95";
+  "nCTEQ15HQ_119_59" = "1p66rfb67dww66qv3wiajkw7hi636f92dwbg5iy10vwsffj0cxhp";
+  "nCTEQ15HQ_12_6" = "114dy87r9f7zwfx91yzz00diayvkgj1bq4v803yx43j64j1rphnj";
+  "nCTEQ15HQ_131_54" = "1s6zp2r5z3zvmmjc1z1l9d0x3n2xxr4d009r6raw211n07325jl7";
+  "nCTEQ15HQ_14_7" = "1nm4yz8jki1h15biqcd1r1s6w3f7ravd45qlbki1i2iv40mnxzbg";
+  "nCTEQ15HQ_16_8" = "0vkprb6y5y1pp4z6q9apwfvy2ind4r733hzxv3bwiap8hpfbvqdm";
+  "nCTEQ15HQ_184_74" = "107fpfrfdfvcymfm67jcvf1h052f7ymilinng226kdghwz09bg1v";
+  "nCTEQ15HQ_197_79" = "1xhzbp0pmi5yrqp0z4c33xh8qiii3mj17sjgrm1lg5jka78hjsrb";
+  "nCTEQ15HQ_197_98" = "0zma6rmaxb6vlsx4fkqya7raa9ci02wr28r4blrws3mlkja421xb";
+  "nCTEQ15HQ_1_1" = "16jnh5jycrrmvj5j0ay6mx1vf62kgdakrpg88dn41ii7cp60kvp6";
+  "nCTEQ15HQ_207_103" = "0dzddmd95yhy61gwd2zl36266lzy4lrqad2chidg7kb4crb5wgly";
+  "nCTEQ15HQ_208_82" = "0ns9y7kz1dglqrw3v78mvrpdc324r92vr6cydcin3wxhfj2nfyxz";
+  "nCTEQ15HQ_27_13" = "005fynv4xqqksn95r8fkyd3sb6pk8avkpv05bnn5zqfa589rj2x2";
+  "nCTEQ15HQ_2_1" = "19hq3myj2w3d73rxygi797d2rgnqwxqzfg4h2xlz642204d69v25";
+  "nCTEQ15HQ_3_1" = "1m5q822p7vcf00c1lfi8wc77x2qzq9pd9wxcwb2dk51qjikhqqyr";
+  "nCTEQ15HQ_40_20" = "07p39x25kjy84xxrcvmc74b27phdky42ccijb8chbdd8vxs064cx";
+  "nCTEQ15HQ_4_2" = "02lzf5515xlyaq79hpv6hqf32xd95z4b71d98c6zs27lac0g35xn";
+  "nCTEQ15HQ_56_26" = "15dgvlid95j87klkrhiwp123ls11zzhnyfsgfjm48d72ahvxnm5p";
+  "nCTEQ15HQ_56_28" = "1jgsf2bj8fd9kn0y21d9fk690niwmjcdcv8g2a9awwac633yr9ln";
+  "nCTEQ15HQ_64_32" = "0q0cvyf8rixbyj9b1mfi68wv9q1d1l2bdzzyjzcn7fzdadwipga2";
+  "nCTEQ15HQ_6_3" = "02lr1df7lsl809lqxqvb8jxyr0rnxr6zd42yj7hc3n0jjsqm1h65";
+  "nCTEQ15HQ_7_3" = "07bqkk6mwky58bvxg18mmrayzlalhq7cx7mxcv8bnrp71j265ncm";
+  "nCTEQ15HQ_84_42" = "0ydkxa242b7mda97scv77n5il033dznzcy77g0wmn9k5dsw31npj";
+  "nCTEQ15HQ_9_4" = "08pdfjsjdixdmxw4xfijzkpbwn094b2nfcihxngzpm7csc5kdx9k";
+  "nCTEQ15HQ_FullNuc_108_54" = "07ly5fm04dkppwm28d3q08s5r0gqwqj6yz7lc2bj4bhiysnw08r2";
+  "nCTEQ15HQ_FullNuc_119_59" = "0mjccw866cbzsipr4wzsk07hcqfxxr5972ifmcrwfgj1g3ak2cn0";
+  "nCTEQ15HQ_FullNuc_12_6" = "1cph82nnfn58ywb5jlw2rdwn7mj5ig6hip1p6rdfb6kah4c945c0";
+  "nCTEQ15HQ_FullNuc_131_54" = "097ljk9nx5n9mf94vzk59ybdbyyijp5mdwg6w4zrrrq4ax5mmzkw";
+  "nCTEQ15HQ_FullNuc_14_7" = "0zj3jjap7vyv0hw5xrgq18jsqmamvcb8x0j3kmvxv9ld5w6snfah";
+  "nCTEQ15HQ_FullNuc_16_8" = "1n202nhh9yhdh0hwrp1xai5hrdil5spgjbbh6qz2m4i85pv7404z";
+  "nCTEQ15HQ_FullNuc_184_74" = "1jdh1hqq5dxvnhhinv5ixj9icqdb3dxynfl9773s6mx3080flnnm";
+  "nCTEQ15HQ_FullNuc_197_79" = "1k5qbgx7i1is72g3zw29b80wknsyvjq23vnmfrsb2wm8fzgxyslc";
+  "nCTEQ15HQ_FullNuc_197_98" = "01ddw29g3yakvxq6jg210kb5br7ga96740hb5la358p4dpl8n1pd";
+  "nCTEQ15HQ_FullNuc_1_1" = "1pnwh3fdmylgvy3wy24w3aqds2ridcnyyc5w6xsrri3p7r7y5w0p";
+  "nCTEQ15HQ_FullNuc_207_103" = "1fpz7nfvgrsk3lrlymvs10d8dlzv809f4hmjh6jqcq8rn1p80vr3";
+  "nCTEQ15HQ_FullNuc_208_82" = "0d5gxzrxya0c4049rkd2mfgp319rvj8v63h3jsdhqml985cqfzqp";
+  "nCTEQ15HQ_FullNuc_27_13" = "0shc0nl6k10646xas54spqr1i8x31jqfwgw8hv2wq65ncqadqiwy";
+  "nCTEQ15HQ_FullNuc_2_1" = "0wi0n54sjj7v6k6ilz6b511savr6xj77rakndy8vc79jy9b0wkvw";
+  "nCTEQ15HQ_FullNuc_3_1" = "0hf5r3gzmkscdv0sxw14nsjiz98wjn9dp3gfhb8biqnzdivf4chm";
+  "nCTEQ15HQ_FullNuc_40_20" = "1slyfiywayfd9wdrssa494vpgcdb743k7kan7kzwj86ck9k6pdxq";
+  "nCTEQ15HQ_FullNuc_4_2" = "01vh0hr40hhfl13dbhmng1xgcd7lgqd7lzhrqj7zhfl6f5xqhjii";
+  "nCTEQ15HQ_FullNuc_56_26" = "1g5wkwpcb6ja8b1akx41bcc4f1lqa48sj47rmnw0x43c49l3xk2b";
+  "nCTEQ15HQ_FullNuc_56_28" = "06fknkzc94cnzgvpy73m8rglx9ablkmf8sda2ilchr3scr7pb1pr";
+  "nCTEQ15HQ_FullNuc_64_32" = "0jq6zjgx0hbhahrs45kjqsiqbbc2bcy41ppzl2y2j2v2li3gjkwj";
+  "nCTEQ15HQ_FullNuc_6_3" = "1js55wwpqvkxwpl3h3qbslbk4ppi7vs1mbbpb7kxlcydx3fi0ax7";
+  "nCTEQ15HQ_FullNuc_7_3" = "1hsvqa0vlkld70ddxsmz0j1bs64fyzmciz2vjy82ms5gs9qnv7g7";
+  "nCTEQ15HQ_FullNuc_84_42" = "0xcbqvxyvksll83rwbs2jmnya2sgm179xbbf865cl3wjh4r4n5pc";
+  "nCTEQ15HQ_FullNuc_9_4" = "0np4217wrxh140q1zyi2ikylrrdhbjfbrbfgha9fgmdyg92czmw4";
+  "nCTEQ15WZSIH_108_54" = "0jmbwdjy59h8hfyys8gv7fr0v1v8nqzl4bncrj50wmkbsqry28cr";
+  "nCTEQ15WZSIH_119_59" = "17ywm2f9151k8148980ikiylfdwx4ghvh3d84q4z2yd7vab47k1d";
+  "nCTEQ15WZSIH_12_6" = "1w4yxfyf7nbb7iqndp5ifqh0d2acjh9dj93si2k1dnqlgz07hvnx";
+  "nCTEQ15WZSIH_131_54" = "05qi63kzkk4r8v7zadysnf9p1qn461kksmrqc06jb47r7mpy399h";
+  "nCTEQ15WZSIH_14_7" = "0238c74asr45nv5s9phyv99k9jgn64lbzrm2ygp3482v7aqrm7gr";
+  "nCTEQ15WZSIH_16_8" = "14ljjxnwx0n3wk37z7rgpdikzmbfri5l1n27626c3mxfvpm3p0sf";
+  "nCTEQ15WZSIH_184_74" = "04k0qrlly9y98ib21p0w19dlybg71jyh2331fwr8pfc1j7vyz4wb";
+  "nCTEQ15WZSIH_197_79" = "01lqdl1v8lhwa3p2d61qf4rnllrypkzp2pjmvdcsc2hll1c533vw";
+  "nCTEQ15WZSIH_197_98" = "1124ivl1apfvv7x02mdf1xl9y98f5mx8gq0rf3n2vh8rkj7if4ha";
+  "nCTEQ15WZSIH_1_1" = "0iyzh37dxlmkzlx4azln0x4gd53rlwcm9p4x6hil41idh12i39j4";
+  "nCTEQ15WZSIH_207_103" = "100im91fz8y88bk7pnxha19wv61nqgdy2xlckcr1sbb1qp0ai0ny";
+  "nCTEQ15WZSIH_208_82" = "0bgdar8hzg21glkp8nv5w5jnw13yq5ifcrravhd3f7h9582lg3za";
+  "nCTEQ15WZSIH_27_13" = "0px0rg95pa4kn6c9825ghgqki5lpgwni5pqrfyzp5yr1dnwxwdq5";
+  "nCTEQ15WZSIH_2_1" = "0m9frrw5dxi15gr5lfg8pkvw974y7vhfq688bj8k479pndi996sa";
+  "nCTEQ15WZSIH_3_1" = "0ra52fcv6gbrcriw8c6h10ylwiyb72ajx1as110p04x3y8kp3698";
+  "nCTEQ15WZSIH_40_20" = "0lysvv2an0xcich3r9qdz15pbzg65d5r151nqvgpvzrb13ifg0bk";
+  "nCTEQ15WZSIH_4_2" = "0fb3id9mdjcjp809pp6g2lafp6qkjwrrgdy73d64ph1a7x08kmjd";
+  "nCTEQ15WZSIH_56_26" = "1dv41iz0arb76c0dh0cbh8263dp097g6c2y1kklnv1ds5zx6bv1r";
+  "nCTEQ15WZSIH_56_28" = "1d07j76a5kphv76vibw3ca8s3z4x6xi3l28jqbypsa0sw7dnrsfq";
+  "nCTEQ15WZSIH_64_32" = "12dk5hvfqanbp4rlgnah6jrdnw3hdl2797dgd6ll7kij92bk0zv5";
+  "nCTEQ15WZSIH_6_3" = "1d4cil1gypzhbn8apgaxc87fq8czakxwq01v0c75x2qiwasah5qp";
+  "nCTEQ15WZSIH_7_3" = "1jgpxd7gp62zam2jgbnrxh9m7xzvpvn32q8pvhgm9v16sxs2v5sr";
+  "nCTEQ15WZSIH_84_42" = "1wr3dd3wlxm89ngaqmkb0nszx1yxs028q2d3y6i8k6fab4ab3m4x";
+  "nCTEQ15WZSIH_9_4" = "1lbmi26knka3h5r1r3mzzq46svbcxh099dx03spv5hq3cxx1796p";
+  "nCTEQ15WZSIH_FullNuc_108_54" = "041p3l4a1npijyv0pdnk4hyhhwla27waxd64jygydil6hz1z838j";
+  "nCTEQ15WZSIH_FullNuc_119_59" = "0hwjc4l8pd4x0wknm4xhig83rpwk467464kfcdncrh4ayzcjjf2s";
+  "nCTEQ15WZSIH_FullNuc_12_6" = "0h6wcl8vl7f9k0rky41agzlmydm45f2aiylgwf4hlln9jq35hr8p";
+  "nCTEQ15WZSIH_FullNuc_131_54" = "1pighs821zf3y8nbsynd80wq2ihxhi15mzyqd933s9kivmpv0sp7";
+  "nCTEQ15WZSIH_FullNuc_14_7" = "0pv569rm2jfjj49nqg0ms2kjlcnfqjiq938y25jnhbsr38wifvyv";
+  "nCTEQ15WZSIH_FullNuc_16_8" = "1abzwa9c25vhc465y1bz45bl9jbhqqvwh340s9rs2pl9xwddnivx";
+  "nCTEQ15WZSIH_FullNuc_184_74" = "14k9xwxkg7am9qcwrlgl5dnbr5c8dw40mhmvqs9nwaxkahkvz8ch";
+  "nCTEQ15WZSIH_FullNuc_197_79" = "0683ym1jf9y25jd81lv71pz7n71an954a6vb8z6xfmzdr2yms51j";
+  "nCTEQ15WZSIH_FullNuc_197_98" = "1fwsxpf03ymcnz2nl9zk1844hjjcj3gc7vaknnbfq6cg670kngpf";
+  "nCTEQ15WZSIH_FullNuc_1_1" = "0cbylcph0im5dklkpkwi01814nr94rg3yd8akzm1wgl1fjqqziyk";
+  "nCTEQ15WZSIH_FullNuc_207_103" = "06i8z595gwcwb8i204dy3md6v8l336nmycmngr0b0v67xwly81g6";
+  "nCTEQ15WZSIH_FullNuc_208_82" = "11y5bsav1zp4r6fj104knxfnxjhaw0zlgs0b53xl5v148w885rmz";
+  "nCTEQ15WZSIH_FullNuc_27_13" = "1qbw0igryhmdmcr6mr2krb9jm5s2v2lhz5xb3bfkw72kr9b7lsq7";
+  "nCTEQ15WZSIH_FullNuc_2_1" = "1zsfdzy4bapcvmd9r1bgkhr26zdr7bnp3ya57mp2s407k0vmr57f";
+  "nCTEQ15WZSIH_FullNuc_3_1" = "1rws71qy4viv9hvadd95rq7zi9x6fp9asnrfvfdchb9pcnpzh3ba";
+  "nCTEQ15WZSIH_FullNuc_40_20" = "06mq1ckmrc9flg9406ydrqlkivcwiw75y05qahyvsd25rixgvwil";
+  "nCTEQ15WZSIH_FullNuc_4_2" = "0fgkx7r0q1l1a7kaxw9h3yil3292qk5g3dcsv4ccs4295xf0szww";
+  "nCTEQ15WZSIH_FullNuc_56_26" = "15lgfhwyqarr1p27b953gr56wlv2hgy66090nsn9swb1hs85pc59";
+  "nCTEQ15WZSIH_FullNuc_56_28" = "1pw9x942pk9zaarw7ld6ksbbl1n5nbmdm5wad6ac5ap8y94bxcrv";
+  "nCTEQ15WZSIH_FullNuc_64_32" = "1p55raikbiwl8jr898g0yrc1baa9r43n2zf1j2jkphbk4agl3rwl";
+  "nCTEQ15WZSIH_FullNuc_6_3" = "021h89y3q8ym731xmzj96q1diqkrx74dfbp6jgx6dsgdbxi5lnmf";
+  "nCTEQ15WZSIH_FullNuc_7_3" = "134n7gg07sls33sc5a68b4cjhd02k32i69cpkh3dk7dsqkqa09m4";
+  "nCTEQ15WZSIH_FullNuc_84_42" = "1b3f564hs573zzfqw1f0v924y824rmnf52zkgin26aar14il14yx";
+  "nCTEQ15WZSIH_FullNuc_9_4" = "0by1gfkb9nkav3mc5lk9xhsnbizl10va36ydbhqhmzln2ddz1psj";
+  "nCTEQ15WZ_108_47" = "1lc5i1n6mnfkqd789hbhmc6c4lm2l4dhinghh5sg50rv31gvck60";
+  "nCTEQ15WZ_108_54" = "0j0kc7cbxmz7k75sf0bngx8lkfyi2w5qdclrbjml2lml3czb34hb";
+  "nCTEQ15WZ_119_50" = "0srpj3h7fw4p1hbrmlkpscrcaa5x368xw41xp6scpkvdbckjc0v3";
+  "nCTEQ15WZ_119_59" = "16d7rmdxlnamampxpg9bhikzzd49bg58kzxwvjvj1b2vn3lprqv2";
+  "nCTEQ15WZ_12_6" = "1qg4b3h97a4jc93w87i3hvm4fl40n26q1ivbj0fnhvbpwn02wi95";
+  "nCTEQ15WZ_131_54" = "12gsp3l3q7gvrvd5klx9sk0cf0q62mhhfdsy3rq7r6nbwrxly8ng";
+  "nCTEQ15WZ_14_7" = "034x24xd1l8klyymim2bz0yfki6i0hvc50cin20hlxiqspl4g8pf";
+  "nCTEQ15WZ_16_8" = "1kidv4nbhnlmb70n9bpmmyrqw0lnsqhg97fxbflp1dkp7nspvclc";
+  "nCTEQ15WZ_184_74" = "0xwy21myml30y0k8510z956fr76z15ccsz3pvnki10x0rjf66r0l";
+  "nCTEQ15WZ_197_79" = "0kqwddmdskjfshb4z11qv0c4ymg0jz108yawba511g0r9919j5bg";
+  "nCTEQ15WZ_197_98" = "1c882kpjj18z5j3fcrljjkp0sja9v6bmrjrn6il1lhwfjflb3q6h";
+  "nCTEQ15WZ_1_0" = "0p7b306y8zj87pqiva390790darzjrfhs6i8dqii3cw4aj2s38za";
+  "nCTEQ15WZ_1_1" = "1b079n979aphfh1jv0p2sxx81518i0gkhfwzf6x0a765iglwj278";
+  "nCTEQ15WZ_207_103" = "00i96r9fdnvw2di73qs1h883sbnpkhw3fl5fvfvpy3s9vjb644sl";
+  "nCTEQ15WZ_207_82" = "13ivx1ia9gkw0gsk8v1c2m2v7bv22fmky7m7y2ccq5mkxmnvnh75";
+  "nCTEQ15WZ_208_82" = "179xm981fxr1sc0jn0kgihd1n8f3l3grab4q6k0haz894qg5kdy4";
+  "nCTEQ15WZ_20_10" = "0qxsqb215xky8c4wmrppmnkdcxs9vp7s8g9gn61h4kyfshcj2mn8";
+  "nCTEQ15WZ_27_13" = "19akxcsyyyfwhkr3x71agyfbj2ayyj407b6ppnkrdksri5yknxyi";
+  "nCTEQ15WZ_2_1" = "10w4zvfh1iqpg0ydf6i9zr4vpj0nkrnljr7vcck3qzl6spd27frm";
+  "nCTEQ15WZ_3_1" = "1gq30k62akjh0cx6rz16j2bppxigqbmdyhbzrwcyna9krhz15kjg";
+  "nCTEQ15WZ_3_2" = "0lpa3wgr40zixf6sjzf8kzznjbxlgnpa1kbjar3msjmr8dy6x3bl";
+  "nCTEQ15WZ_40_18" = "0xbnsabpy7bjihhx92ws4b2209b0ipx4h9w5y78qkga68zrmqf42";
+  "nCTEQ15WZ_40_20" = "1qfdjs4jsz4ns0cz1lbknhwjv8i8j2lfnffvzly9qgsxaci45lmi";
+  "nCTEQ15WZ_4_2" = "1rmxc59qy9f4xk8p4l7vaf0nvvapwbzyijjkjv146958kkvxh8h9";
+  "nCTEQ15WZ_56_26" = "120xd77qp0ffaa5wwm813bvzjaf6rxlnfy28fp7czc7k2d8b5mkp";
+  "nCTEQ15WZ_56_28" = "0plbk3pb0269b5frcgc8rjr3pmkiq05dv4qzpbp74nx5j5s4jp6b";
+  "nCTEQ15WZ_64_29" = "0k59zml9k27b97nljywa3rpkf4p5cy7g39n7fwljd1gvnv5d63x7";
+  "nCTEQ15WZ_64_32" = "1gb52sd4p87hwpld0jzi1hcv4gqhgif6mjgwjqw4b8ch8rhbbd1z";
+  "nCTEQ15WZ_6_3" = "15hikabxgl2pqayls3n4anq08jj26g6w65xv4mz33gxpgk3pqf2c";
+  "nCTEQ15WZ_7_3" = "0i26ns1icgqwlv3mpakr4v47k39zvbj36ap750p64f7wg34448i0";
+  "nCTEQ15WZ_84_36" = "1s1i9kbr3zxcdm221yl6jr38jjwvkb87ll1klz2m83jck07nlwqb";
+  "nCTEQ15WZ_84_42" = "0b5fq2gq82m8szz2krp7llkbpdrgw7cz7wfsy0h5pqd3l854rh0h";
+  "nCTEQ15WZ_9_4" = "1sq0j6cf80wgw77mgbp5h0zv4iyywc32206sgpq2gdp2dcwcf37f";
+  "nCTEQ15WZ_9_4_iso" = "1r4glsf7ypkdcx7wqrj8jkymwnkwb0rb7dvnsldq5gs2fkrsnmmp";
+  "nCTEQ15WZ_FullNuc_108_47" = "1568r6wf22yq8cy004c6h6xaxl6bpnrfhmrr1x35bmj8g4x4g4fv";
+  "nCTEQ15WZ_FullNuc_108_54" = "08v3ajasbyz7skmzf6lqj4cs8jzfrxwm1pdmz2qhmxy2s3kwffmz";
+  "nCTEQ15WZ_FullNuc_119_50" = "1lmckp5v7wi63n4w3j2qbrsd2zy21ibxmbacj8722vr9pp7n7bjs";
+  "nCTEQ15WZ_FullNuc_119_59" = "0yz8z0f316dmhgvy93nspd9pmniwq9hdyyg5zlic3g0fd9a1p2ak";
+  "nCTEQ15WZ_FullNuc_12_6" = "0csl32rqrrchrbcqf9z0vaccf4xs13zchbi54a3yrn6m03msbfvd";
+  "nCTEQ15WZ_FullNuc_131_54" = "0myma0mavapcb2lrwcwy0n9cjy1bzgs6r0bgx7pahcaifcp4va6c";
+  "nCTEQ15WZ_FullNuc_14_7" = "1hy47z8qnk4i291ihjpnn5a6zhb6pb5gyhga0vmfak3m9q188n1n";
+  "nCTEQ15WZ_FullNuc_16_8" = "0jgqjva419p4h4wcqs9fh2qzjywrhyxykm26n7h9kw1phc67rrr2";
+  "nCTEQ15WZ_FullNuc_184_74" = "0x8ydzfg40bgdsvi24b12rilm19fdv49402mfsf9dh7ysws69sv2";
+  "nCTEQ15WZ_FullNuc_197_79" = "11c8r6h1f4m53m1bf0lchl56q49d52qznm6qqkbar3gi71nrnj48";
+  "nCTEQ15WZ_FullNuc_197_98" = "15asy566k71i2qak9blynyxi62z9zj9x316sidnbdikikqsh02xd";
+  "nCTEQ15WZ_FullNuc_1_0" = "0s1wqlrz0s7gbfbc8hyyfv18h5ddbh80haayhni1990zfl176zws";
+  "nCTEQ15WZ_FullNuc_1_1" = "103h6a9jmp9px5jwhpjr3sbxn9rwbqa6c78bl4rq8c3qpna62fjy";
+  "nCTEQ15WZ_FullNuc_207_103" = "09376xai5jlf0gqa0svgdlf06xnbs174v5k3icvs18f2fvzwq6kd";
+  "nCTEQ15WZ_FullNuc_207_82" = "18fisiqm2a26rs1mrl3ax6kl7q3bd4f9r0mszmq6q8yi5wmn05ds";
+  "nCTEQ15WZ_FullNuc_208_82" = "1jrxm30h938jhz2474hl3arikrlvijm5shqslrgl8b9c67zjxcsj";
+  "nCTEQ15WZ_FullNuc_20_10" = "1vvyiw6q106smkklnpy10v3fww67p41glyjfqykbp4bmbnjr7c2m";
+  "nCTEQ15WZ_FullNuc_27_13" = "120p67g45jwnxzim1fsfvxi6q4b3lwsm51kfivpbb0fiy3n8hbp9";
+  "nCTEQ15WZ_FullNuc_2_1" = "04q8fk70qhsa08zyhynqrxbilyps6p8ivpp77w07ipq0qpfvddpq";
+  "nCTEQ15WZ_FullNuc_3_1" = "1pryhhayi49w8css7mssha2ix012nnkyz5b590rj9y4qasmj5a7i";
+  "nCTEQ15WZ_FullNuc_3_2" = "0gfixlsf8jvp6v9jkn6whgblvswyqf9c9c0mjlyj5p038jig8k7k";
+  "nCTEQ15WZ_FullNuc_40_18" = "12iz53hq4cw8wgj6wl9gnix5zrcdc8k9pn9binc5s8x4w5v14f2b";
+  "nCTEQ15WZ_FullNuc_40_20" = "0qjrp1xwzcba12kdka1klzvgv1a0qig85j98xiq12y0c2ax88sy7";
+  "nCTEQ15WZ_FullNuc_4_2" = "0ipasfw139y78v6md0k6hakh6n8fh79frszj9fsa5c9hng8s70jz";
+  "nCTEQ15WZ_FullNuc_56_26" = "1njjzdp0an3pp3kgg6g9a1fskqpvfn9lg9f6hba2jr1jylkmshkx";
+  "nCTEQ15WZ_FullNuc_56_28" = "04zk6vcg79hzg1cvc2j59nkc5hik28q0miivzng2ngb11b6gaq6f";
+  "nCTEQ15WZ_FullNuc_64_29" = "12yxc1vyxlxvfi75brrgpgvllhspl4bky5i7l3wcsv6c9dq7p20j";
+  "nCTEQ15WZ_FullNuc_64_32" = "1svj0m331ajchxpwg9l27civkz95ik7q0yclxk6pv16iv02zkv1f";
+  "nCTEQ15WZ_FullNuc_6_3" = "1rs5srl7ljprznj2b03syrh78fsj7fliq4w89pzm2v04h01kwpix";
+  "nCTEQ15WZ_FullNuc_7_3" = "00ap7a1kb9dhqs9hcfggk9lpdynxjdywlbjnpkmqcribpaadirny";
+  "nCTEQ15WZ_FullNuc_84_36" = "1z9shhccqavnbds06xh0nvygk5m64cbpnjl91azdyxsl4s396dj0";
+  "nCTEQ15WZ_FullNuc_84_42" = "0j28izpb48b2klxfh0v661x3bwirf1i8mz3a555g2nnjp544cpz9";
+  "nCTEQ15WZ_FullNuc_9_4" = "0j7c4nw31xayzrsm3fyw3ak99aarwfpbygnavmv75jjzcq24ki9l";
+  "nCTEQ15WZ_FullNuc_9_4_iso" = "1a9lz5vbrhsirz4ldwasw662706q3zndp0606xyyg2wmnq64z4h1";
   "nCTEQ15_108_54" = "1bjx2d61qjhabfx28pfi64hf8br4gl67nzir3ygdpwdcah4k6lz8";
   "nCTEQ15_119_59" = "0g7wffsyjh84r2wv8w67skx8gwdb3clv9c1dlpijwqmpkcm3b8q5";
   "nCTEQ15_12_6" = "1xnnqp38zz3b61jb38hz54wv09w06fwwnb66sf93r1agcajvv1vi";

pkgs/development/python-modules/libtmux/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "libtmux";
-  version = "0.39.0";
+  version = "0.40.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = "libtmux";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-JqOxJD34DL5Iku3Ov8JzwSVThqDg41PQ/v1Dz6ex4ro=";
+    tag = "v${version}";
+    hash = "sha256-rddjRBofI5M28wvlBwH2VwuIgmulThxbfxiJSOCNkPY=";
   };
 
   postPatch = ''

pkgs/development/python-modules/nifty8/default.nix

@@ -27,15 +27,15 @@
 
 buildPythonPackage rec {
   pname = "nifty8";
-  version = "8.5.2";
+  version = "8.5.4";
   pyproject = true;
 
   src = fetchFromGitLab {
     domain = "gitlab.mpcdf.mpg.de";
     owner = "ift";
     repo = "nifty";
-    rev = "v${version}";
-    hash = "sha256-EWsJX+iqKOhQXEWlQfYUiPYqyfOfrwLtbI+DVn7vCQI=";
+    tag = "v${version}";
+    hash = "sha256-Q42ZhQ/T8JmkG75BexevbvVKQqfDmMG6+oTYR0Ze718=";
   };
 
   build-system = [ setuptools ];
@@ -76,7 +76,15 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://gitlab.mpcdf.mpg.de/ift/nifty";
+    changelog = "https://gitlab.mpcdf.mpg.de/ift/nifty/-/blob/${src.tag}/ChangeLog.md";
     description = "Bayesian Imaging library for high-dimensional posteriors";
+    longDescription = ''
+      NIFTy, "Numerical Information Field Theory", is a Bayesian imaging library.
+      It is designed to infer the million to billion dimensional posterior
+      distribution in the image space from noisy input data.  At the core of
+      NIFTy lies a set of powerful Gaussian Process (GP) models and accurate
+      Variational Inference (VI) algorithms.
+    '';
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ parras ];
   };

pkgs/development/python-modules/pyopengl-accelerate/default.nix

@@ -19,6 +19,11 @@ buildPythonPackage rec {
     hash = "sha256-KxI2ISc6k59/0uwidUHjmfm11OgV1prgvbG2xwopNoA=";
   };
 
+  postPatch = ''
+    substituteInPlace src/numpy_formathandler.pyx \
+      --replace-fail 'Py_intptr_t' 'npy_intp'
+  '';
+
   nativeBuildInputs = [
     cython
     numpy
@@ -26,6 +31,11 @@ buildPythonPackage rec {
     wheel
   ];
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=int-conversion"
+    "-Wno-error=incompatible-pointer-types"
+  ];
+
   meta = {
     description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x";
     homepage = "https://pyopengl.sourceforge.net/";

pkgs/development/tools/libsigrok/default.nix

@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libsigrok";
-  version = "0.5.2-unstable-2024-01-03";
+  version = "0.5.2-unstable-2024-10-20";
 
   src = fetchgit {
     url = "git://sigrok.org/libsigrok";
-    rev = "b503d24cdf56abf8c0d66d438ccac28969f01670";
-    hash = "sha256-9EW0UCzU6MqBX6rkT5CrBsDkAi6/CLyS9MZHsDV+1IQ=";
+    rev = "f06f788118191d19fdbbb37046d3bd5cec91adb1";
+    hash = "sha256-8aco5tymkCJ6ya1hyp2ODrz+dlXvZmcYoo4o9YC6D6o=";
   };
 
   enableParallelBuilding = true;

pkgs/tools/backup/zfs-replicate/default.nix

@@ -1,47 +0,0 @@
-{
-  buildPythonApplication,
-  click,
-  fetchPypi,
-  hypothesis,
-  lib,
-  poetry-core,
-  pytest-cov-stub,
-  pytestCheckHook,
-  stringcase,
-}:
-
-buildPythonApplication rec {
-  pname = "zfs_replicate";
-  version = "4.0.0";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-9WD2IW7GRxMF7hOa8HTI/+cuOjVaYMT4OnrYU/xFgME=";
-  };
-
-  nativeBuildInputs = [
-    poetry-core
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    hypothesis
-    pytest-cov-stub
-  ];
-
-  propagatedBuildInputs = [
-    click
-    stringcase
-  ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    homepage = "https://github.com/alunduil/zfs-replicate";
-    description = "ZFS Snapshot Replication";
-    mainProgram = "zfs-replicate";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ alunduil ];
-  };
-}

pkgs/top-level/all-packages.nix

@@ -18564,8 +18564,6 @@ with pkgs;
 
   wfuzz = with python3Packages; toPythonApplication wfuzz;
 
-  zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
-
   kodelife = callPackage ../applications/graphics/kodelife {
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };