Merge 047f31d25b into haskell-updates

maintainers/maintainer-list.nix

@@ -13858,6 +13858,13 @@
     githubId = 139;
     name = "Leah Neukirchen";
   };
+  leana8959 = {
+    name = "Léana Chiang";
+    email = "leana.jiang+git@icloud.com";
+    github = "leana8959";
+    githubId = 87855546;
+    keys = [ { fingerprint = "3659 D5C8 7A4B C5D7 699B  37D8 4E88 7A4C A971 4ADA"; } ];
+  };
   lebastr = {
     email = "lebastr@gmail.com";
     github = "lebastr";
@@ -18544,6 +18551,14 @@
     githubId = 107261;
     name = "Andrey Kuznetsov";
   };
+  ontake = {
+    name = "Louis Dalibard";
+    email = "ontake@ontake.dev";
+    github = "make-42";
+    githubId = 17462236;
+    matrix = "@ontake:matrix.ontake.dev";
+    keys = [ { fingerprint = "36BC 916D DD4E B1EE EE82 4BBF DC95 900F 6DA7 9992"; } ];
+  };
   onthestairs = {
     email = "austinplatt@gmail.com";
     github = "onthestairs";
@@ -19818,6 +19833,12 @@
     githubId = 38314551;
     name = "Peter Okelmann";
   };
+  Pokeylooted = {
+    email = "pokeyrandomgaming@gmail.com";
+    github = "Pokeylooted";
+    githubId = 79169880;
+    name = "Dani Barton";
+  };
   pokon548 = {
     email = "nix@bukn.uk";
     github = "pokon548";

nixos/lib/testing/network.nix

@@ -3,15 +3,15 @@
 let
   inherit (lib)
     attrNames
-    concatMapAttrs
+    concatMap
     concatMapStrings
+    flip
     forEach
     head
     listToAttrs
     mkDefault
     mkOption
     nameValuePair
-    optionalAttrs
     optionalString
     range
     toLower
@@ -91,22 +91,23 @@ let
         # interfaces, use the IP address corresponding to
         # the first interface (i.e. the first network in its
         # virtualisation.vlans option).
-        networking.hosts = concatMapAttrs (
+        networking.extraHosts = flip concatMapStrings (attrNames nodes) (
-          name: config:
+          m':
           let
+            config = nodes.${m'};
             hostnames =
               optionalString (
                 config.networking.domain != null
               ) "${config.networking.hostName}.${config.networking.domain} "
               + "${config.networking.hostName}\n";
           in
-          optionalAttrs (config.networking.primaryIPAddress != "") {
+          optionalString (
-            "${config.networking.primaryIPAddress}" = [ hostnames ];
+            config.networking.primaryIPAddress != ""
-          }
+          ) "${config.networking.primaryIPAddress} ${hostnames}"
-          // optionalAttrs (config.networking.primaryIPv6Address != "") {
+          + optionalString (config.networking.primaryIPv6Address != "") (
-            "${config.networking.primaryIPv6Address}" = [ hostnames ];
+            "${config.networking.primaryIPv6Address} ${hostnames}"
-          }
+          )
-        ) nodes;
+        );
 
         virtualisation.qemu.options = qemuOptions;
         boot.initrd.services.udev.rules = concatMapStrings (x: x + "\n") udevRules;

nixos/modules/services/cluster/kubernetes/pki.nix

@@ -365,12 +365,9 @@ in
         keyFile = mkDefault key;
         trustedCaFile = mkDefault caCert;
       };
-      networking.hosts = mkIf (config.services.etcd.enable) {
+      networking.extraHosts = mkIf (config.services.etcd.enable) ''
-        "127.0.0.1" = [
+        127.0.0.1 etcd.${top.addons.dns.clusterDomain} etcd.local
-          "etcd.${top.addons.dns.clusterDomain}"
+      '';
-          "etcd.local"
-        ];
-      };
 
       services.flannel = with cfg.certs.flannelClient; {
         kubeconfig = top.lib.mkKubeConfig "flannel" {

nixos/modules/services/monitoring/netdata.nix

@@ -367,19 +367,25 @@ in
           # AmbientCapabilities
           AmbientCapabilities = lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
           # Capabilities
-          CapabilityBoundingSet = [
+          CapabilityBoundingSet =
-            "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
+            [
-            "CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin
+              "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
-            "CAP_FOWNER" # is required for freeipmi plugin
+              "CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin
-            "CAP_SETPCAP" # is required for apps, perf and slabinfo plugins
+              "CAP_NET_RAW" # is required for fping app
-            "CAP_SYS_ADMIN" # is required for perf plugin
+              "CAP_PERFMON" # is required for perf plugin
-            "CAP_SYS_PTRACE" # is required for apps plugin
+              "CAP_SETPCAP" # is required for apps, perf and slabinfo plugins
-            "CAP_SYS_RESOURCE" # is required for ebpf plugin
+              "CAP_SETUID" # is required for cgroups and cgroups-network plugins
-            "CAP_NET_RAW" # is required for fping app
+              "CAP_SYSLOG" # is required for systemd-journal plugin
-            "CAP_SYS_CHROOT" # is required for cgroups plugin
+              "CAP_SYS_ADMIN" # is required for perf plugin
-            "CAP_SETUID" # is required for cgroups and cgroups-network plugins
+              "CAP_SYS_CHROOT" # is required for cgroups plugin
-            "CAP_SYSLOG" # is required for systemd-journal plugin
+              "CAP_SYS_PTRACE" # is required for apps plugin
-          ] ++ lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
+              "CAP_SYS_RESOURCE" # is required for ebpf plugin
+            ]
+            ++ lib.optionals cfg.package.withIpmi [
+              "CAP_FOWNER"
+              "CAP_SYS_RAWIO"
+            ]
+            ++ lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
           # Sandboxing
           ProtectSystem = "full";
           ProtectHome = "read-only";
@@ -464,7 +470,7 @@ in
       // lib.optionalAttrs (cfg.package.withIpmi) {
         "freeipmi.plugin" = {
           source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org";
-          capabilities = "cap_dac_override,cap_fowner+ep";
+          capabilities = "cap_dac_override,cap_fowner,cap_sys_rawio+ep";
           owner = cfg.user;
           group = cfg.group;
           permissions = "u+rx,g+x,o-rwx";

nixos/modules/services/networking/dhcpcd.nix

@@ -6,7 +6,13 @@
 }:
 let
 
-  dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd.override { udev = null; };
+  dhcpcd =
+    if !config.boot.isContainer then
+      pkgs.dhcpcd
+    else
+      pkgs.dhcpcd.override {
+        withUdev = false;
+      };
 
   cfg = config.networking.dhcpcd;
 

nixos/modules/services/networking/pihole-ftl-setup-script.nix

@@ -26,7 +26,7 @@ in
   if [ ! -f '${cfg.stateDirectory}'/gravity.db ]; then
     $pihole -g
     # Send SIGRTMIN to FTL, which makes it reload the database, opening the newly created one
-    ${pkgs.procps}/bin/kill -s SIGRTMIN $(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name})
+    ${lib.getExe' pkgs.procps "kill"} -s SIGRTMIN $(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name})
   fi
 
   source ${pihole}/usr/share/pihole/advanced/Scripts/api.sh
@@ -61,7 +61,7 @@ in
   for i in 1 2 3; do
     (TestAPIAvailability) && break
     echo "Retrying API shortly..."
-    ${pkgs.coreutils}/bin/sleep .5s
+    ${lib.getExe' pkgs.coreutils "sleep"} .5s
   done;
 
   LoginAPI

nixos/modules/services/security/kanidm.nix

@@ -460,6 +460,17 @@ in
                 apply = unique;
                 default = [ ];
               };
+
+              overwriteMembers = mkOption {
+                description = ''
+                  Whether the member list should be overwritten each time (true) or appended
+                  (false). Append mode allows interactive group management in addition to the
+                  declared members. Also, future member removals cannot be reflected
+                  automatically in append mode.
+                '';
+                type = types.bool;
+                default = true;
+              };
             };
             config.members = concatLists (
               flip mapAttrsToList cfg.provision.persons (

nixos/modules/services/web-apps/olivetin.nix

@@ -102,30 +102,16 @@ in
       inherit (cfg) path;
 
       preStart = ''
-        tmp="$(mktemp -d)"
+        shopt -s nullglob
-        trap 'rm -rf "$tmp"' EXIT
-        cd "$tmp"
 
-        cp ${settingsFormat.generate "olivetin-config.yaml" cfg.settings} config.yaml
+        tmp="$(mktemp)"
-        chmod +w config.yaml
+        ${lib.getExe pkgs.yq-go} eval-all '. as $item ireduce ({}; . *+ $item)' \
-        for ((i=0; i < ${toString (lib.length cfg.extraConfigFiles)}; i++)); do
+          ${settingsFormat.generate "olivetin-config.yaml" cfg.settings} \
-          ${lib.getExe pkgs.yq} -yi '
+          $CREDENTIALS_DIRECTORY/config-*.yaml > "$tmp"
-            def merge($y):
+        chmod -w "$tmp"
-              . as $x |
-              if ($x | type == "object") and ($y | type == "object") then
-                $x + $y + with_entries(select(.key | in($y)) | .key as $key | .value |= merge($y[$key]))
-              elif ($x | type == "array") and ($y | type == "array") then
-                $x + $y
-              else
-                $y
-              end;
-            merge($f | fromjson)
-          ' config.yaml --rawfile f <(${lib.getExe pkgs.yq} -c . "$CREDENTIALS_DIRECTORY/config-$i.yaml")
-        done
-        chmod -w config.yaml
 
         mkdir -p /run/olivetin/config
-        mv config.yaml /run/olivetin/config/config.yaml
+        mv "$tmp" /run/olivetin/config/config.yaml
       '';
 
       serviceConfig = {

nixos/modules/virtualisation/google-compute-config.nix

@@ -70,12 +70,10 @@ in
   # Rely on GCP's firewall instead
   networking.firewall.enable = mkDefault false;
 
-  networking.hosts = {
+  # Configure default metadata hostnames
-    "169.254.169.254" = [
+  networking.extraHosts = ''
-      "metadata.google.internal"
+    169.254.169.254 metadata.google.internal metadata
-      "metadata"
+  '';
-    ];
-  };
 
   networking.timeServers = [ "metadata.google.internal" ];
 

nixos/modules/virtualisation/nixos-containers.nix

@@ -1084,10 +1084,14 @@ in
           ) config.containers;
 
         # Generate /etc/hosts entries for the containers.
-        networking.hosts = lib.mapAttrs' (name: cfg: {
+        networking.extraHosts = concatStrings (
-          name = head (splitString "/" cfg.localAddress);
+          mapAttrsToList (
-          value = lib.optionals (cfg.localAddress != null) [ "${name}.containers" ];
+            name: cfg:
-        }) config.containers;
+            optionalString (cfg.localAddress != null) ''
+              ${head (splitString "/" cfg.localAddress)} ${name}.containers
+            ''
+          ) config.containers
+        );
 
         networking.dhcpcd.denyInterfaces = [
           "ve-*"

nixos/tests/cntr.nix

@@ -92,7 +92,4 @@ in
 {
   nixos-container = mkContainersTest;
 }
-// (lib.foldl' (attrs: backend: attrs // { ${backend} = mkOCITest backend; }) { } [
+// (lib.genAttrs [ "docker" "podman" ] mkOCITest)
-  "docker"
-  "podman"
-])

nixos/tests/kanidm-provisioning.nix

@@ -73,6 +73,10 @@ in
             };
 
             groups.testgroup1 = { };
+            groups.imperative = {
+              overwriteMembers = false;
+              members = [ "testuser1" ];
+            };
 
             persons.testuser1 = {
               displayName = "Test User";
@@ -133,6 +137,11 @@ in
             };
 
             groups.testgroup1 = { };
+            groups.imperative = {
+              overwriteMembers = false;
+              # Will be retained:
+              # members = [ "testuser1" ];
+            };
 
             persons.testuser1 = {
               displayName = "Test User (changed)";
@@ -351,6 +360,10 @@ in
           out = provision.succeed("kanidm group get testgroup1")
           assert_contains(out, "name: testgroup1")
 
+          out = provision.succeed("kanidm group get imperative")
+          assert_contains(out, "name: imperative")
+          assert_contains(out, "member: testuser1")
+
           out = provision.succeed("kanidm group get supergroup1")
           assert_contains(out, "name: supergroup1")
           assert_contains(out, "member: testgroup1")
@@ -361,6 +374,7 @@ in
           assert_contains(out, "legalname: Jane Doe")
           assert_contains(out, "mail: jane.doe@example.com")
           assert_contains(out, "memberof: testgroup1")
+          assert_contains(out, "memberof: imperative")
           assert_contains(out, "memberof: service1-access")
 
           out = provision.succeed("kanidm person get testuser2")
@@ -405,6 +419,10 @@ in
           out = provision.succeed("kanidm group get testgroup1")
           assert_contains(out, "name: testgroup1")
 
+          out = provision.succeed("kanidm group get imperative")
+          assert_contains(out, "name: imperative")
+          assert_contains(out, "member: testuser1")
+
           out = provision.succeed("kanidm group get supergroup1")
           assert_contains(out, "name: supergroup1")
           assert_lacks(out, "member: testgroup1")
@@ -416,6 +434,7 @@ in
           assert_contains(out, "mail: jane.doe@example.com")
           assert_contains(out, "mail: second.doe@example.com")
           assert_lacks(out, "memberof: testgroup1")
+          assert_contains(out, "memberof: imperative")
           assert_contains(out, "memberof: service1-access")
 
           out = provision.succeed("kanidm person get testuser2")

pkgs/applications/editors/jetbrains/bin/linux.nix

@@ -119,33 +119,43 @@ lib.makeOverridable mkDerivation (
       jdk=${jdk.home}
       item=${desktopItem}
 
-      launcher="$out/$pname/bin/${loName}"
+      needsWrapping=()
-      if [ -e "$launcher" ]; then
+
-        rm "$launcher".sh # We do not wrap the old script-style launcher anymore.
+      if [ -f "$out/$pname/bin/${loName}" ]; then
-      else
+        needsWrapping+=("$out/$pname/bin/${loName}")
-        launcher+=.sh
+      fi
+      if [ -f "$out/$pname/bin/${loName}.sh" ]; then
+        needsWrapping+=("$out/$pname/bin/${loName}.sh")
       fi
 
-      wrapProgram  "$launcher" \
+      for launcher in "''${needsWrapping[@]}"
-        --prefix PATH : "${
+      do
-          lib.makeBinPath [
+        wrapProgram  "$launcher" \
-            jdk
+          --prefix PATH : "${
-            coreutils
+            lib.makeBinPath [
-            gnugrep
+              jdk
-            which
+              coreutils
-            git
+              gnugrep
-          ]
+              which
-        }" \
+              git
-        --suffix PATH : "${lib.makeBinPath [ python3 ]}" \
+            ]
-        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \
+          }" \
-        ${lib.concatStringsSep " " extraWrapperArgs} \
+          --suffix PATH : "${lib.makeBinPath [ python3 ]}" \
-        --set-default JDK_HOME "$jdk" \
+          --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \
-        --set-default ANDROID_JAVA_HOME "$jdk" \
+          ${lib.concatStringsSep " " extraWrapperArgs} \
-        --set-default JAVA_HOME "$jdk" \
+          --set-default JDK_HOME "$jdk" \
-        --set-default JETBRAINS_CLIENT_JDK "$jdk" \
+          --set-default ANDROID_JAVA_HOME "$jdk" \
-        --set-default ${hiName}_JDK "$jdk" \
+          --set-default JAVA_HOME "$jdk" \
-        --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
+          --set-default JETBRAINS_CLIENT_JDK "$jdk" \
-        --set-default ${vmoptsIDE}_VM_OPTIONS ${vmoptsFile}
+          --set-default ${hiName}_JDK "$jdk" \
+          --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
+          --set-default ${vmoptsIDE}_VM_OPTIONS ${vmoptsFile}
+      done
+
+      launcher="$out/$pname/bin/${loName}"
+      if [ ! -e "$launcher" ]; then
+        launcher+=.sh
+      fi
 
       ln -s "$launcher" $out/bin/$pname
       rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/

pkgs/applications/editors/vim/plugins/generated.nix

@@ -3807,6 +3807,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  debugmaster-nvim = buildVimPlugin {
+    pname = "debugmaster.nvim";
+    version = "2025-05-26";
+    src = fetchFromGitHub {
+      owner = "miroshQa";
+      repo = "debugmaster.nvim";
+      rev = "aeae4c324be259856a3e9e436db89875421b78ca";
+      sha256 = "1b919qrljmrczi89cn276rx5yib63yhnr3wscbypckda2d62bh5a";
+    };
+    meta.homepage = "https://github.com/miroshQa/debugmaster.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   debugprint-nvim = buildVimPlugin {
     pname = "debugprint.nvim";
     version = "2025-05-28";
@@ -4643,6 +4656,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  endec-nvim = buildVimPlugin {
+    pname = "endec.nvim";
+    version = "2025-04-07";
+    src = fetchFromGitHub {
+      owner = "ovk";
+      repo = "endec.nvim";
+      rev = "3765f250064040725fa637e9a308253e1421b1fd";
+      sha256 = "088fv7yag7phpwxrmcq82mgy1fin6zcsyb6cz853z22hsn4zb7z5";
+    };
+    meta.homepage = "https://github.com/ovk/endec.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   errormarker-vim = buildVimPlugin {
     pname = "errormarker.vim";
     version = "2015-01-26";
@@ -7290,6 +7316,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  live-share-nvim = buildVimPlugin {
+    pname = "live-share.nvim";
+    version = "2025-05-03";
+    src = fetchFromGitHub {
+      owner = "azratul";
+      repo = "live-share.nvim";
+      rev = "11edb945131752c534fc903b7af2abfd6cf7edc6";
+      sha256 = "11aiy4ki2gd67zfvf8bn3c0vghwmk8i87ylx3h1v0kvdjbq3bxww";
+    };
+    meta.homepage = "https://github.com/azratul/live-share.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   llama-vim = buildVimPlugin {
     pname = "llama.vim";
     version = "2025-05-22";
@@ -8617,6 +8656,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  multicursor-nvim = buildVimPlugin {
+    pname = "multicursor.nvim";
+    version = "2025-05-29";
+    src = fetchFromGitHub {
+      owner = "jake-stewart";
+      repo = "multicursor.nvim";
+      rev = "6fba38bccf45cfb681f4ff6098f886213f299a34";
+      sha256 = "1d3lsxg9kmn4622nacn2ycg56ca3skazjaar0smc61v1asa8jhrm";
+    };
+    meta.homepage = "https://github.com/jake-stewart/multicursor.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   multicursors-nvim = buildVimPlugin {
     pname = "multicursors.nvim";
     version = "2025-02-26";
@@ -9712,6 +9764,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  ng-nvim = buildVimPlugin {
+    pname = "ng.nvim";
+    version = "2025-04-21";
+    src = fetchFromGitHub {
+      owner = "joeveiga";
+      repo = "ng.nvim";
+      rev = "28b87c46fe813c8859d607f4a31b7b5fbdbd75d3";
+      sha256 = "0i6y9p2cvbka97qnlwpl0kmfbl7xf98sx0khnjd5nappi7kb9zi8";
+    };
+    meta.homepage = "https://github.com/joeveiga/ng.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   nginx-vim = buildVimPlugin {
     pname = "nginx.vim";
     version = "2023-11-26";
@@ -12066,6 +12131,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  patterns-nvim = buildVimPlugin {
+    pname = "patterns.nvim";
+    version = "2025-05-12";
+    src = fetchFromGitHub {
+      owner = "OXY2DEV";
+      repo = "patterns.nvim";
+      rev = "f45abad8b6e8606279c933017d68dcf1d0dc53d4";
+      sha256 = "1pxkiz759c60fds2cbc089zwk9yqxymzva81dxkm20iprc988cc7";
+    };
+    meta.homepage = "https://github.com/OXY2DEV/patterns.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   pckr-nvim = buildVimPlugin {
     pname = "pckr.nvim";
     version = "2025-05-09";
@@ -15237,6 +15315,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  unified-nvim = buildVimPlugin {
+    pname = "unified.nvim";
+    version = "2025-06-08";
+    src = fetchFromGitHub {
+      owner = "axkirillov";
+      repo = "unified.nvim";
+      rev = "0d8eebd3909b86ca30407d79b547a245185082c2";
+      sha256 = "1r3pdh3rhlkrp9ykzxwaqrfww87dpa6b72kfvxf3j24firl0m9nv";
+    };
+    meta.homepage = "https://github.com/axkirillov/unified.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   unimpaired-nvim = buildVimPlugin {
     pname = "unimpaired.nvim";
     version = "2025-03-29";

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -976,6 +976,10 @@ in
     dependencies = [ self.denops-vim ];
   };
 
+  debugmaster-nvim = super.debugmaster-nvim.overrideAttrs {
+    dependencies = [ self.nvim-dap ];
+  };
+
   defx-nvim = super.defx-nvim.overrideAttrs {
     dependencies = [ self.nvim-yarp ];
   };

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -291,6 +291,7 @@ https://github.com/Shougo/ddc-source-lsp/,HEAD,
 https://github.com/Shougo/ddc-ui-native/,HEAD,
 https://github.com/Shougo/ddc-ui-pum/,HEAD,
 https://github.com/Shougo/ddc.vim/,HEAD,
+https://github.com/miroshQa/debugmaster.nvim/,HEAD,
 https://github.com/andrewferrier/debugprint.nvim/,HEAD,
 https://github.com/Verf/deepwhite.nvim/,,
 https://github.com/kristijanhusak/defx-git/,,
@@ -355,6 +356,7 @@ https://github.com/dmix/elvish.vim/,,
 https://github.com/embark-theme/vim/,,embark-vim
 https://github.com/mattn/emmet-vim/,,
 https://github.com/vim-scripts/emodeline/,,
+https://github.com/ovk/endec.nvim/,HEAD,
 https://github.com/vim-scripts/errormarker.vim/,,
 https://github.com/hachy/eva01.vim/,,
 https://github.com/sainnhe/everforest/,,
@@ -559,6 +561,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,,
 https://github.com/ldelossa/litee-symboltree.nvim/,,
 https://github.com/ldelossa/litee.nvim/,,
 https://github.com/smjonas/live-command.nvim/,HEAD,
+https://github.com/azratul/live-share.nvim/,HEAD,
 https://github.com/ggml-org/llama.vim/,HEAD,
 https://github.com/huggingface/llm.nvim/,HEAD,
 https://github.com/folke/lsp-colors.nvim/,,
@@ -661,6 +664,7 @@ https://github.com/jackplus-xyz/monaspace.nvim/,HEAD,
 https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
 https://github.com/leafo/moonscript-vim/,HEAD,
 https://github.com/yegappan/mru/,,
+https://github.com/jake-stewart/multicursor.nvim/,HEAD,
 https://github.com/smoka7/multicursors.nvim/,HEAD,
 https://github.com/AckslD/muren.nvim/,HEAD,
 https://github.com/jbyuki/nabla.nvim/,HEAD,
@@ -745,6 +749,7 @@ https://github.com/prichrd/netrw.nvim/,HEAD,
 https://github.com/oberblastmeister/neuron.nvim/,,
 https://github.com/fiatjaf/neuron.vim/,,
 https://github.com/Olical/nfnl/,main,
+https://github.com/joeveiga/ng.nvim/,HEAD,
 https://github.com/chr4/nginx.vim/,,
 https://github.com/oxfist/night-owl.nvim/,,
 https://github.com/bluz71/vim-nightfly-colors/,,nightfly
@@ -926,6 +931,7 @@ https://github.com/NLKNguyen/papercolor-theme/,,
 https://github.com/pappasam/papercolor-theme-slim/,HEAD,
 https://github.com/dundalek/parpar.nvim/,,
 https://github.com/frankroeder/parrot.nvim/,HEAD,
+https://github.com/OXY2DEV/patterns.nvim/,HEAD,
 https://github.com/lewis6991/pckr.nvim/,HEAD,
 https://github.com/tmsvg/pear-tree/,,
 https://github.com/steelsojka/pears.nvim/,,
@@ -1169,6 +1175,7 @@ https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
 https://github.com/SirVer/ultisnips/,,
 https://github.com/mbbill/undotree/,,
 https://github.com/chrisbra/unicode.vim/,,
+https://github.com/axkirillov/unified.nvim/,HEAD,
 https://github.com/afreakk/unimpaired-which-key.nvim/,HEAD,
 https://github.com/tummetott/unimpaired.nvim/,HEAD,
 https://github.com/unisonweb/unison/,,

pkgs/applications/editors/vscode/extensions/default.nix

@@ -1181,8 +1181,8 @@ let
         mktplcRef = {
           name = "vscode-database-client2";
           publisher = "cweijan";
-          version = "8.3.4";
+          version = "8.3.5";
-          hash = "sha256-rZ/xYe5Ng532XhLCzCtVmcYTDekAaMu3vLnvTagFupE=";
+          hash = "sha256-ld8M46LGF5nJEuk0iexOVnhiuX3mcNUnqnXNZE9Bl+4=";
         };
         meta = {
           description = "Database Client For Visual Studio Code";
@@ -3538,6 +3538,8 @@ let
         };
       };
 
+      ms-vscode.remote-explorer = callPackage ./ms-vscode.remote-explorer { };
+
       ms-vscode.test-adapter-converter = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "test-adapter-converter";
@@ -3936,8 +3938,8 @@ let
         mktplcRef = {
           name = "prisma";
           publisher = "Prisma";
-          version = "6.8.2";
+          version = "6.9.0";
-          hash = "sha256-jortg6SQId1373+4p3Tbej2Q1oz2UhUf+o8xb4PmOVM=";
+          hash = "sha256-xXmGPQs/tmYLkyzRstr34X43P64BrTR+suwKTYtd/ac=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";

pkgs/applications/editors/vscode/extensions/ms-vscode.remote-explorer/default.nix

@@ -0,0 +1,20 @@
+{
+  lib,
+  vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "remote-explorer";
+    publisher = "ms-vscode";
+    version = "0.5.0";
+    sha256 = "sha256-BNsnetpddxv3Y9MjZERU5jOq1I2g6BNFF1rD7Agpmr8=";
+  };
+
+  meta = {
+    description = "Visual Studio Code extension to view remote machines for SSH and Tunnels";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.remote-explorer";
+    homepage = "https://github.com/Microsoft/vscode-remote-release";
+    license = lib.licenses.unfree;
+  };
+}

pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.17.7";
+    version = "3.17.11";
-    hash = "sha256-Sn3yyt1xMYYvUQKrY0YliCKS46g5VfvFZPgeSoc1c8E=";
+    hash = "sha256-z98AhLZwAR31u4GfEzzd41sCQ3kSu5xJTKDZQZ3ZZYQ=";
   };
 
   meta = {

pkgs/applications/editors/vscode/vscode.nix

@@ -36,22 +36,22 @@ let
 
   sha256 =
     {
-      x86_64-linux = "1h55vjyv6vy4vyzi6lypnh4jrng8dgb7i6l9rq6k94lbl3mbnb2w";
+      x86_64-linux = "0kd4nb8b17j7ii5lhq4cih62pghb4j9gylgz9yqippxivzzkq6dd";
-      x86_64-darwin = "02c79ii2gpffc552aq0slpxfdp4ajf1cp7djhn7bap22wym53x8v";
+      x86_64-darwin = "1y96sp3lkm32fnhjak2js11m9qf8155gglp9g83ynv9d8sdy14ya";
-      aarch64-linux = "1ixx31ar2hb25387520509p8lqi9a5if7c992hizvjwdvwfsvwx5";
+      aarch64-linux = "162wac7s0l4pq6r6sh32lh69j90rna430z57ksb6g9w8spqzqnv4";
-      aarch64-darwin = "1ic6z47ci0wqq7sak0x9x0ywa0m7mgls2fm6m9fvd4xh1asa25ms";
+      aarch64-darwin = "1rqq131f1hs2z14ddh7sp6flwsgb58r8nw1ydbcclcmzi3vbdgr9";
-      armv7l-linux = "1xn1nl7s88jsxwavm3m9w35518qn4886mqh6zfiwzj5dn3ib8425";
+      armv7l-linux = "06czqpzwlrx98bv2vmawjxxmzw9z6bcfxikp7nxhi8qp8nsjfvgy";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.100.2";
+  version = "1.100.3";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "848b80aeb52026648a8ff9f7c45a9b0a80641e2e";
+  rev = "258e40fedc6cb8edf399a463ce3a9d32e7e1f6f3";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      sha256 = "0d5hbhk4f551yxrq28xyg3yj5xh72d9c1kd1cc9r9fq94l93pdvm";
+      sha256 = "0bd04p4i5hkkccglw5x3vxf4vbq9hj83gdwfnaps5yskcqizhw77";
     };
     stdenv = stdenvNoCC;
   };

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -326,13 +326,13 @@
     "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
   },
   "datadog": {
-    "hash": "sha256-+C+pvw3ghriw3mR/lvpsSH0inTMPNwc6QAEtt6nXINw=",
+    "hash": "sha256-6X8gdM0xrkquO9BgxqygzfKUGKXE8Vum9+oqLzOihY4=",
     "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
     "owner": "DataDog",
     "repo": "terraform-provider-datadog",
-    "rev": "v3.63.0",
+    "rev": "v3.65.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-FmNeAwJ/lZZEIGt5QlYm9Cqu2cgkXVa1B/ej+5/G7wg="
+    "vendorHash": "sha256-fXqX8Uhqq93/ZIGOKtP5hRlGHyXF8EuIBOoAv752pmg="
   },
   "deno": {
     "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
@@ -525,11 +525,11 @@
     "vendorHash": "sha256-YZI6zhxXU2aABARP6GcTMeU98F4+imbL1vKIEMzsJHM="
   },
   "google-beta": {
-    "hash": "sha256-VpfIfzIG1h5qnvEqogCK359LLLSgdgxg0DtRGvdZtLU=",
+    "hash": "sha256-9VjgTc0vCXxPEbuycMbxWdbwnhz/4Clff3GcMZ+zKoc=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v6.37.0",
+    "rev": "v6.38.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-oz4zVv5swFokYCdcJhBE+PLrIOjwszl58Cn0e7hOKmI="
   },
@@ -1120,20 +1120,20 @@
     "vendorHash": "sha256-KezwDRmQQj0MnmsVlrX1OhNG6oMgw8fCxX5VFGdUynw="
   },
   "routeros": {
-    "hash": "sha256-vL1ijiP+WDe8nqtSudOuOTPohHe8JRU6wF4el5P/pWg=",
+    "hash": "sha256-ciQsBvpX6gWnDPt9O1SGrVVgNCvAHBPCaLfVlPxrSAY=",
     "homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros",
     "owner": "terraform-routeros",
     "repo": "terraform-provider-routeros",
-    "rev": "v1.85.1",
+    "rev": "v1.85.3",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ysmNy+xojcHPSs++HofOxBKg1AlUO7taYVIcsmW/2kM="
+    "vendorHash": "sha256-lurBPksF2+SPraQ6KRr4EmI8rR7lY9BN+LZY8pKHjYU="
   },
   "rundeck": {
-    "hash": "sha256-cf+0qXpgxIsc/JbB7+u3MpmWFwUmpsinp1uARRhuBw0=",
+    "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",
     "homepage": "https://registry.terraform.io/providers/rundeck/rundeck",
     "owner": "rundeck",
     "repo": "terraform-provider-rundeck",
-    "rev": "v0.5.1",
+    "rev": "v0.5.2",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1192,13 +1192,13 @@
     "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
   },
   "signalfx": {
-    "hash": "sha256-rzYy/tDLfbgzbKSPJWTzSFcamLh0HyF50nbtUJYokL4=",
+    "hash": "sha256-VDBnZMvXEDjyDCC0fbm+kppglY9W83re6ABBsX6Ur+M=",
     "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
     "owner": "splunk-terraform",
     "repo": "terraform-provider-signalfx",
-    "rev": "v9.13.2",
+    "rev": "v9.15.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-/Lu1J/ZT5eq07quvqcm2N1dZPaWF23C5L5CVaUX7HaE="
+    "vendorHash": "sha256-2q3IMGzGm7CVuzs+jfU2oUD+NGwck+ny8GwcMnKfU9U="
   },
   "skytap": {
     "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
@@ -1427,11 +1427,11 @@
     "vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4="
   },
   "venafi": {
-    "hash": "sha256-vMZH0BQMkoizbME1pYCn+iMqwI8aSvhe0Dcrvstzots=",
+    "hash": "sha256-9/rFRZz5KqfUnX3/Dp8CVfGOtlEVu6HuYsUT2WVAPg0=",
     "homepage": "https://registry.terraform.io/providers/Venafi/venafi",
     "owner": "Venafi",
     "repo": "terraform-provider-venafi",
-    "rev": "v0.22.0",
+    "rev": "v0.22.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-OUQgisFi8ZR/Hv70pKB5Kwdk+Rd/Ll6qx3vKaX4NNtA="
   },

pkgs/applications/radio/welle-io/default.nix

@@ -1,6 +1,6 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -8,7 +8,6 @@
   qtbase,
   qtcharts,
   qtmultimedia,
-  qtdeclarative,
   qt5compat,
   faad2,
   rtl-sdr,
@@ -17,25 +16,27 @@
   fftwSinglePrec,
   lame,
   mpg123,
+  unixtools,
   withFlac ? true,
   flac,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "welle-io";
-  version = "2.5";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "AlbrechtL";
     repo = "welle.io";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
-    hash = "sha256-sSknzZiD9/MLyO+gAYopogOQu5HRcqaRcfqwq4Rld7A=";
+    hash = "sha256-+xjwvxFrv++XF6Uhm/ZwkseuToz3LtqCfTD18GiwNyw=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
     wrapQtAppsHook
+    unixtools.xxd
   ];
 
   buildInputs = [
@@ -70,4 +71,4 @@ stdenv.mkDerivation rec {
       "i686-linux"
     ] ++ lib.platforms.darwin;
   };
-}
+})

pkgs/by-name/_1/_1oom/package.nix

@@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "1oom";
   version = "1.11.6";
 
+  outputs = [
+    "out"
+    "doc"
+  ];
+
   src = fetchFromGitHub {
     owner = "1oom-fork";
     repo = "1oom";
@@ -23,9 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA=";
   };
 
-  strictDeps = true;
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [
     autoreconfHook
     SDL2
@@ -39,10 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
     readline
   ];
 
-  outputs = [
+  strictDeps = true;
-    "out"
+  enableParallelBuilding = true;
-    "doc"
-  ];
 
   postInstall = ''
     install -d $doc/share/doc/1oom

pkgs/by-name/al/aliyun-cli/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "aliyun-cli";
-  version = "3.0.278";
+  version = "3.0.282";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${version}";
-    hash = "sha256-SFoTeFKPUlP0clAP4gkPiNNVjqetJ8syNJDhGhNs6vo=";
+    hash = "sha256-EjswkbQVwFx6Z3HeHcB5A7xtjjllRGWLuVFfKvrURDg=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/an/anyrun/package.nix

@@ -17,13 +17,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "anyrun";
-  version = "0-unstable-2025-05-19";
+  version = "0-unstable-2025-05-27";
 
   src = fetchFromGitHub {
     owner = "kirottu";
     repo = "anyrun";
-    rev = "54b462b87129cf059a348fc3a6cc170b9714e0e7";
+    rev = "25367153f225a59c5ce5746583e39a71ff052f09";
-    hash = "sha256-7VcdMOgQ/PRLr0bnJwNWZX7asrWbRJlLFw21xffm6g8=";
+    hash = "sha256-pg0w4uOZI32dLASD6UbBezeQg5PwOa0GLv7rTwn3VxY=";
   };
 
   useFetchCargoVendor = true;

pkgs/by-name/av/avalanchego/package.nix

@@ -1,37 +1,36 @@
 {
-  buildGoModule,
+  buildGo123Module,
   fetchFromGitHub,
   lib,
   nix-update-script,
-  stdenv,
 }:
 
-buildGoModule rec {
+buildGo123Module (finalAttrs: {
   pname = "avalanchego";
-  version = "1.12.1";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "ava-labs";
     repo = "avalanchego";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
-    hash = "sha256-elbY0KNsOmKSTX61nps2tjIFTJH5Nnqmwq6mWwd88aE=";
+    hash = "sha256-t6KruPHt51wJ4aJaCG/8tuwKYtaifHvQ3z9oVknNS4E=";
   };
 
   # https://github.com/golang/go/issues/57529
   proxyVendor = true;
 
-  vendorHash = "sha256-HRhgnf6vHBrJTHspH+HwR3g5o63i+dCm7kPuBKdSV8s=";
+  vendorHash = "sha256-iyx9k8mPPOwpHo9lEdNPf0sQHxbKbNTVLUZrPYY8dWM=";
 
   subPackages = [ "main" ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/ava-labs/avalanchego/version.GitCommit=${version}"
+    "-X github.com/ava-labs/avalanchego/version.GitCommit=${finalAttrs.version}"
   ];
 
   postInstall = ''
-    mv $out/bin/{main,${pname}}
+    mv $out/bin/{main,avalanchego}
   '';
 
   passthru.updateScript = nix-update-script { };
@@ -39,7 +38,7 @@ buildGoModule rec {
   meta = {
     description = "Go implementation of an Avalanche node";
     homepage = "https://github.com/ava-labs/avalanchego";
-    changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}";
+    changelog = "https://github.com/ava-labs/avalanchego/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       urandom
@@ -47,4 +46,4 @@ buildGoModule rec {
     ];
     mainProgram = "avalanchego";
   };
-}
+})

pkgs/by-name/az/az-pim-cli/package.nix

@@ -4,10 +4,8 @@
   fetchFromGitHub,
   installShellFiles,
   stdenv,
-  buildPackages,
   nix-update-script,
   testers,
-  az-pim-cli,
 }:
 buildGoModule (finalAttrs: {
   pname = "az-pim-cli";
@@ -20,29 +18,37 @@ buildGoModule (finalAttrs: {
     hash = "sha256-gf4VscHaUr3JtsJO5PAq1nyPeJxIwGPaiH/QdXKpvQ0=";
   };
 
+  patches = [
+    # removes info we don't have from version command
+    ./version-build-info.patch
+  ];
+
   vendorHash = "sha256-PHrpUlAG/PBe3NKUGBQ1U7dCcqkSlErWX2dp9ZPB3+8=";
 
   nativeBuildInputs = [
     installShellFiles
   ];
 
-  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+  env.CGO_ENABLED = 0;
-    let
+
-      emulator = stdenv.hostPlatform.emulator buildPackages;
+  ldflags = [
-    in
+    "-s"
-    ''
+    "-X github.com/netr0m/az-pim-cli/cmd.version=v${finalAttrs.version}"
-      installShellCompletion --cmd az-pim-cli \
+  ];
-        --bash <(${emulator} $out/bin/az-pim-cli completion bash) \
+
-        --fish <(${emulator} $out/bin/az-pim-cli completion fish) \
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-        --zsh <(${emulator} $out/bin/az-pim-cli completion zsh)
+    installShellCompletion --cmd az-pim-cli \
-    ''
+      --bash <($out/bin/az-pim-cli completion bash) \
-  );
+      --fish <($out/bin/az-pim-cli completion fish) \
+      --zsh <($out/bin/az-pim-cli completion zsh)
+  '';
 
   passthru = {
     updateScript = nix-update-script { };
     tests.version = testers.testVersion {
-      command = "HOME=$TMPDIR az-pim-cli --version";
+      command = "HOME=$TMPDIR az-pim-cli version";
-      package = az-pim-cli;
+      package = finalAttrs.finalPackage;
+      version = "v${finalAttrs.version}";
     };
   };
 

pkgs/by-name/az/az-pim-cli/version-build-info.patch

@@ -0,0 +1,24 @@
+diff --git a/cmd/version.go b/cmd/version.go
+index 816f044..ef107be 100644
+--- a/cmd/version.go
++++ b/cmd/version.go
+@@ -31,8 +31,7 @@ type BuildInfo struct {
+ }
+
+ func (b BuildInfo) String() string {
+-	return fmt.Sprintf("az-pim-cli version %s (built with %s from %s on %s)",
+-		b.Version, b.GoVersion, b.Commit, b.Date)
++    return fmt.Sprintf("az-pim-cli version %s", b.Version)
+ }
+
+ func printVersion(w io.Writer, info BuildInfo) {
+@@ -47,8 +46,8 @@ func createBuildInfo() BuildInfo {
+ 		Date:      date,
+ 	}
+
+-	buildInfo, available := debug.ReadBuildInfo()
+-	if !available {
++	buildInfo, _ := debug.ReadBuildInfo()
++	if true {
+ 		return info
+ 	}

pkgs/by-name/ca/cargo-shear/package.nix

@@ -6,7 +6,7 @@
   cargo-shear,
 }:
 let
-  version = "1.3.0";
+  version = "1.3.1";
 in
 rustPlatform.buildRustPackage {
   pname = "cargo-shear";
@@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
     owner = "Boshen";
     repo = "cargo-shear";
     rev = "v${version}";
-    hash = "sha256-OOjN6JI5RWo2J2awX3ts4wlVptQ1mhQEk8acNOVjFz0=";
+    hash = "sha256-y50nYTwUobNyb+uTln9K8of3L9a7G1D/CporgX3obn0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ha/soHq6lEZUQ/gfk4zQkRBGN3S6npJ2CHI2oyjDsXA=";
+  cargoHash = "sha256-dmpYnYUPKhkB72J/TO0u8y8dDaGrOwYSHghSu/SCUDc=";
 
   # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
   SHEAR_VERSION = version;

pkgs/by-name/cd/cdncheck/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.1.21";
+  version = "1.1.22";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-GTYgo5rx4PrWLytqdH3LrasgyEAr1FuPyI26tGRaV0A=";
+    hash = "sha256-EjmQBNYfRl6R01Q3khMqsoYWZM9gG5eiZyJzJrs5ZjQ=";
   };
 
   vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";

pkgs/by-name/cl/clapper-enhancers/package.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clapper-enhancers";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "Rafostar";
     repo = "clapper-enhancers";
     tag = finalAttrs.version;
-    hash = "sha256-CUfTz+YvliJXiv/nsdrpDVFSblqoSW7js8vAtJ9u5vM=";
+    hash = "sha256-uj0ZZrS2Y896EDWeBsU3Q3S2kFdEg5FQkBOcI97FFWc=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/cl/clapper/package.nix

@@ -29,6 +29,11 @@ stdenvNoCC.mkDerivation {
 
     mkdir -p $out
     lndir $src $out
+    dbusfile=share/dbus-1/services/com.github.rafostar.Clapper.service
+    rm $out/$dbusfile
+    cp $src/$dbusfile $out/$dbusfile
+    substituteInPlace $out/$dbusfile \
+      --replace-fail $src/bin/clapper $out/bin/clapper
 
     runHook postInstall
   '';

pkgs/by-name/di/diffedit3/package.nix

@@ -9,15 +9,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "diffedit3";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-zBdLz8O2WCR8SN0UXUAaEdIpmmL+LIaGt44STBw6nyU=";
+    hash = "sha256-o3Y3SQLkMxYMepGyvK6m/8aA5ZDwCAYdYUhGplkckjU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Ao2agqYChyrcrRVOjzKvPHYwmYGabQUVZAUaVBpAFJM=";
+  cargoHash = "sha256-XAtp5pCKFQRqyF9Y0udrcudgF5i3vWxk//kZ/hRsFaA=";
 
   passthru = {
     updateScript = nix-update-script { };

pkgs/by-name/ea/easytier/package.nix

@@ -10,18 +10,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "easytier";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "EasyTier";
     repo = "EasyTier";
     tag = "v${version}";
-    hash = "sha256-F///8C7lyJZj5+u80nauDdrPFrEE40s0DeNzQeblImw=";
+    hash = "sha256-urcwzM5nup3+guvSngw+I2QBjmjSc/WV7BWFpISVDBg=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-f64tOU8AKC14tqX9Q3MLa7/pmIuI4FeFGOct8ZTAe+k=";
+  cargoHash = "sha256-rqL8tnLPeXK2BLvSFrzMRvtJAqHgOqNh4fE0w8c0ThU=";
 
   nativeBuildInputs = [
     protobuf

pkgs/by-name/eu/eukleides/package.nix

@@ -1,23 +1,28 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   bison,
   flex,
   makeWrapper,
-  texinfo4,
   getopt,
   readline,
+  texinfo,
   texlive,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eukleides";
   version = "1.5.4";
 
-  src = fetchurl {
+  src = fetchFromGitLab {
-    url = "http://www.eukleides.org/files/eukleides-${finalAttrs.version}.tar.bz2";
+    # official upstream www.eukleides.org is down
-    sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";
+    domain = "salsa.debian.org";
+    owner = "georgesk";
+    repo = "eukleides";
+    rev = "upstream/${finalAttrs.version}";
+    hash = "sha256-keX7k14X/97zHh87A/7vUsfGc/S6fByd+rewW+LkJeM=";
   };
 
   patches = [
@@ -25,12 +30,14 @@ stdenv.mkDerivation (finalAttrs: {
     ./use-CC.patch
     # allow PostScript transparency in epstopdf call
     ./gs-allowpstransparency.patch
+    # fix curly brace escaping in eukleides.texi for newer texinfo compatiblity
+    ./texinfo-escape.patch
   ];
 
   nativeBuildInputs = [
     bison
     flex
-    texinfo4
+    texinfo
     makeWrapper
   ];
 
@@ -41,14 +48,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   preConfigure = ''
     substituteInPlace Makefile \
-      --replace mktexlsr true
+      --replace-fail mktexlsr true
 
     substituteInPlace doc/Makefile \
-      --replace ginstall-info install-info
+      --replace-fail ginstall-info install-info
 
     substituteInPlace Config \
-      --replace '/usr/local' "$out" \
+      --replace-fail '/usr/local' "$out" \
-      --replace '$(SHARE_DIR)/texmf' "$tex"
+      --replace-fail '$(SHARE_DIR)/texmf' "$tex"
   '';
 
   # Workaround build failure on -fno-common toolchains like upstream
@@ -57,6 +64,13 @@ stdenv.mkDerivation (finalAttrs: {
   #     eukleides_build/quadrilateral.o:(.bss+0x18): first defined here
   env.NIX_CFLAGS_COMPILE = "-fcommon";
 
+  preBuild = ''
+    mkdir build/eukleides_build
+    mkdir build/euktopst_build
+  '';
+
+  enableParallelBuilding = true;
+
   preInstall = ''
     mkdir -p $out/bin
   '';
@@ -84,6 +98,10 @@ stdenv.mkDerivation (finalAttrs: {
     pkgs = [ finalAttrs.finalPackage.tex ];
   };
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Geometry Drawing Language";
     homepage = "http://www.eukleides.org/";

pkgs/by-name/eu/eukleides/texinfo-escape.patch

@@ -0,0 +1,19 @@
+--- a/doc/eukleides.texi
++++ b/doc/eukleides.texi
+@@ -6,12 +6,12 @@
+ 
+ % ------------------------------------------------------------------------------
+ 
+-\def\LaTeX{L\kern-.34em\raise.49ex\hbox{\sevenrm A}\kern-.18em\TeX}
+-\def\mdeg{$^\circ$}
++\def\LaTeX@{L\kern-.34em\raise.49ex\hbox@{\sevenrm A@}\kern-.18em\TeX@}
++\def\mdeg@{$^\circ$@}
+ \font\degfont=cmtt8
+-\def\deg{\raise.7ex\hbox{\degfont o}}
+-\def\exm#1{\noindent{\textit Example:}\quad{\texttt #1}}
+-\def\exmp{\noindent{\textit Example:}}
++\def\deg@{\raise.7ex\hbox@{\degfont o@}@}
++\def\exm#1@{\noindent@{\textit Example:@}\quad@{\texttt #1@}@}
++\def\exmp@{\noindent@{\textit Example:@}@}
+ 
+ % ------------------------------------------------------------------------------

pkgs/by-name/ex/expr/package.nix

@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "expr";
-  version = "1.17.4";
+  version = "1.17.5";
 
   src = fetchFromGitHub {
     owner = "expr-lang";
     repo = "expr";
     rev = "v${version}";
-    hash = "sha256-Ss1rs4BiKFOSzfL6VXKZA2Z/LYJ9N+AYkgdVCeintOk=";
+    hash = "sha256-QghgSI6Ri8bXA2xnR0Eu582fLzQXVhLFI9Ul35h/l00=";
   };
 
   sourceRoot = "${src.name}/repl";
 
-  vendorHash = "sha256-mjqbO3qgX7ak8VRFHnz9UYNoOd+bbHBImDLvnaJhdqI=";
+  vendorHash = "sha256-COfYxqSRyhTJiINbR8z1mbCMrPRFjzkriBGZ5DIY4cg=";
 
   ldflags = [
     "-s"

pkgs/by-name/fa/fabric-ai/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "fabric-ai";
-  version = "1.4.195";
+  version = "1.4.196";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${version}";
-    hash = "sha256-83LlJ697CyW8Hmp6cB3RqeVk1OGuF6TUHcfKLqjgLPk=";
+    hash = "sha256-g2f8xpS+KA1USt7lArodTo7m7OXnzew2LSFKeVclQOE=";
   };
 
   vendorHash = "sha256-xfNvmhHNYpanhZKT9o8kImzw4gzigpgc8ri9O1iOqwc=";

pkgs/by-name/fa/fakeroot/package.nix

@@ -14,7 +14,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.36";
+  version = "1.37.1.2";
   pname = "fakeroot";
 
   src = fetchFromGitLab {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "fakeroot";
     rev = "upstream/${finalAttrs.version}";
     domain = "salsa.debian.org";
-    hash = "sha256-QNScrkX2Vffsj/I5EJO8qs5AHQ9b5s6nHLHQKUdRzLE=";
+    hash = "sha256-2ihdvYRnv2wpZrEikP4hCdshY8Eqarqnw3s9HPb+xKU=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isLinux [

pkgs/by-name/fa/fastp/package.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fastp";
-  version = "0.24.2";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "OpenGene";
     repo = "fastp";
     rev = "v${version}";
-    sha256 = "sha256-8AJ6wgqbCqH/f3flgdVYUb5u0C5/CQl6MJe7HmZrp60=";
+    sha256 = "sha256-DrvY2FqTlQU3mJkBp/gM+GHlBlumfYRZItpphaF1xfs=";
   };
 
   buildInputs = [

pkgs/by-name/ga/gat/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gat";
-  version = "0.24.0";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "koki-develop";
     repo = "gat";
     tag = "v${version}";
-    hash = "sha256-2AIRFG4YmEr1ZQ6JjhmRmOc5/BfTbeBd4azy1xQQr3Q=";
+    hash = "sha256-xP7xDuab8QH1PULgF8/FGwDNV/5bYqXkvxgR/Mk4GVw=";
   };
 
-  vendorHash = "sha256-9LHTyIL0+aJAUJsn3m1SUrZYM9JLo70JY0zb1oVFJFo=";
+  vendorHash = "sha256-1uIpgcl+6H7aleW28YE8IidJysEB2n+wt2Dz0kZGNzk=";
 
   env.CGO_ENABLED = 0;
 

pkgs/by-name/gi/gitleaks/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "gitleaks";
-  version = "8.27.0";
+  version = "8.27.1";
 
   src = fetchFromGitHub {
     owner = "zricethezav";
     repo = "gitleaks";
     tag = "v${version}";
-    hash = "sha256-62Tcj5NiEk4uaGpiallCjDzpkFbuTazfMiemEe+ATLg=";
+    hash = "sha256-Wsd/jyM16Ztkj4vNnui1qZE4v2ZBffdOVHJG4S+YLXU=";
   };
 
   vendorHash = "sha256-vd39TbooEdmYa6QZGEnYOmYU9p+9mV+SrLKVY+h/PEM=";

pkgs/by-name/gl/glaze/package.nix

@@ -8,22 +8,22 @@
 
 stdenv.mkDerivation (final: {
   pname = "glaze";
-  version = "5.3.0";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
-    rev = "v${final.version}";
+    tag = "v${final.version}";
-    hash = "sha256-o0+V5mSMSHMDm7XEIVn/zHWJoFuGePOSzdLAxmOMxUM=";
+    hash = "sha256-AG6fnax9UZEhGtAUc8bgGijk8q7ge6lDTb0XjqL+kks=";
   };
 
   nativeBuildInputs = [ cmake ];
   cmakeFlags = [ (lib.cmakeBool "glaze_ENABLE_AVX2" enableAvx2) ];
 
-  meta = with lib; {
+  meta = {
     description = "Extremely fast, in memory, JSON and interface library for modern C++";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
-    maintainers = with maintainers; [ moni ];
+    maintainers = with lib.maintainers; [ moni ];
-    license = licenses.mit;
+    license = lib.licenses.mit;
   };
 })

pkgs/by-name/go/go-ios/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "go-ios";
-  version = "1.0.176";
+  version = "1.0.177";
 
   src = fetchFromGitHub {
     owner = "danielpaulus";
     repo = "go-ios";
     rev = "v${version}";
-    sha256 = "sha256-YThPGxKtGEv/jTlvtWvdJFjk+1+GLuKAtH0ivNlmr6A=";
+    sha256 = "sha256-PfFDM/thq+OP3PeiX7qfBZYG//el0U3CkpJWzFbzVqs=";
   };
 
   proxyVendor = true;

pkgs/by-name/gr/gradle-dependency-tree-diff/deps.json

@@ -0,0 +1,250 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://dl.google.com": {
+  "dl/android/maven2/com/android/tools#r8/8.2.33": {
+   "jar": "sha256-gMOaKLtmtk78Iy1orlVNWf44OICHOLT+WEiEaRyx5aM=",
+   "pom": "sha256-LgVrRdWEZxSbQSHxnpZpKdnMgFFpkrDKJKa/Y24aW+U="
+  }
+ },
+ "https://plugins.gradle.org/m2": {
+  "com/google/code/gson#gson-parent/2.9.1": {
+   "pom": "sha256-fKCEXnNoVhjePka9NDTQOko3PVIPq5OmgDGK1sjLKnk="
+  },
+  "com/google/code/gson#gson/2.9.1": {
+   "jar": "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=",
+   "pom": "sha256-5ZZjI9cUJXCzekvpeeIbwtroSBB+TcQW2PRNmqPwKQM="
+  },
+  "org/gradle/toolchains#foojay-resolver/0.7.0": {
+   "jar": "sha256-k2crR0Cg/b+7W68INT24rpqbsl9rEKk8B4EmxxfbOsA=",
+   "module": "sha256-7WdGoJ8yv63bkLApECrmIybiSBKaaLdGYqSkM9VTFLg=",
+   "pom": "sha256-iCa8+5Iq8MIR5BPTmwgWWRPAgwZkE+BzDNgrLgsKie4="
+  },
+  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.7.0": {
+   "pom": "sha256-yKRD4vrvh28zijkSM8IKka1bg/acHGuiDTmns5EGJAo="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/google/auto/value#auto-value-annotations/1.10.4": {
+   "jar": "sha256-4cRea+ra75eXyw2a/VpFYhrQYc2GMgEvhVgoU6OIeCU=",
+   "pom": "sha256-c6W4UV+F+IxAiff/SkPNF5Wkgf2rk/qQULE8+hqNJfc="
+  },
+  "com/google/auto/value#auto-value-parent/1.10.4": {
+   "pom": "sha256-vsOhnk3ci2QGZyMzzFBbngy2s1WLskIxSGm7bh1ojTA="
+  },
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/errorprone#error_prone_annotations/2.23.0": {
+   "jar": "sha256-7G858Gi2/5rDI8aOKLkpn4wKgMpRLcyx1KcPQKw+wFQ=",
+   "pom": "sha256-1auxfyMbY78Ak1j6ZAKBt0SBDLlYflmUl3g0lZwH29g="
+  },
+  "com/google/errorprone#error_prone_parent/2.23.0": {
+   "pom": "sha256-9UcKSzEE/jCfvpSoDRbDxU0g90j0xd5PaKQoaI8wy9Q="
+  },
+  "com/google/guava#failureaccess/1.0.2": {
+   "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=",
+   "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I="
+  },
+  "com/google/guava#guava-parent/26.0-android": {
+   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+  },
+  "com/google/guava#guava-parent/33.0.0-android": {
+   "pom": "sha256-WvSDt4xJ3njEn67dKlh1J4SkTINj9eJeUuKXgUwJF3o="
+  },
+  "com/google/guava#guava/33.0.0-android": {
+   "module": "sha256-FVcraAtd/L75ZtASDmUEEpqMf79gCEXfNp2Tkxe4IDY=",
+   "pom": "sha256-0R72awjIAS/3aC4LC8tykykyRwpQnXJSgD/GIeLJZfY="
+  },
+  "com/google/guava#guava/33.0.0-jre": {
+   "jar": "sha256-9NhcPk1BFpQzfLhzq+oJskK2ZLsBMyC+YQUyfEWZFTc="
+  },
+  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+   "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+  },
+  "com/google/j2objc#j2objc-annotations/2.8": {
+   "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
+   "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
+  },
+  "com/google/truth#truth-parent/1.2.0": {
+   "pom": "sha256-Q8/2l2yxZ5ETlTWluYDpwTW8Fgxk7hGc/6qNHv9aquI="
+  },
+  "com/google/truth#truth/1.2.0": {
+   "jar": "sha256-tGEIQNXjffFOZqqwuEDA7j+l6Vl9o6KQIGQYcXHCM5o=",
+   "pom": "sha256-4snQPEXLKYR49KPOM37mXXsk+nVA/PSEy/OkvuQCuVo="
+  },
+  "junit#junit/4.13.2": {
+   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+  },
+  "org/checkerframework#checker-qual/3.42.0": {
+   "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=",
+   "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=",
+   "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo="
+  },
+  "org/hamcrest#hamcrest-core/1.3": {
+   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+  },
+  "org/hamcrest#hamcrest-parent/1.3": {
+   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+  },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
+   "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
+   "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k="
+  },
+  "org/jetbrains/kotlin#kotlin-android-extensions/1.9.22": {
+   "jar": "sha256-Hl6IFkKpnduPbRPmmVoIwZK8OEGHOWZj2ER8CB2H4k8=",
+   "pom": "sha256-lEt8+zPgpvtoRVkEjwKMuWMmyTKiRdXLAhQ7zSwDEVk="
+  },
+  "org/jetbrains/kotlin#kotlin-build-common/1.9.22": {
+   "jar": "sha256-U8PcxTA/WQPmJgrqc+zMaTD5o276KhHNO9On5V32OWY=",
+   "pom": "sha256-KXxfSYoHdIPvic06cQzSt/LlrjgPOjrt+5xBvGI7E0A="
+  },
+  "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.22": {
+   "jar": "sha256-3UnLfij08zgvUlDPsFyGT9XwqW0yZbspPHezCtzJP/Y=",
+   "pom": "sha256-DFZLu4fcXs32Q005buob886Xar8IgYCN0Wb6SbBGSfs="
+  },
+  "org/jetbrains/kotlin#kotlin-build-tools-impl/1.9.22": {
+   "jar": "sha256-G0jW3gQqUl9jtVdROuEmbWmTSCJbAT+UDjLGPeJolCg=",
+   "pom": "sha256-tWM/E0m+lcdHRuHimiqm51LoneGrmmUjSS85j6aVWN0="
+  },
+  "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.22": {
+   "jar": "sha256-K/6t7lmrGYjDNtvW5l2ZH3Zq4d2Gg/Km3tX6oCefDKA=",
+   "pom": "sha256-s9o0u29ClqzzoPRDRm8FBsbJnaXNliTW4LdFsiKHhOs="
+  },
+  "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.22": {
+   "jar": "sha256-c+x1u5nr/6iySiSjuFPz9mCWvEapNRrw2sk967acFes=",
+   "pom": "sha256-pO6KZ8HW8lODjAAnKAvLgFCsDc3MrZdIlhOKaaAX6wE="
+  },
+  "org/jetbrains/kotlin#kotlin-daemon-client/1.9.22": {
+   "jar": "sha256-XXPhgVsRZ+Sv4gjwCyp1wIC8WoEHhsqtuOFHh1k6k7k=",
+   "pom": "sha256-YsRKZZ2lXbb7El4pKbmNUEow4fSvgU4I5JIUJqpST4o="
+  },
+  "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.22": {
+   "jar": "sha256-kqV4ExcUR9U0Rh+hP+N9yM07f4bYPpsfe7GwvjBUH4s=",
+   "pom": "sha256-9uo9z2v7Og0GmER8SKa88I2Oqs+D/JX+nUGBpeXjwrE="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/1.9.22": {
+   "jar": "sha256-lnaDy5jZkQFFYH+/W0VilbQ/Cq+Tsbunv2mS5zHLJOw=",
+   "pom": "sha256-Y7por+B4/3D3CPnpecaTxFv+iQQfeWQbC4H2tKEm7rs="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.22": {
+   "jar": "sha256-7P9nVGBlxg4JX7k7P4i5uS7R7cN+P+u8b57TVCL6QSs=",
+   "module": "sha256-H0SJxTBPmlEqVof/zAqvCTCvydcgUdOpBfrAcANi+3s=",
+   "pom": "sha256-ZAFewaGutVCqGCjCQuIoODDFD2g2TkCDH+FYj9wEEfU="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.9.22": {
+   "jar": "sha256-9dgu5hlmotmK364Z8k1hcwIsFUBIls3yNjQANe5owPU=",
+   "pom": "sha256-huMsqCkn2ogKHPNDpA7MIJgHXm/XInOzTVDfpUTzRjs="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.9.22": {
+   "jar": "sha256-jRr4djLZUUjxIqn6CuKQPBnub6t9AeAX924NLJoCLCA=",
+   "module": "sha256-z+LCbjMPaAMsAD+lJMAx5aYPzo2Jn/8uQjFBKL60QCs=",
+   "pom": "sha256-3BSjKHVDun5QRs1OCVAtJ4hMqYfshwb1+xid54luOsw="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.9.22": {
+   "jar": "sha256-UQj61b4UmCXs46ABA8PCHPGv6VS7ZLhweJVyk511OMs=",
+   "module": "sha256-L/MBPfK6epteiwBOhIF1DI0PqVOtAHoZbYXSY2cdvq4=",
+   "pom": "sha256-gfUmlHml2X7oeSpITIMr495DgggSZxlhUAHKyI5C9qg="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.22": {
+   "module": "sha256-pPRqwMq9jVzbaJ0tN9GdWFhPcIv59k/+TpgKL/dTS7U=",
+   "pom": "sha256-A3750tSupA9JKdglE1g+STwOBRVuDaix1/Ujurhobyc="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.22/gradle82": {
+   "jar": "sha256-1OcY3V8wxrqTLZPM/FswFendPkQUOgUrh3Ao8frlQtw="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/1.9.22": {
+   "module": "sha256-Qj401h0iCxoN3BgUCGqM6rTa2ed5ArDOjLRyG789xu0=",
+   "pom": "sha256-da2/XHjOJHwiuvNijQs/8c9+19N9YB66cwTXerdb3Z8="
+  },
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.9.22": {
+   "jar": "sha256-jC9lQpwYLi5KLgnLkQ5iuW227tKFWUuPga+CO35ZROI=",
+   "pom": "sha256-EMrJcNMAo0icM/CzBBVv8DLZWVm+WqrDuIAoKtWGIv4="
+  },
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/1.9.22": {
+   "jar": "sha256-c/50PnTSEoPTg9C6voX9CMRCr8GnvYgIL42gUQ0FPUs=",
+   "pom": "sha256-dxghItppe2YqSRPX3Z/mu68ATOhH/YZ9oj6v8MTIJEs="
+  },
+  "org/jetbrains/kotlin#kotlin-native-utils/1.9.22": {
+   "jar": "sha256-eGwSfdVTXbLDmuWXzQsMrZ6RS4PiNvHbAlEjXMnGUqw=",
+   "pom": "sha256-EcUUwF7qOuno4Wq0l5bxEd9DxzSCMeNfr0xCjMT3Q+o="
+  },
+  "org/jetbrains/kotlin#kotlin-project-model/1.9.22": {
+   "jar": "sha256-zBHVwLGQnFsKCP0l7w51T/0r9Wyu9mX7eFEiI15UKhg=",
+   "pom": "sha256-659KFngb/ADM7IAw++XuIo5vKydxxQwmezIY/rAGW0A="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/1.6.10": {
+   "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
+   "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
+  },
+  "org/jetbrains/kotlin#kotlin-script-runtime/1.9.22": {
+   "jar": "sha256-uAZwV59/ktRz2NWDTwsST3dVxFmP6UskQYOwKDSDRXQ=",
+   "pom": "sha256-/ra0ns9pEG1MEoXnH5ob2noSfO9oMC4+n9yCmKTjR5U="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-common/1.9.22": {
+   "jar": "sha256-+lAMvwNJQ++BJvPT3GWvCf+Z3//kTFCZtPwu1b8vXcc=",
+   "pom": "sha256-ROURI7DCfm/ZM/wma00Nrw8GhKYq7Z/mhC6Noz8qKz8="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.22": {
+   "jar": "sha256-Ij/shIMCNEmc1MeiPqHJLroSfEGzXZux1LYdJBVa6zU=",
+   "pom": "sha256-wWCPP7yyqfdSPq0zWZwurc5MgSFhqeBmufSwBa97Qxw="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.22": {
+   "jar": "sha256-OJkYFqKH/3YkHxp35/ERZIHU6To9tjJZplfd4g5tD2U=",
+   "pom": "sha256-gmccM6lXsuKoINZqaSwvzmPjvwR/HLJeb7A5HF3c8uc="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.22": {
+   "jar": "sha256-jRJ9dvz6BRfDbB6g4ijs4D1aRoJkKgH2R5prvccxKik=",
+   "pom": "sha256-cBJS6huo/4f8M0dqYePVxtnS3aQbqpiZTdaYDuE/vG0="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": {
+   "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=",
+   "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=",
+   "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.22/all": {
+   "jar": "sha256-zsOLwzAucqiq+c3kNrWpBx7gMx4q0F6E2LuJczTX6dQ="
+  },
+  "org/jetbrains/kotlin#kotlin-tooling-core/1.9.22": {
+   "jar": "sha256-iTjrl+NjINqj5vsqYP0qBbIy/0pVcXPFAZ8EW4gy2fQ=",
+   "pom": "sha256-FPx/NcY15fzRvqU3q0+kQxLoQyUtUzNRnjaxJeoImyE="
+  },
+  "org/jetbrains/kotlin#kotlin-util-io/1.9.22": {
+   "jar": "sha256-9telhJGjeLCDrRvq1IikheEdFgsx52wYwa1SDx0o9Gs=",
+   "pom": "sha256-ZP1qINbsBAE7ttdWJ/ZYC7c2QdlIkJ1cFmTi53MQbe4="
+  },
+  "org/jetbrains/kotlin#kotlin-util-klib/1.9.22": {
+   "jar": "sha256-pnnuL1EPOrkmkYGN5etbCQLobYjJdnTn20TcTyJSxfk=",
+   "pom": "sha256-Dep9//Cit0CIrJlwQ8vCQINdK/9Zs5/MiwysbqPrNpc="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": {
+   "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=",
+   "module": "sha256-yIXdAoEHbFhDgm3jF+PLzcPYhZ2+71OuHPrNG5xg+W4=",
+   "pom": "sha256-U2IuA3eN+EQPwBIgGjW7S9/kAWTv7GErvvze7LL/wqs="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm/9.6": {
+   "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=",
+   "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  }
+ }
+}

pkgs/by-name/gr/gradle-dependency-tree-diff/package.nix

@@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  makeBinaryWrapper,
+  jre_headless,
+  zulu11,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gradle-dependency-tree-diff";
+  version = "1.2.1";
+  src = fetchFromGitHub {
+    owner = "JakeWharton";
+    repo = "dependency-tree-diff";
+    tag = finalAttrs.version;
+    hash = "sha256-7ObmZygzSp7aAnqsJuMcPk+I3z993kjHCJMug3JkONg=";
+  };
+
+  nativeBuildInputs = [
+    gradle
+    makeBinaryWrapper
+  ];
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+  __darwinAllowLocalNetworking = true;
+
+  # There is a requirement on the specific Java toolchain.
+  gradleFlags = [ "-Dorg.gradle.java.home=${zulu11}" ];
+
+  gradleBuildTask = "build";
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 build/dependency-tree-diff.jar \
+      $out/share/dependency-tree-diff/dependency-tree-diff.jar
+    makeWrapper ${lib.getExe jre_headless} $out/bin/dependency-tree-diff \
+      --add-flags "-jar $out/share/dependency-tree-diff/dependency-tree-diff.jar"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Intelligent diff tool for the output of Gradle's dependencies task";
+    mainProgram = "dependency-tree-diff";
+    homepage = "https://github.com/JakeWharton/dependency-tree-diff";
+    changelog = "https://github.com/JakeWharton/dependency-tree-diff/releases/tag/${finalAttrs.version}";
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode
+    ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.progrm_jarvis ];
+    inherit (jre_headless.meta) platforms;
+    badPlatforms = [
+      # Currently fails to build on Darwin due to `Could not connect to the Gradle daemon.` error
+      lib.systems.inspect.patterns.isDarwin
+    ];
+  };
+})

pkgs/by-name/gr/gridtracker2/package.nix

@@ -0,0 +1,149 @@
+{
+  lib,
+  stdenv,
+  copyDesktopItems,
+  buildNpmPackage,
+  electron_35,
+  fetchFromGitLab,
+  makeBinaryWrapper,
+  makeDesktopItem,
+  at-spi2-atk,
+  gtk3,
+  libappindicator-gtk3,
+  libnotify,
+  libsecret,
+  libuuid,
+  nss,
+  xdg-utils,
+  xorg,
+}:
+let
+  version = "2.250507.0";
+  electron = electron_35;
+in
+buildNpmPackage (finalAttrs: {
+  pname = "gridtracker2";
+  inherit version;
+
+  src = fetchFromGitLab {
+    owner = "gridtracker.org";
+    repo = "gridtracker2";
+    tag = "v${version}";
+    hash = "sha256-8JFEVGy3Wz94FUK8V+JF+HHKBngT3VvwDBh+O2Bin6E=";
+  };
+
+  npmDepsHash = "sha256-ioocL1/k3aDmgVwxS09PFbMmteNrGncQz2yz7HUPX90=";
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    copyDesktopItems
+  ];
+
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = true;
+
+  makeCacheWritable = true;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "GridTracker2";
+      desktopName = "GridTracker2";
+      exec = "gridtracker2 %U";
+      terminal = false;
+      type = "Application";
+      icon = "gridtracker2";
+      startupWMClass = "GridTracker2";
+      comment = "A warehouse of amateur radio information";
+      categories = [
+        "HamRadio"
+        "Network"
+      ];
+    })
+  ];
+
+  postPatch = ''
+    install -Dvm644 ${./package-lock.json} package-lock.json
+  '';
+
+  buildPhase =
+    ''
+      runHook preBuild
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # electronDist needs to be modifiable on Darwin
+      cp -r ${electron.dist} electron-dist
+      chmod -R u+w electron-dist
+
+      # Disable code signing during build on macOS.
+      # https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos
+      export CSC_IDENTITY_AUTO_DISCOVERY=false
+
+      npm exec electron-builder -- \
+        --dir \
+        -c.electronDist=electron-dist \
+        -c.electronVersion=${electron.version}
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      npm exec electron-builder -- \
+        --dir \
+        -c.electronDist=${electron.dist} \
+        -c.electronVersion=${electron.version}
+    ''
+    + ''
+      runHook postBuild
+    '';
+
+  runtimeInputs =
+    [
+      at-spi2-atk
+      gtk3
+      libnotify
+      libsecret
+      libuuid
+      nss
+      xdg-utils
+      xorg.libXScrnSaver
+      xorg.libXtst
+    ]
+    ++ lib.optionals stdenv.isLinux [
+      libappindicator-gtk3
+    ];
+
+  installPhase =
+    ''
+      runHook preInstall
+
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      install -Dvm644 -t "$out/share/gridtracker2/resources" \
+       ./dist/linux*/resources/*
+      install -Dvm644 -t "$out/share/gridtracker2/locales" \
+        ./dist/linux*/locales/*
+      install -Dvm644 ./resources/icon.png \
+        "$out/share/pixmaps/gridtracker2.png"
+
+      makeWrapper ${lib.getExe electron} $out/bin/gridtracker2 \
+        --add-flags $out/share/gridtracker2/resources/app.asar \
+        --prefix PATH : "${lib.makeBinPath finalAttrs.runtimeInputs}" \
+        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.runtimeInputs}" \
+        --add-flags "--no-sandbox --disable-gpu-sandbox" \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+        --inherit-argv0
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications $out/bin
+      cp -r dist/mac*/GridTracker2.app $out/Applications
+      ln -s $out/Applications/GridTracker2.app/Contents/MacOS/GridTracker2 $out/bin/gridtracker2
+    ''
+    + ''
+      runHook postInstall
+    '';
+
+  meta = {
+    description = "Warehouse of amateur radio information";
+    homepage = "https://gridtracker.org/";
+    license = lib.licenses.bsd3;
+    platforms = electron.meta.platforms;
+    maintainers = with lib.maintainers; [ Cryolitia ];
+    mainProgram = "gridtracker2";
+  };
+})

pkgs/by-name/hc/hcp/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "hcp";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "hcp";
     tag = "v${version}";
-    hash = "sha256-53UTxf83jc2tyWJe+BHSitwpQVc6Ecq0wsf8avGPJcM=";
+    hash = "sha256-uiPNHrhMwYLB7ANgcJwfupvya/pUUQICm48/Vac8s40=";
   };
 
   vendorHash = "sha256-Tq7Lu9rZCLpy7CiZQey5/y1hZPEvdSsy1BgEFWNVeAk=";

pkgs/by-name/ht/htmlhint/package.nix

@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "htmlhint";
-  version = "1.2.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "htmlhint";
     repo = "HTMLHint";
     rev = "v${version}";
-    hash = "sha256-kn1HwOHJq4B+R/YIFQvvvG4efA7iVUVWLV8vfzbNEpA=";
+    hash = "sha256-h40diAM96jQRXIaPqDoQCoB4guMJCMIr9MxbpB7bb8A=";
   };
 
-  npmDepsHash = "sha256-8YeaMU/maXN8Vvy5BYqge4Ky5/Ln4GJ7stVe3y+8uU4=";
+  npmDepsHash = "sha256-VCeMyreQb9DjX1Leyt0vvoejdgG11Rhs3PAFsieeSCs=";
 
   meta = {
     changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md";

pkgs/by-name/ht/httm/package.nix

@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.47.1";
+  version = "0.48.3";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = "httm";
     rev = version;
-    hash = "sha256-quIyyGz9tA0WdfpftbgPZ83YynL/9SV0jRZW+zp0voI=";
+    hash = "sha256-55rUNITdz8lM0yuQQrNhXCKxwx4m7FPVhE1usEAVj0I=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-cPcQ0RPuTW3z4hv9EZGOqp0SY/4HtJ3fGuelqEQwFtE=";
+  cargoHash = "sha256-Hbn+PlmJ9FiwHme3kXjvG7m2rkgR4nGnpTT04JHJrao=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/in/inputplumber/package.nix

@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inputplumber";
-  version = "0.58.2";
+  version = "0.58.5";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "InputPlumber";
     tag = "v${version}";
-    hash = "sha256-G4RJansuv7U69l1QIfGp/cQqFtjY8BCMBcA9fiPMhHk=";
+    hash = "sha256-Ozd/MfPoEXodPnjNkmBGGJQCKFSuKr/SrnncDWbhiY8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ftIUollVuiL0a76D7WMvW5bzNUdTMebRVbWQYu2LfIA=";
+  cargoHash = "sha256-dzPBEIGOOplG+td78Ujm66kPFGAHgI1d68IU4KTQtxE=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/it/iterm2/package.nix

@@ -15,13 +15,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "iterm2";
-  version = "3.5.11";
+  version = "3.5.14";
 
   src = fetchzip {
     url = "https://iterm2.com/downloads/stable/iTerm2-${
       lib.replaceStrings [ "." ] [ "_" ] version
     }.zip";
-    hash = "sha256-vcZL74U9RNjhpIQRUUn6WueYhE/LfLqpb/JgWunY5dI=";
+    hash = "sha256-cF7gg4kT0z/7Qu7d6AyXpnvrSQ937JbFUgpXw5F4AWE=";
   };
 
   dontFixup = true;

pkgs/by-name/jb/jbang/package.nix

@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.126.1";
+  version = "0.126.2";
   pname = "jbang";
 
   src = fetchzip {
     url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
-    sha256 = "sha256-lFb8j1hl47buUKZjFNuSaQVr5IW++eame5vPi2Vi1o8=";
+    sha256 = "sha256-sSmkY1OSaPsxoRTrvl/L3LjWexZeLn5t3s8VFGBGTyw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/by-name/ka/kanidm-provision/package.nix

@@ -2,7 +2,6 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  yq,
   versionCheckHook,
   nix-update-script,
   nixosTests,
@@ -10,25 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kanidm-provision";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "oddlama";
     repo = "kanidm-provision";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kwxGrLz59Zk8PSsfQzPUeA/xWQZrV1NWlS5/yuqfIyI=";
+    hash = "sha256-m3bF4wFPVRc2E+E/pZc3js9T4rYbTejo/FFpysytWKw=";
   };
 
-  postPatch = ''
-    tomlq -ti '.package.version = "${finalAttrs.version}"' Cargo.toml
-  '';
-
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uo/TGyfNChq/t6Dah0HhXhAwktyQk0V/wewezZuftNk=";
+  cargoHash = "sha256-dPTrIc/hTbMlFDXYMk/dTjqaNECazldfW43egDOwyLM=";
-
-  nativeBuildInputs = [
-    yq # for `tomlq`
-  ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

pkgs/by-name/ke/keymapp/linux.nix

@@ -48,15 +48,17 @@ stdenv.mkDerivation {
     gappsWrapperArgs+=(--set-default '__NV_PRIME_RENDER_OFFLOAD' 1)
   '';
 
-  desktopItem = makeDesktopItem {
+  desktopItems = [
-    name = "keymapp";
+    (makeDesktopItem {
-    icon = "keymapp";
+      name = "keymapp";
-    desktopName = "Keymapp";
+      icon = "keymapp";
-    categories = [
+      desktopName = "Keymapp";
-      "Settings"
+      categories = [
-      "HardwareSettings"
+        "Settings"
-    ];
+        "HardwareSettings"
-    type = "Application";
+      ];
-    exec = "keymapp";
+      type = "Application";
-  };
+      exec = "keymapp";
+    })
+  ];
 }

pkgs/by-name/ki/kimai/package.nix

@@ -7,13 +7,13 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "kimai";
-  version = "2.34.0";
+  version = "2.35.1";
 
   src = fetchFromGitHub {
     owner = "kimai";
     repo = "kimai";
     tag = finalAttrs.version;
-    hash = "sha256-LxbECvOukhCA93jBvs/yOeBoGXmXgPGbKZrGppAWrYM=";
+    hash = "sha256-QcrlwKpnKuTrJ7U8BzUsxKnJoFzV/U+ZUj5v8FcJXvI=";
   };
 
   php = php.buildEnv {
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-wCrj4HfqLj9gljkOGw8lNG9qsFHN9oXI1FjgRzPtwfI=";
+  vendorHash = "sha256-hENucMcLgG6w0hUF/tnXvFYssgqQLspD+36Jl4cJmig=";
 
   composerNoPlugins = false;
   composerNoScripts = false;

pkgs/by-name/ko/korrect/package.nix

@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "korrect";
-  version = "0.1.3";
+  version = "0.2.1";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-U363YI1CQg7KAUtzN2GPm4fNnD3TgJy+6hT/3JZ8e2s=";
+    hash = "sha256-/tFrHTZ6YHnN9OvoHBJWEnwX780DYrs0f5wV1dPyAcc=";
   };
-  cargoHash = "sha256-WP03Gv+Nai834xurVzdzV4uLA8fT/lbdu4zGWUgDKJo=";
+  cargoHash = "sha256-bG31pqI/eB+J0FUq/lWak6Ekf+00JiCfuKZdyUkIAAw=";
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/ku/kubectl-gadget/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kubectl-gadget";
-  version = "0.40.0";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "inspektor-gadget";
     repo = "inspektor-gadget";
     rev = "v${version}";
-    hash = "sha256-fizq0S2pvhrMwGR/l6yqzq3IXDuD01Abi3VRiNJqs48=";
+    hash = "sha256-q88+PTZqhJwkl5jmP9AwH/nRToU/jdOFd/Z+5RcyUYE=";
   };
 
-  vendorHash = "sha256-zBEb61gxjCRXjdANIHWKVNu5Do+iEmxttKvyiYp8FYQ=";
+  vendorHash = "sha256-+z9DGplQZ77knVxYUUuUHwfE9ZtnZjMKuU6nMm8sAU0=";
 
   env.CGO_ENABLED = 0;
 

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

@@ -1,32 +1,37 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   cmake,
   pkg-config,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libdiscid";
-  version = "0.6.4";
+  version = "0.6.5";
 
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz";
+    owner = "metabrainz";
-    sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI=";
+    repo = "libdiscid";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lGq2iGt7c4h8HntEPeQcd7X+IykRLm0kvjrLswRWSSs=";
   };
 
   NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework IOKit";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "C library for creating MusicBrainz DiscIDs from audio CDs";
-    homepage = "http://musicbrainz.org/doc/libdiscid";
+    homepage = "https://musicbrainz.org/doc/libdiscid";
     maintainers = with maintainers; [ ehmry ];
     license = licenses.lgpl21;
     platforms = platforms.all;
   };
-}
+})

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

@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libgit2";
-  version = "1.9.0";
+  version = "1.9.1";
   # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
 
   outputs = [
@@ -36,17 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-v32yGMo5oFEl6HUdg8czCsCLDL+sy9PPT0AEWmKxUhk=";
+    hash = "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "libgit2-darwin-case-sensitive-build.patch";
-      url = "https://github.com/libgit2/libgit2/commit/1b348a31349e847b1d8548281aa92f26b9783f2f.patch";
-      hash = "sha256-CBaUuEr3nPdUuOdyJtmPgyqR0MNnVyOFYbYXF3ncupU=";
-    })
-  ];
-
   cmakeFlags =
     [
       "-DREGEX_BACKEND=pcre2"

pkgs/by-name/ln/lnav/package.nix

@@ -1,10 +1,10 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   pcre2,
   sqlite,
-  ncurses,
   readline,
   zlib,
   bzip2,
@@ -34,6 +34,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-XS3/km2sJwRnWloLKu9X9z07+qBFRfUsaRpZVYjoclI=";
   };
 
+  patches = [
+    # fixes lnav in tmux by patching vendored dependency notcurses
+    # https://github.com/tstack/lnav/issues/1390
+    # remove on next release
+    (fetchpatch {
+      url = "https://github.com/tstack/lnav/commit/5e0bfa483714f05397265a690960d23ae22e1838.patch";
+      hash = "sha256-dArPJik9KVI0KQjGw8W11oqGrbsBCNOr93gaH3yDPpo=";
+    })
+  ];
+
   enableParallelBuilding = true;
 
   separateDebugInfo = true;
@@ -59,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs =
     [
       bzip2
-      ncurses
       pcre2
       readline
       sqlite

pkgs/by-name/lu/luau/package.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau";
-  version = "0.676";
+  version = "0.677";
 
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
     tag = finalAttrs.version;
-    hash = "sha256-Zmg1ah5um9ByBTvuDTrEBg1V2qlrg7AQcOlJvK5u/cg=";
+    hash = "sha256-cX0WoiK1CZBwPrQfYSJAGcQzM91Trn3PGsQigGX8jds=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/ma/maeparser/package.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "maeparser";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "schrodinger";
     repo = "maeparser";
     rev = "v${version}";
-    sha256 = "sha256-LTE1YGw6DiWnpUGB9x3vFVArcYd8zO49b4tqpqK30eA=";
+    sha256 = "sha256-xRyf/n8ezmMPMhlQFapVpnT2LReLe7spXB9jFC+VPRA=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/ma/mapnik/package.nix

@@ -27,15 +27,15 @@
   sparsehash,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mapnik";
-  version = "4.0.7";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "mapnik";
     repo = "mapnik";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
-    hash = "sha256-gJktRWcJiSGxxjvWFt+Kl9d7g+TOSPk2PfGP0LIVxt4=";
+    hash = "sha256-EhRMG0xPOGwcRAMQD2B4z7nVlXQf4HFFfL3oUaUfXBY=";
     fetchSubmodules = true;
   };
 
@@ -47,18 +47,14 @@ stdenv.mkDerivation rec {
     rm -r scons
     # Remove bundled 'sparsehash' directory in favor of 'sparsehash' package
     rm -r deps/mapnik/sparsehash
+    # Remove bundled 'protozero' directory in favor of 'protozero' package
+    rm -r deps/mapbox/protozero
   '';
 
   # a distinct dev output makes python-mapnik fail
   outputs = [ "out" ];
 
   patches = [
-    # The lib/cmake/harfbuzz/harfbuzz-config.cmake file in harfbuzz.dev is faulty,
-    # as it provides the wrong libdir. The workaround is to just rely on
-    # pkg-config to locate harfbuzz shared object files.
-    # Upstream HarfBuzz wants to drop CMake support anyway.
-    # See discussion: https://github.com/mapnik/mapnik/issues/4265
-    ./cmake-harfbuzz.patch
     # Account for full paths when generating libmapnik.pc
     ./export-pkg-config-full-paths.patch
     # Use 'sparsehash' package.
@@ -75,7 +71,7 @@ stdenv.mkDerivation rec {
     cairo
     freetype
     gdal
-    harfbuzz
+    (harfbuzz.override { withIcu = true; })
     icu
     libjpeg
     libpng
@@ -97,6 +93,8 @@ stdenv.mkDerivation rec {
     (lib.cmakeBool "BUILD_DEMO_CPP" false)
     ## Would require QT otherwise.
     (lib.cmakeBool "BUILD_DEMO_VIEWER" false)
+    # disable the find_package call and force pkg-config, see https://github.com/mapnik/mapnik/pull/4270
+    (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_harfbuzz" true)
     # Use 'protozero' package.
     (lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true)
     # macOS builds fail when using memory mapped file cache.
@@ -118,19 +116,19 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
-    mkdir -p $out/bin
+    install -Dm755 ../utils/mapnik-config/mapnik-config -t $out/bin
-    cp ../utils/mapnik-config/mapnik-config $out/bin/mapnik-config
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Open source toolkit for developing mapping applications";
     homepage = "https://mapnik.org";
-    maintainers = with maintainers; [
+    changelog = "https://github.com/mapnik/mapnik/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    maintainers = with lib.maintainers; [
       hrdinka
       hummeltech
     ];
-    teams = [ teams.geospatial ];
+    teams = [ lib.teams.geospatial ];
-    license = licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
-}
+})

pkgs/by-name/mc/mcphost/package.nix

@@ -6,19 +6,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "mcphost";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "mark3labs";
     repo = "mcphost";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4vKzrT/1pEupiW3IaQV6d4Y2QHKNBH8sCA4TP8qn+50=";
+    hash = "sha256-GnPabs21TS9SfpJBQ2g8AHJPoDnlxmZM/HKWcLPcwFg=";
   };
 
-  vendorHash = "sha256-yD+83cuOIBFF91Zu4Xi2g+dsP4iUOTrjBOuetowLRQw=";
+  vendorHash = "sha256-0Q9Rn4K3wiZ2tQ2mP2Uh+Hjg1gAFE+AbJR/LA39C8Xs=";
 
   meta = {
-    description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP";
+    description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP)";
     homepage = "https://github.com/mark3labs/mcphost";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ drupol ];

pkgs/by-name/me/mergiraf/package.nix

@@ -1,15 +1,15 @@
 {
-  stdenv,
   lib,
   fetchFromGitea,
   rustPlatform,
+  nix-update-script,
 
   # native check inputs
   git,
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mergiraf";
   version = "0.10.0";
 
@@ -17,33 +17,33 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "mergiraf";
     repo = "mergiraf";
-    rev = "refs/tags/v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4=";
   };
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-jShWfd3m9g6YlUFLOzlMPFtuXAAfjh+sBujCJ9F2Uj0=";
 
-  nativeCheckInputs = [
+  nativeCheckInputs = [ git ];
-    git
-  ];
 
   doInstallCheck = true;
-  nativeInstallCheckInputs = [
+  nativeInstallCheckInputs = [ versionCheckHook ];
-    versionCheckHook
-  ];
 
   versionCheckProgramArg = "--version";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats";
     homepage = "https://mergiraf.org/";
-    changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${version}";
+    downloadPage = "https://codeberg.org/mergiraf/mergiraf";
+    changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       zimbatm
       genga898
+      defelo
     ];
     mainProgram = "mergiraf";
   };
-}
+})

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

@@ -6,18 +6,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mitra";
-  version = "4.3.1";
+  version = "4.4.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "silverpill";
     repo = "mitra";
     rev = "v${version}";
-    hash = "sha256-SUcapWfsIqohFsZY1Bpce5txLe2DtpgAGBJKTUwdzVI=";
+    hash = "sha256-ZonEMbafZWfURW7WKUAVmDq7bvi7oXBpKVudbrTF6eE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-B0Ba4ZGTw+FJLcXSy+VfKrp5hqGWoW3ugfnkDXFDlok=";
+  cargoHash = "sha256-n96B51fVkJcBDwcbYHNP6ZWWdU8fu0a0Y72IVbNAAMQ=";
 
   # require running database
   doCheck = false;

pkgs/by-name/mo/moar/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "moar";
-  version = "1.31.7";
+  version = "1.31.8";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "moar";
     rev = "v${version}";
-    hash = "sha256-0/V9baRscZFMyvVsSfmxZJdd22BgqqdGcKa7rh210x8=";
+    hash = "sha256-Ql2RWE8yttUSWZf4kJxv8l2lDBetJ7JB7W7A8GYVkyg=";
   };
 
   vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE=";

pkgs/by-name/mo/mongodb-atlas-cli/package.nix

@@ -10,15 +10,15 @@
 
 buildGoModule rec {
   pname = "mongodb-atlas-cli";
-  version = "1.42.2";
+  version = "1.43.2";
 
-  vendorHash = "sha256-oWn8vEwhcrGsytou+xIKOrM1kO0gIvU3X/aIWavhh2w=";
+  vendorHash = "sha256-Pem+3HH/bdf1SulsLo/5hsFYN8p7kQve0vXptUFnvsM=";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongodb-atlas-cli";
     rev = "refs/tags/atlascli/v${version}";
-    sha256 = "sha256-RJMcVOP94eFxbvYF20/X+wkf5+/DWSEQ4+dt/LxcDro=";
+    sha256 = "sha256-Xb/6kgqee38DqbLPLkel8NhXxdjq4UYX4E/y3xUW7og=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

pkgs/by-name/mu/multipath-tools/package.nix

@@ -2,8 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
-  coreutils,
 
   perl,
   pkg-config,
@@ -22,38 +20,23 @@
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "multipath-tools";
-  version = "0.9.8";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "opensvc";
     repo = "multipath-tools";
-    tag = version;
+    tag = finalAttrs.version;
-    sha256 = "sha256-4cby19BjgnmWf7klK1sBgtZnyvo7q3L1uyVPlVoS+uk=";
+    hash = "sha256-H5DY15On3mFwUHQhmC9s2thm0TUUIZbXM/Ot2FPL41Y=";
   };
 
-  patches = [
-    # Backport build fix for musl libc 1.2.5
-    (fetchpatch {
-      url = "https://github.com/openSUSE/multipath-tools/commit/e5004de8296cd596aeeac0a61b901e98cf7a69d2.patch";
-      hash = "sha256-3Qt8zfrWi9aOdqMObZQaNAaXDmjhvSYrXK7qycC9L1Q=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace create-config.mk \
-      --replace-fail /bin/echo ${coreutils}/bin/echo
-
-    substituteInPlace multipathd/multipathd.service.in \
-      --replace-fail /sbin/multipathd "$out/bin/multipathd"
-  '';
-
   nativeBuildInputs = [
     perl
     pkg-config
     udevCheckHook
   ];
+
   buildInputs = [
     json_c
     libaio
@@ -64,6 +47,7 @@ stdenv.mkDerivation rec {
     systemd
     util-linuxMinimal # for libmount
   ];
+
   strictDeps = true;
 
   makeFlags = [
@@ -87,10 +71,10 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) iscsi-multipath-root; };
 
-  meta = with lib; {
+  meta = {
     description = "Tools for the Linux multipathing storage driver";
     homepage = "http://christophe.varoqui.free.fr/";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/ne/netavark/package.nix

@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "netavark";
-  version = "1.15.1";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "netavark";
     rev = "v${version}";
-    hash = "sha256-/X0G26XuIBVLnXVADws+CGWwDA8IwTs/XEbA0slaazs=";
+    hash = "sha256-sZzbhlrjTuMwOm0+vBMSqHbpqLGhz6jExpBSokqj/VE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-orhYOBZDfrbXJ+nNBu2nsiTUbpKuGWmfuryCzyXSjG0=";
+  cargoHash = "sha256-ZIFD76GLe44Hx7+/YgBeixsZ+KuYDHBCzMC91R+uTNw=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/ne/newsraft/package.nix

@@ -6,21 +6,20 @@
   curl,
   expat,
   gumbo,
-  ncurses,
   sqlite,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "newsraft";
-  version = "0.30";
+  version = "0.31";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "newsraft";
     repo = "newsraft";
     rev = "newsraft-${finalAttrs.version}";
-    hash = "sha256-h9gjw2EjWWNdyQT2p4wgWlz4TNitDBX5fPbNNH9/th4=";
+    hash = "sha256-XnVGt9frUKeAjxYk2cr3q3a5HpqVH0CHnNiKdTTBnqA=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -28,21 +27,20 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     expat
     gumbo
-    ncurses
     sqlite
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
+  installTargets = "install install-desktop";
 
-  postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
-    install -Dm444 doc/newsraft.desktop -t $out/share/applications
-  '';
 
   passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Feed reader for terminal";
-    homepage = "https://codeberg.org/grisha/newsraft";
+    homepage = "https://codeberg.org/newsraft/newsraft";
+    changelog = "https://codeberg.org/newsraft/newsraft/releases/tag/newsraft-${finalAttrs.version}";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [
       arthsmn

pkgs/by-name/nf/nfpm/package.nix

@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "2.42.1";
+  version = "2.43.0";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "nfpm";
     rev = "v${version}";
-    hash = "sha256-uHtrxBlSlVBmpVqE645nRNQ3mL07Uj9YrmG/jAfuyyg=";
+    hash = "sha256-HbGO4+wFp2mRBOKNxbnZ9sHUJS25ZQ4RaC1Eaw0kfrg=";
   };
 
-  vendorHash = "sha256-pxOxiYYvzIAmXo4rRLpngG4ILUhc1f1DJqwNxXlCXtM=";
+  vendorHash = "sha256-BN+ruaajQuvFa/tECI9s0no6+EFR7BYoa1+Z/YI1PbY=";
 
   ldflags = [
     "-s"

pkgs/by-name/ni/niriswitcher/package.nix

@@ -6,18 +6,19 @@
   gobject-introspection,
   gtk4-layer-shell,
   libadwaita,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonPackage rec {
   pname = "niriswitcher";
-  version = "0.5.2";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "isaksamsten";
     repo = "niriswitcher";
     tag = version;
-    hash = "sha256-jXnob/CJ3wrqYhbFRu7TnnnCrsKaDazD3t9lZoJVhdQ=";
+    hash = "sha256-njEd9s432qlBeQSXRL5gDSIEgzF0qwceND09aGTRo0U=";
   };
 
   build-system = [ python3Packages.hatchling ];
@@ -43,6 +44,8 @@ python3Packages.buildPythonPackage rec {
     )
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Application switcher for niri";
     homepage = "https://github.com/isaksamsten/niriswitcher";

pkgs/by-name/no/noto-fonts-cjk-sans/package.nix

@@ -4,6 +4,7 @@
   fetchFromGitHub,
   nixosTests,
   gitUpdater,
+  static ? false,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -14,13 +15,20 @@ stdenvNoCC.mkDerivation rec {
     owner = "notofonts";
     repo = "noto-cjk";
     rev = "Sans${version}";
-    hash = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY=";
+    hash = "sha256-i3ZKoSy2SVs46IViha+Sg8atH4n3ywgrunHPLtVT4Pk=";
-    sparseCheckout = [ "Sans/Variable/OTC" ];
+    sparseCheckout = [
+      "Sans/OTC"
+      "Sans/Variable/OTC"
+    ];
   };
 
-  installPhase = ''
+  installPhase =
-    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/Variable/OTC/*.otf.ttc
+    let
-  '';
+      font-path = if static then "Sans/OTC/*.ttc" else "Sans/Variable/OTC/*.otf.ttc";
+    in
+    ''
+      install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${font-path}
+    '';
 
   passthru.tests.noto-fonts = nixosTests.noto-fonts;
 

pkgs/by-name/no/noto-fonts-cjk-serif/package.nix

@@ -4,6 +4,7 @@
   fetchFromGitHub,
   nixosTests,
   gitUpdater,
+  static ? false, # whether to build the static version of the font
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -14,13 +15,20 @@ stdenvNoCC.mkDerivation rec {
     owner = "notofonts";
     repo = "noto-cjk";
     rev = "Serif${version}";
-    hash = "sha256-E+Ic7XhomI6cUa+q77gQvMlaLvy+vgTq4NJ58/nPZtk=";
+    hash = "sha256-Bwuu64TAnOnqUgLlBsUw/jnv9emngqFBmVn6zEqySlc=";
-    sparseCheckout = [ "Serif/Variable/OTC" ];
+    sparseCheckout = [
+      "Serif/OTC"
+      "Serif/Variable/OTC"
+    ];
   };
 
-  installPhase = ''
+  installPhase =
-    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/Variable/OTC/*.otf.ttc
+    let
-  '';
+      font-path = if static then "Serif/OTC/*.ttc" else "Serif/Variable/OTC/*.otf.ttc";
+    in
+    ''
+      install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${font-path}
+    '';
 
   passthru.tests.noto-fonts = nixosTests.noto-fonts;
 
@@ -48,6 +56,7 @@ stdenvNoCC.mkDerivation rec {
     maintainers = with maintainers; [
       mathnerd314
       emily
+      leana8959
     ];
   };
 }

pkgs/by-name/nu/nu_scripts/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "nu_scripts";
-  version = "0-unstable-2025-05-22";
+  version = "0-unstable-2025-06-05";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nu_scripts";
-    rev = "765555beddc3c81555e6b70abb2542c37a1c0ad6";
+    rev = "6fe7713322d95be89677389f812eceab6d4b89e2";
-    hash = "sha256-/LoeL4BILPSOv3jnURcuuQhuRLdE0amBGnEOTB+LLgI=";
+    hash = "sha256-Dq5KwKpnpX9YJIj7FM5fNaeMNdk/BHji2CesIE6Ndps=";
   };
 
   installPhase = ''

pkgs/by-name/nv/nvidia-container-toolkit/package.nix

@@ -27,13 +27,13 @@ let
 in
 buildGoModule rec {
   pname = "nvidia-container-toolkit";
-  version = "1.17.7";
+  version = "1.17.8";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nvidia-container-toolkit";
     rev = "v${version}";
-    hash = "sha256-AQi61oot4fdMvQ8A139AvygxN9U7EM1YkJau3zAy3+I=";
+    hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo=";
 
   };
 

pkgs/by-name/op/openapi-python-client/package.nix

@@ -11,7 +11,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "openapi-python-client";
-  version = "0.24.3";
+  version = "0.25.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
     owner = "openapi-generators";
     repo = "openapi-python-client";
     tag = "v${version}";
-    hash = "sha256-EAHwICY8bjqYt0yGSG+SMcyTqeftfGCGTE4pJE120Mo=";
+    hash = "sha256-bFGqOrBPoywx/r35zpViAWUGiF1ZL3IG1E3TA+Qa354=";
   };
 
   nativeBuildInputs =

pkgs/by-name/op/openbooks/common.nix

@@ -0,0 +1,17 @@
+{ lib, fetchFromGitHub }:
+rec {
+  version = "4.5.0";
+
+  src = fetchFromGitHub {
+    owner = "evan-buss";
+    repo = "openbooks";
+    rev = "v${version}";
+    hash = "sha256-gznaMcj8/9xW8wvz/pQaw4tY/hDW8K6duFfJD74E47E=";
+  };
+
+  meta = with lib; {
+    homepage = "https://evan-buss.github.io/openbooks/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ambroisie ];
+  };
+}

pkgs/by-name/op/openbooks/frontend.nix

@@ -0,0 +1,27 @@
+{
+  buildNpmPackage,
+  callPackage,
+}:
+let
+  common = callPackage ./common.nix { };
+in
+buildNpmPackage {
+  pname = "openbooks-frontend";
+  inherit (common) version;
+
+  src = "${common.src}/server/app";
+
+  npmDepsHash = "sha256-OtXPOFK18b6tzFIvXkThafLUw0GlioRmxjzcKYeTalU=";
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist $out
+
+    runHook postInstall
+  '';
+
+  meta = common.meta // {
+    description = "openbooks frontend";
+  };
+}

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

@@ -0,0 +1,34 @@
+{
+  lib,
+  buildGoModule,
+  callPackage,
+  fetchFromGitHub,
+}:
+let
+  common = callPackage ./common.nix { };
+
+  frontend = callPackage ./frontend.nix { };
+in
+buildGoModule (finalAttrs: {
+  pname = "openbooks";
+  inherit (common) version src;
+
+  vendorHash = "sha256-ETN5oZanDH7fOAVnfIHIoXyVof7CfEMkPSOHF2my5ys=";
+
+  postPatch = ''
+    cp -r ${finalAttrs.passthru.frontend} server/app/dist/
+  '';
+
+  subPackages = [ "cmd/openbooks" ];
+
+  passthru = {
+    inherit frontend;
+
+    updateScript = ./update.sh;
+  };
+
+  meta = common.meta // {
+    description = "Search and Download eBooks";
+    mainProgram = "openbooks";
+  };
+})

pkgs/by-name/op/openbooks/update.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix wget prefetch-npm-deps nix-prefetch-github nurl jq
+
+# shellcheck shell=bash
+
+if [ -n "${GITHUB_TOKEN:-}" ]; then
+    TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN")
+fi
+
+if [ "$#" -gt 1 ] || [[ $1 == -* ]]; then
+    echo "Regenerates packaging data for the openbooks package."
+    echo "Usage: $0 [git release tag]"
+    exit 1
+fi
+
+version="$1"
+rev="v$version"
+
+set -euo pipefail
+
+NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"
+
+if [ -z "$version" ]; then
+    rev="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/evan-buss/openbooks/releases?per_page=1" | jq -r '.[0].tag_name')"
+    version="${rev#v}"
+fi
+
+package_src="https://raw.githubusercontent.com/evan-buss/openbooks/$rev"
+
+src_hash=$(nix-prefetch-github evan-buss openbooks --rev "$rev" | jq -r .hash)
+
+tmpdir=$(mktemp -d)
+trap 'rm -rf "$tmpdir"' EXIT
+
+pushd "$tmpdir"
+wget "${TOKEN_ARGS[@]}" "$package_src/server/app/package-lock.json"
+npm_hash=$(prefetch-npm-deps package-lock.json)
+popd
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix
+sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" common.nix
+sed -i -E -e "s#npmDepsHash = \".*\"#npmDepsHash = \"$npm_hash\"#" frontend.nix
+
+vendor_hash=$(nurl -e "(import $NIXPKGS_ROOT/. { }).openbooks.goModules")
+sed -i -E -e "s#vendorHash = \".*\"#vendorHash = \"$vendor_hash\"#" package.nix

pkgs/by-name/pa/packer/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "packer";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "packer";
     rev = "v${version}";
-    hash = "sha256-MWVNDRtvH33fby17rj8Fdc/14NGuxWIRNG6B+onUK+M=";
+    hash = "sha256-8DKMRiqv0XasLvFHGscpet51ZLVJjWjAYP8bLgVRIyQ=";
   };
 
   vendorHash = "sha256-aXeYGyMn+lnsfcQMJXRt1uZsdi9np26sMna6Ch1swbg=";

pkgs/by-name/pa/packet/package.nix

@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cargo,
+  meson,
+  ninja,
+  pkg-config,
+  protobuf,
+  rustPlatform,
+  rustc,
+  wrapGAppsHook4,
+  cairo,
+  dbus,
+  gdk-pixbuf,
+  glib,
+  gtk4,
+  libadwaita,
+  pango,
+  blueprint-compiler,
+  desktop-file-utils,
+  appstream,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "packet";
+  version = "0.3.4";
+
+  src = fetchFromGitHub {
+    owner = "nozwock";
+    repo = "packet";
+    tag = finalAttrs.version;
+    hash = "sha256-s3R/RDfQAQR6Jdehco5TD+2GpG4y9sEl0moWMxv3PZE=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-0Cbw5bSOK1bTq8ozZlRpZOelfak6N2vZOQPU4vsnepk=";
+  };
+
+  nativeBuildInputs = [
+    cargo
+    meson
+    ninja
+    pkg-config
+    protobuf
+    rustPlatform.cargoSetupHook
+    rustc
+    wrapGAppsHook4
+    blueprint-compiler
+    desktop-file-utils
+    glib
+    gtk4
+    appstream
+  ];
+
+  buildInputs = [
+    cairo
+    dbus
+    gdk-pixbuf
+    libadwaita
+    pango
+  ];
+
+  meta = {
+    description = "Quick Share client for Linux";
+    homepage = "https://github.com/nozwock/packet";
+    changelog = "https://github.com/nozwock/packet/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ontake ];
+    mainProgram = "packet";
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/by-name/pd/pdm/package.nix

@@ -24,7 +24,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "pdm";
-  version = "2.24.1";
+  version = "2.24.2";
   pyproject = true;
 
   disabled = python.pkgs.pythonOlder "3.8";
@@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "pdm-project";
     repo = "pdm";
     tag = version;
-    hash = "sha256-YChgPJmHWJ4tftosa24SKB0J7uV/zR6VWX18poEEsLY=";
+    hash = "sha256-z2p7guCQrKpDSYRHaGcHuwoTDsprrvJo9SH3sGBILSQ=";
   };
 
   pythonRelaxDeps = [ "hishel" ];

pkgs/by-name/pi/pihole-ftl/package.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pihole-ftl";
-  version = "6.1";
+  version = "6.2.2";
 
   src = fetchFromGitHub {
     owner = "pi-hole";
     repo = "FTL";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-b3/kyDQa6qDK2avvDObWLvwUpAn6TFr1ZBdQC9AZWa4=";
+    hash = "sha256-VFoltLlzKJCeJWQ2SzbvQxcYNBhZtWqFjzO3rjuBAdE=";
   };
 
   nativeBuildInputs = [
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "execv" "execvp"
 
     substituteInPlace src/database/network-table.c \
-      --replace-fail "ip neigh show" "${iproute2}/bin/ip neigh show" \
+      --replace-fail "ip neigh show" "${lib.getExe' iproute2 "ip"} neigh show" \
-      --replace-fail "ip address show" "${iproute2}/bin/ip address show"
+      --replace-fail "ip address show" "${lib.getExe' iproute2 "ip"} address show"
   '';
 
   installPhase = ''
@@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Pi-hole FTL engine";
     homepage = "https://github.com/pi-hole/FTL";
+    changelog = "https://github.com/pi-hole/FTL/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.eupl12;
     maintainers = with lib.maintainers; [ averyvigolo ];
     platforms = lib.platforms.linux;

pkgs/by-name/po/podman-tui/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "podman-tui";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t9VhDl4pBW5H5RhpskU8Us9NxpPJmyishKROvbAc2V0=";
+    hash = "sha256-U+oQUdqOhF6p52bEvMBqoxn4Z5WexsYe97XFOEMSFpk=";
   };
 
   vendorHash = null;

pkgs/by-name/qm/qmplay2/package.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   alsa-lib,
   callPackage,
   cmake,
@@ -19,7 +20,6 @@
   pkg-config,
   qt5,
   qt6,
-  stdenv,
   taglib,
   vulkan-headers,
   vulkan-tools,
@@ -43,6 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
     cp -va ${sources.qmvk.src}/* qmvk/
     chmod --recursive 744 qmvk
     popd
+    substituteInPlace src/qmplay2/vulkan/VulkanWindow.cpp \
+      --replace-fail "getSubmitInfo()" "getSubmitInfo(0)"
   '';
 
   nativeBuildInputs =

pkgs/by-name/qm/qmplay2/sources.nix

@@ -5,13 +5,14 @@
     let
       self = {
         pname = "qmplay2";
-        version = "24.06.16";
+        version = "25.01.19";
 
         src = fetchFromGitHub {
           owner = "zaps166";
           repo = "QMPlay2";
-          rev = self.version;
+          tag = self.version;
-          hash = "sha256-HoFyC/OFmthUYfyo6//+KmBIq06MPb5GmDekJbnsz5o=";
+          hash = "sha256-Of/zEQ6o2J/wXfAoY10IPtCaMaSk8ux8L6MrimeMWVA=";
+          fetchSubmodules = true;
         };
       };
     in
@@ -19,13 +20,13 @@
 
   qmvk = {
     pname = "qmvk";
-    version = "0-unstable-2024-04-19";
+    version = "0-unstable-2025-06-05";
 
     src = fetchFromGitHub {
       owner = "zaps166";
       repo = "QmVk";
-      rev = "5c5c2942255820b6343afdfeea0405cd3b36870e";
+      rev = "754e6ca4b65433cb500a797e86d48d899d5a41c2";
-      hash = "sha256-viFM9N5PiSCgkGlxtrLFCVDIML/QyPiaPRX77RW2NNw=";
+      hash = "sha256-t4fGIfZhZE8ShQGa1zMJLpnvCEfCdCeAWOKwF4+nFSw=";
     };
   };
 }

pkgs/by-name/ra/rainfrog/package.nix

@@ -7,7 +7,7 @@
   rainfrog,
 }:
 let
-  version = "0.3.1";
+  version = "0.3.2";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -17,11 +17,11 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-sUZnHlTxOz0j2KsWi/qaI5MYT0mkANn6deH54TS/JYw=";
+    hash = "sha256-3oRuJytFGPfWLoxtrpgEwRWAPE8HGct5PqU1mxDinZs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-wgJWPlURS2DxcRMzDEAXa50nQswcjbe0zj2QgF0HZys=";
+  cargoHash = "sha256-W/3UNZw3gHVI/3uIzyaDmKGjM8gsfcr86+Vxlfm9Yb4=";
 
   passthru = {
     tests.version = testers.testVersion {

pkgs/by-name/re/reindeer/package.nix

@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2025.05.26.00";
+  version = "2025.06.02.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-I5I5m9UutBMgX7PygPjMgglqvRfZxuWiyJ4l+77WYAQ=";
+    hash = "sha256-bKsMR3ubAfeZNVA3Q7RpDmaD9UlZUkVWTi5zevytOj0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-i0HAT8L9rf0r/jOqDFe60PakXwHz9lr4gwXm0ZwN4No=";
+  cargoHash = "sha256-PNCcTztLMt0d8L+tcvOgl4y85Zs4CJR6fDehUImNu6Y=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/ri/ripsecrets/package.nix

@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ripsecrets";
-  version = "0.1.9";
+  version = "0.1.11";
 
   src = fetchFromGitHub {
     owner = "sirwart";
     repo = "ripsecrets";
     rev = "v${version}";
-    hash = "sha256-lmahS/0W5075vdPfj4QnX7ZvrxHi986/92PRrplFblg=";
+    hash = "sha256-JCImUgicoXII64rK/Hch/0gJQE81Fw3h512w/vHUwAI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-AO0EL2JNwrqwUa7QLNB8/fjLP3HzBqidHR21YSmrMqg=";
+  cargoHash = "sha256-2HsUNN3lyGb/eOUEN/vTOQbAy59DQSzIaOqdk9+KhfU=";
 
   meta = with lib; {
     description = "Command-line tool to prevent committing secret keys into your source code";

pkgs/by-name/ro/rofi-calc/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rofi-calc";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "rofi-calc";
     rev = "v${version}";
-    sha256 = "sha256-YDij0j/AOl69FlsGfolzv8lI+iQfDmJrXo2duTIoMRA=";
+    sha256 = "sha256-1Sdi7SN5ZhBJB5qyqDZQC5QcBz0Fydb1az8yDSuTlnE=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/rq/rqlite/package.nix

@@ -4,18 +4,18 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "rqlite";
-  version = "8.37.1";
+  version = "8.37.4";
 
   src = fetchFromGitHub {
     owner = "rqlite";
     repo = "rqlite";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
-    sha256 = "sha256-GouVEUqxqNUtc9jyqhfLiX2M+I4ykQRsmbEvWmOaINc=";
+    hash = "sha256-PMoQg3QjG0hyWKWIf5JIj7X9XbjpHpy1Hwo9DMsutW0=";
   };
 
-  vendorHash = "sha256-jvZ2ZRA/DkjDNnYauS9sJLE8KROS197kSeNVZ363Htk=";
+  vendorHash = "sha256-3ZoMpmWOf3wIK0R1mY2GRzPA+Xb6YIdk+hLfzsC84/U=";
 
   subPackages = [
     "cmd/rqlite"
@@ -28,16 +28,17 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/rqlite/rqlite/cmd.Version=${src.rev}"
+    "-X github.com/rqlite/rqlite/cmd.Version=${finalAttrs.version}"
   ];
 
   # Tests are in a different subPackage which fails trying to access the network
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight, distributed relational database built on SQLite";
     homepage = "https://github.com/rqlite/rqlite";
-    license = licenses.mit;
+    changelog = "https://github.com/rqlite/rqlite/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    maintainers = with maintainers; [ dit7ya ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dit7ya ];
   };
-}
+})