diff --git a/lib/customisation.nix b/lib/customisation.nix
index dfdb64cbf3e2..ce00e364ba76 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -631,9 +631,12 @@ rec {
   makeScope =
     newScope: f:
     let
-      self = f self // {
-        newScope = scope: newScope (self // scope);
+      self = {
         callPackage = self.newScope { };
+      }
+      // f self
+      // {
+        newScope = scope: newScope (self // scope);
         overrideScope = g: makeScope newScope (extends g f);
         packages = f;
       };
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index d4bdc344deb9..1a69d7dfb484 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -4789,6 +4789,58 @@ runTests {
       };
     };
 
+  # Check that makeScope provides a default callPackage
+  testMakeScopeDefaultCallPackage =
+    let
+      scope = lib.makeScope lib.callPackageWith (self: {
+        foo = self.callPackage ({ }: "foo-value") { };
+      });
+    in
+    {
+      expr = scope.foo;
+      expected = "foo-value";
+    };
+
+  # Check that callPackage can be overridden by the scope function
+  testMakeScopeOverrideCallPackage =
+    let
+      customCallPackage =
+        _self: fn: args:
+        (fn args) + "-custom";
+      scope = lib.makeScope lib.callPackageWith (self: {
+        callPackage = customCallPackage self;
+        foo = self.callPackage ({ }: "foo-value") { };
+      });
+    in
+    {
+      expr = scope.foo;
+      expected = "foo-value-custom";
+    };
+
+  # Check that overriding callPackage persists through overrideScope
+  testMakeScopeOverrideCallPackagePersistsThroughOverrideScope =
+    let
+      customCallPackage =
+        _self: fn: args:
+        (fn args) + "-custom";
+      scope = lib.makeScope lib.callPackageWith (self: {
+        callPackage = customCallPackage self;
+        foo = self.callPackage ({ }: "foo-value") { };
+      });
+      overridden = scope.overrideScope (
+        _final: _prev: {
+          bar = scope.callPackage ({ }: "bar-value") { };
+        }
+      );
+    in
+    {
+      expr = { inherit (overridden) foo bar; };
+      expected = {
+        foo = "foo-value-custom";
+        bar = "bar-value-custom";
+      };
+    };
+
   testFilesystemResolveDefaultNixFile1 = {
     expr = lib.filesystem.resolveDefaultNix ./foo.nix;
     expected = ./foo.nix;
diff --git a/nixos/modules/misc/documentation/modular-services.nix b/nixos/modules/misc/documentation/modular-services.nix
index 5e004d6a8332..adff2ba5a650 100644
--- a/nixos/modules/misc/documentation/modular-services.nix
+++ b/nixos/modules/misc/documentation/modular-services.nix
@@ -18,7 +18,6 @@ let
     };
 
   modularServicesModule = {
-    _file = "${__curPos.file}:${toString __curPos.line}";
     options = {
       "<imports = [ pkgs.ghostunnel.services.default ]>" = fakeSubmodule pkgs.ghostunnel.services.default;
       "<imports = [ pkgs.php.services.default ]>" = fakeSubmodule pkgs.php.services.default;
diff --git a/nixos/modules/profiles/nix-builder-vm.nix b/nixos/modules/profiles/nix-builder-vm.nix
index 3bb9953cf28c..e34360f7f339 100644
--- a/nixos/modules/profiles/nix-builder-vm.nix
+++ b/nixos/modules/profiles/nix-builder-vm.nix
@@ -218,27 +218,34 @@ in
           KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm}
         '';
 
-        script = hostPkgs.writeShellScriptBin "create-builder" ''
+      in
+      hostPkgs.writeTextFile {
+        name = "create-builder";
+        executable = true;
+        destination = "/bin/create-builder";
+        text = ''
+          #!${hostPkgs.runtimeShell}
           set -euo pipefail
           export KEYS="''${KEYS:-./keys}"
           ${lib.getExe add-keys}
           ${lib.getExe run-builder}
         '';
-
-      in
-      script.overrideAttrs (old: {
-        pos = __curPos; # sets meta.position to point here; see script binding above for package definition
-        meta = (old.meta or { }) // {
+        checkPhase = ''
+          ${hostPkgs.stdenv.shellDryRun} "$target"
+        '';
+        meta = {
+          mainProgram = "create-builder";
+          description = "Create a Linux builder VM for macOS";
           platforms = lib.platforms.darwin;
         };
-        passthru = (old.passthru or { }) // {
+        passthru = {
           # Let users in the repl inspect the config
           nixosConfig = config;
           nixosOptions = options;
 
           inherit add-keys run-builder;
         };
-      });
+      };
 
     system = {
       # To prevent gratuitous rebuilds on each change to Nixpkgs
diff --git a/nixos/modules/system/service/portable/test.nix b/nixos/modules/system/service/portable/test.nix
index f1d508805870..acc07742dfcb 100644
--- a/nixos/modules/system/service/portable/test.nix
+++ b/nixos/modules/system/service/portable/test.nix
@@ -22,7 +22,6 @@ let
     };
 
   exampleConfig = {
-    _file = "${__curPos.file}:${toString __curPos.line}";
     services = {
       service1 = {
         process = {
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index ad0121a48498..c04cc3c7ba47 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -564,7 +564,6 @@ in
                           extraConfig =
                             { options, ... }:
                             {
-                              _file = "module at ${__curPos.file}:${toString __curPos.line}";
                               config = {
                                 nixpkgs =
                                   if options.nixpkgs ? hostPlatform then
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0e9ae55b4f16..32c49bf3a0e9 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -112,7 +112,7 @@ let
         ((import ../lib/testing-python.nix { inherit system pkgs; }).evalTest {
           imports = [
             arg
-            readOnlyPkgs
+            ./read-only-pkgs.nix
           ];
         }).config.result;
       findTests =
@@ -140,24 +140,6 @@ let
     runTestOn
     ;
 
-  # Using a single instance of nixpkgs makes test evaluation faster.
-  # To make sure we don't accidentally depend on a modified pkgs, we make the
-  # related options read-only. We need to test the right configuration.
-  #
-  # If your service depends on a nixpkgs setting, first try to avoid that, but
-  # otherwise, you can remove the readOnlyPkgs import and test your service as
-  # usual.
-  readOnlyPkgs =
-    # TODO: We currently accept this for nixosTests, so that the `pkgs` argument
-    #       is consistent with `pkgs` in `pkgs.nixosTests`. Can we reinitialize
-    #       it with `allowAliases = false`?
-    # warnIf pkgs.config.allowAliases "nixosTests: pkgs includes aliases."
-    {
-      _file = "${__curPos.file} readOnlyPkgs";
-      _class = "nixosTest";
-      node.pkgs = pkgs.pkgsLinux;
-    };
-
 in
 {
 
diff --git a/nixos/tests/read-only-pkgs.nix b/nixos/tests/read-only-pkgs.nix
new file mode 100644
index 000000000000..54e0e69d5d9c
--- /dev/null
+++ b/nixos/tests/read-only-pkgs.nix
@@ -0,0 +1,17 @@
+# Using a single instance of nixpkgs makes test evaluation faster.
+# To make sure we don't accidentally depend on a modified pkgs, we make the
+# related options read-only. We need to test the right configuration.
+#
+# If your service depends on a nixpkgs setting, first try to avoid that, but
+# otherwise, you can remove the readOnlyPkgs import and test your service as
+# usual.
+
+# TODO: We currently accept this for nixosTests, so that the `pkgs` argument
+#       is consistent with `pkgs` in `pkgs.nixosTests`. Can we reinitialize
+#       it with `allowAliases = false`?
+# warnIf pkgs.config.allowAliases "nixosTests: pkgs includes aliases."
+{ hostPkgs, ... }:
+{
+  _class = "nixosTest";
+  node.pkgs = hostPkgs.pkgsLinux;
+}
diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index c395bc91b81e..ce4066fca52f 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -61,7 +61,7 @@ let
         nix
       ]
     }
-    sources_file=${__curPos.file}
+    sources_file=./pkgs/applications/emulators/wine/sources.nix
     source ${./update-lib.sh}
   '';
 
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index e8ad1bb31291..e592740d8129 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -144,9 +144,7 @@ let
 
       passthru = { inherit tests; };
 
-      # The recursiveUpdate below breaks default meta.position, so manually override it.
-      pos = __curPos;
-      meta = lib.recursiveUpdate {
+      meta = {
         homepage = "https://hadoop.apache.org/";
         description = "Framework for distributed processing of large data sets across clusters of computers";
         license = lib.licenses.asl20;
@@ -165,7 +163,7 @@ let
         '';
         maintainers = with lib.maintainers; [ illustris ];
         platforms = lib.attrNames platformAttrs;
-      } (lib.attrByPath [ stdenv.system "meta" ] { } platformAttrs);
+      };
     });
 in
 {
diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index cdd44491f34d..251bedc3c5bd 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.88.132";
+  version = "1.88.134";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-PPv1GKX5/EJIXwHfONxbxwfcWXAGo8JfFAYRPWnF6dw=";
+      hash = "sha256-F29vQC+Fh1nEZhZzK9/y0mJEEFDkbhomm6uM35/Nr9A=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-4M0FgrC47czHyPhKMEBor0go8UBzfZQoN11/0TZF15U=";
+      hash = "sha256-rw2ChYy69f4nkKDj5DQvf3WLF6m1y3uLizwtPDZttqc=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-qQa120/HekJhrRfp8uI1Eqkij3LQZ04V4YaGA1ndlmE=";
+      hash = "sha256-Q3wpSLj7yUPkaua01sMvShVFaJ4m0KTN+i7/zSS4WVw=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-93G1MK6OAO7Cpv4ggribDeg0dOeh3/Wj0YyH2k2Bhj0=";
+      hash = "sha256-IzNgmv6tPBsC9vqSTTQnIx6eJLDlKcDGn2JBE6mpuvk=";
     };
   };
 
diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix
index 01ee1a091f16..8a94d84040b9 100644
--- a/pkgs/by-name/eu/euphonica/package.nix
+++ b/pkgs/by-name/eu/euphonica/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "euphonica";
-  version = "0.98.1-beta.1";
+  version = "0.99.1-beta";
 
   src = fetchFromGitHub {
     owner = "htkhiem";
     repo = "euphonica";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QFwkHFE+6CcZWwSKIUyf1RVQwHMkVqc4P6NacNgXnH0=";
+    hash = "sha256-7CD7OqQ5/znVSEXVibjoNfi6bTwoUdbsLHlKCAB284Y=";
     fetchSubmodules = true;
   };
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-qbbmi6qRrrzhMl/JJcnaTlV0gzasM5ssZRX3+exGh0o=";
+    hash = "sha256-PaeVFxFzb0qyqMPw2KwhyT2rpJhdotC2ptd5oDNb6xk=";
   };
 
   mesonBuildType = "release";
diff --git a/pkgs/by-name/fs/fsel/package.nix b/pkgs/by-name/fs/fsel/package.nix
new file mode 100644
index 000000000000..fbda8ed2ab33
--- /dev/null
+++ b/pkgs/by-name/fs/fsel/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
+  nix-update-script,
+  pkg-config,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "fsel";
+  version = "3.1.0";
+
+  src = fetchFromGitHub {
+    owner = "Mjoyufull";
+    repo = "fsel";
+    tag = finalAttrs.version;
+    hash = "sha256-h8CA2ZR/XKQJDq5uopOD1I+ZpWehuVNiJLeuuLaKAQA=";
+  };
+
+  cargoHash = "sha256-RHDTdwbsKQtz8Pwq3pNgoUvK8y5NO94zVhsKiBVET+I=";
+
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ];
+
+  postInstall = ''
+    installManPage fsel.1
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fast TUI app launcher and fuzzy finder for GNU/Linux and *BSD";
+    homepage = "https://github.com/Mjoyufull/fsel";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ nettika ];
+    mainProgram = "fsel";
+    platforms = with lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd;
+  };
+})
diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix
index 8068e204dbba..38fc1693b4cf 100644
--- a/pkgs/by-name/ha/halo/package.nix
+++ b/pkgs/by-name/ha/halo/package.nix
@@ -8,10 +8,10 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "halo";
-  version = "2.23.0";
+  version = "2.23.1";
   src = fetchurl {
     url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar";
-    hash = "sha256-RHGNeJKQKiuO3G1NVSDyevfpbQBkWep/h/D8MXf5wQs=";
+    hash = "sha256-oU3MdmHnpf0TOwdEJb8UD2LIqEJ2BQ0puMIs1BBmA2M=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix
index da24edbffb0f..e39620b0e801 100644
--- a/pkgs/by-name/ie/ieda/package.nix
+++ b/pkgs/by-name/ie/ieda/package.nix
@@ -45,6 +45,12 @@ let
       })
     ];
 
+    postPatch = ''
+      # Patch for boost1.89, should be removed after upstream update: https://gitee.com/oscc-project/iEDA/pulls/92
+      sed -i '1i find_package(Boost REQUIRED)' src/operation/iPA/test/CMakeLists.txt
+      sed -i 's/boost_system/Boost::headers/g' src/operation/iPA/test/CMakeLists.txt
+    '';
+
     dontBuild = true;
     dontFixup = true;
     installPhase = ''
diff --git a/pkgs/by-name/sh/shrinkray/package.nix b/pkgs/by-name/sh/shrinkray/package.nix
index c7e16519b944..6793df62d72f 100644
--- a/pkgs/by-name/sh/shrinkray/package.nix
+++ b/pkgs/by-name/sh/shrinkray/package.nix
@@ -12,14 +12,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "shrinkray";
-  version = "26.2.20.0";
+  version = "26.3.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DRMacIver";
     repo = "shrinkray";
     tag = "v${version}";
-    hash = "sha256-KsIWFR5gyFt35yLz/102hET+JMhEU0ukhzwb9MzewSs=";
+    hash = "sha256-1sdUfgT/2fC6zpFR20okmaueqdjJ5nWwUl3n8nsGXTU=";
   };
   postPatch = ''
     substituteInPlace tests/test_main.py \
diff --git a/pkgs/by-name/si/simpleini/package.nix b/pkgs/by-name/si/simpleini/package.nix
index f2185767900e..402e30dbed71 100644
--- a/pkgs/by-name/si/simpleini/package.nix
+++ b/pkgs/by-name/si/simpleini/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   gtest,
   nix-update-script,
@@ -10,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simpleini";
-  version = "4.22";
+  version = "4.25";
 
   src = fetchFromGitHub {
     name = "simpleini-sources-${finalAttrs.version}";
     owner = "brofield";
     repo = "simpleini";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H4J4+v/3A8ZTOp4iMeiZ0OClu68oP4vUZ8YOFZbllcM=";
+    hash = "sha256-1JTVjMfEuWqlyYAm4Er6HPjrP2Tnt0ntai8oVvIEOu0=";
   };
 
   nativeBuildInputs = [
@@ -32,14 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [ (lib.cmakeBool "SIMPLEINI_USE_SYSTEM_GTEST" true) ];
 
-  patches = [
-    # Fixes for cmake export from master, can be removed after the next release
-    (fetchpatch {
-      url = "https://github.com/brofield/simpleini/commit/aeacf861a8ad8add5f4974792a88ffea393e41db.patch";
-      hash = "sha256-lpoQHff8JwfljMUxL6Y2MqsGDZtDPjnOIKSIJ1rqrAI=";
-    })
-  ];
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
@@ -55,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       HeitorAugustoLN
+      miniharinn
     ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index a557adb1d2a9..6513cfe4d2c1 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -36,20 +36,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.5.10";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-IJKWrveUn7kvJjSu0YYGargGFY8T8gxAAh2fr0BnbUE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0CP9ypx1w2s949oDYYvv96p8xvhPZs5y1FLWoUBN5r4=";
   };
 
   kernel = buildGoModule {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-JwtXllLj6+ALrDZMjFoX5TDwE3yMaij2a9t+T1F1hG0=";
+    vendorHash = "sha256-IAkohYOF8s8NFsy/fagVXddtym6URop6tvEIB6H8gI0=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_9;
     fetcherVersion = 3;
-    hash = "sha256-KXSR2QCcYdUCaQhDZAF/4rwlAmn7GtUHVbP8xYKcxVI=";
+    hash = "sha256-N/LKkE0I6sIiO0+wGvPZMgaWKUPcq7Gjpsw5Oj9cvqI=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";
diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix
index 3b26c3d066fa..c91a81ebbf76 100644
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "3.14.0";
+  version = "3.14.1";
 
   subPackages = [ "cmd/vale" ];
 
@@ -19,7 +19,7 @@ buildGoModule rec {
     owner = "errata-ai";
     repo = "vale";
     tag = "v${version}";
-    hash = "sha256-NvArrKa/Y16yttUW40IEKrz2REuJq51rBa/Qt8T9+n4=";
+    hash = "sha256-vzOUBqoD3zwPHDN8fWn+gEWU9+EDNO92uqI6ub2of9A=";
   };
 
   vendorHash = "sha256-jyDvC/UOqkZf8sgHl/jJ8dWPnWWmDIRJDSGgT0bWkb4=";
diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index a265c5ae7384..dafc0e61d4d1 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -30,14 +30,14 @@ let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin =
         let
-          version = "4.1.7.31-34366";
+          version = "4.1.8.29-36603";
           version' = lib.replaceString "-" "_" version;
         in
         {
           inherit version;
           src = fetchurl {
             url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-oU1qypU24wiHSdUo8H76A1hxKCDf3I3Fq/4xbNGbjDo=";
+            hash = "sha256-QwWXDyJjqN2CB1dOZTb5Uv4qU4y8klUlsUS1Ny6M/ac=";
           };
         };
     in
diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index 2f09df50a061..470012be3e07 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -33,6 +33,21 @@ let
       features = [ "hypr" ];
       descriptionSuffix = "Hyprland";
     };
+    niri = {
+      suffix = "-niri";
+      features = [ "niri" ];
+      descriptionSuffix = "Niri";
+    };
+    cosmic = {
+      suffix = "-cosmic";
+      features = [ "cosmic" ];
+      descriptionSuffix = "Cosmic";
+    };
+    socket = {
+      suffix = "";
+      features = [ "socket" ];
+      descriptionSuffix = "Socket client";
+    };
   };
 
   variant = variants.${withVariant} or null;
diff --git a/pkgs/applications/audio/zynaddsubfx/ZynLogo.svg b/pkgs/by-name/zy/zynaddsubfx/ZynLogo.svg
similarity index 100%
rename from pkgs/applications/audio/zynaddsubfx/ZynLogo.svg
rename to pkgs/by-name/zy/zynaddsubfx/ZynLogo.svg
diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/by-name/zy/zynaddsubfx/mruby-zest/default.nix
similarity index 84%
rename from pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
rename to pkgs/by-name/zy/zynaddsubfx/mruby-zest/default.nix
index ff9ce3f10486..5a86f6e88d2c 100644
--- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
+++ b/pkgs/by-name/zy/zynaddsubfx/mruby-zest/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gcc14Stdenv,
   fetchFromGitHub,
   bison,
   pkg-config,
@@ -11,7 +11,10 @@
   libx11,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+# UI becomes unresponsive when built with GCC 15
+# (building with -std=gnu17 does not fix the issue)
+# https://github.com/mruby-zest/mruby-zest-build/issues/127
+gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "mruby-zest";
   version = "3.0.6";
 
@@ -20,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "mruby-zest-build";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    sha256 = "sha256-rIb6tQimwrUj+623IU5zDyKNWsNYYBElLQClOsP+5Dc=";
+    hash = "sha256-rIb6tQimwrUj+623IU5zDyKNWsNYYBElLQClOsP+5Dc=";
   };
 
   patches = [
diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch b/pkgs/by-name/zy/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch
similarity index 100%
rename from pkgs/applications/audio/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch
rename to pkgs/by-name/zy/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/by-name/zy/zynaddsubfx/package.nix
similarity index 97%
rename from pkgs/applications/audio/zynaddsubfx/default.nix
rename to pkgs/by-name/zy/zynaddsubfx/package.nix
index 7c5506413386..03ae96580f2e 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/by-name/zy/zynaddsubfx/package.nix
@@ -11,7 +11,7 @@
   pkg-config,
 
   # Required dependencies
-  fftw,
+  fftwSinglePrec,
   liblo,
   minixml,
   zlib,
@@ -31,7 +31,7 @@
   sndio,
 
   # Optional GUI dependencies
-  guiModule ? "off",
+  guiModule ? "zest",
   cairo,
   fltk,
   libGL,
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    fftw
+    fftwSinglePrec
     liblo
     minixml
     zlib
@@ -184,9 +184,12 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix LD_LIBRARY_PATH : ${mruby-zest}
   '';
 
+  passthru = {
+    inherit mruby-zest;
+  };
+
   meta = {
     description = "High quality software synthesizer (${guiName} GUI)";
-    mainProgram = "zynaddsubfx";
     homepage =
       if guiModule == "zest" then
         "https://zynaddsubfx.sourceforge.io/zyn-fusion.html"
@@ -196,6 +199,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ kira-bruneau ];
     platforms = lib.platforms.all;
+    mainProgram = "zynaddsubfx";
 
     # On macOS:
     # - Tests don't compile (ld: unknown option: --no-as-needed)
diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix
index 4a90c0741d83..327f586fe381 100644
--- a/pkgs/development/compilers/corretto/mk-corretto.nix
+++ b/pkgs/development/compilers/corretto/mk-corretto.nix
@@ -137,9 +137,6 @@ jdk.overrideAttrs (
         };
       };
 
-    # Some of the OpenJDK derivation set their `pos` by hand. We need to
-    # overwrite this in order to point to Corretto, not OpenJDK.
-    pos = __curPos;
     meta = oldAttrs.meta // {
       homepage = "https://aws.amazon.com/corretto";
       license = lib.licenses.gpl2Only;
diff --git a/pkgs/development/compilers/gcc/ng/common/default.nix b/pkgs/development/compilers/gcc/ng/common/default.nix
index ecb075894476..0e040fdb1320 100644
--- a/pkgs/development/compilers/gcc/ng/common/default.nix
+++ b/pkgs/development/compilers/gcc/ng/common/default.nix
@@ -130,6 +130,7 @@ makeScopeWithSplicing' {
           "-B${targetGccPackages.libgcc}/lib"
           "-B${targetGccPackages.libssp}/lib"
           "-B${targetGccPackages.libatomic}/lib"
+          "-B${targetGccPackages.libgomp}/lib"
           "-B${targetGccPackages.libgfortran}/lib/"
         ];
       };
@@ -145,6 +146,8 @@ makeScopeWithSplicing' {
           "-B${targetGccPackages.libgcc}/lib"
           "-B${targetGccPackages.libssp}/lib"
           "-B${targetGccPackages.libatomic}/lib"
+          "-B${targetGccPackages.libgomp}/lib"
+          "-I${targetGccPackages.libgomp}/lib/gcc/${metadata.release_version}/include"
         ];
       };
 
@@ -159,6 +162,8 @@ makeScopeWithSplicing' {
           "-B${targetGccPackages.libgcc}/lib"
           "-B${targetGccPackages.libssp}/lib"
           "-B${targetGccPackages.libatomic}/lib"
+          "-B${targetGccPackages.libgomp}/lib"
+          "-I${targetGccPackages.libgomp}/lib/gcc/${metadata.release_version}/include"
         ];
       };
 
@@ -231,5 +236,9 @@ makeScopeWithSplicing' {
       libstdcxx = callPackage ./libstdcxx {
         stdenv = overrideCC stdenv buildGccPackages.gccWithLibatomic;
       };
+
+      libgomp = callPackage ./libgomp {
+        stdenv = overrideCC stdenv buildGccPackages.gccWithLibatomic;
+      };
     };
 }
diff --git a/pkgs/development/compilers/gcc/ng/common/libgomp/default.nix b/pkgs/development/compilers/gcc/ng/common/libgomp/default.nix
new file mode 100644
index 000000000000..9053e88a80f9
--- /dev/null
+++ b/pkgs/development/compilers/gcc/ng/common/libgomp/default.nix
@@ -0,0 +1,87 @@
+{
+  lib,
+  stdenv,
+  gcc_meta,
+  release_version,
+  version,
+  getVersionFile,
+  monorepoSrc ? null,
+  autoreconfHook269,
+  runCommand,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libgomp";
+  inherit version;
+
+  src = runCommand "libgomp-src-${version}" { src = monorepoSrc; } ''
+    runPhase unpackPhase
+
+    mkdir -p "$out/gcc"
+    cp gcc/BASE-VER "$out/gcc"
+    cp gcc/DATESTAMP "$out/gcc"
+
+    cp -r libgomp "$out"
+    cp -r include "$out"
+
+    cp -r config "$out"
+    cp -r multilib.am "$out"
+    cp -r libtool.m4 "$out"
+
+    cp config.guess "$out"
+    cp config.rpath "$out"
+    cp config.sub "$out"
+    cp config-ml.in "$out"
+    cp ltmain.sh "$out"
+    cp install-sh "$out"
+    cp mkinstalldirs "$out"
+
+    [[ -f MD5SUMS ]]; cp MD5SUMS "$out"
+  '';
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  postUnpack = ''
+    mkdir -p ./build
+    buildRoot=$(readlink -e "./build")
+  '';
+
+  preAutoreconf = ''
+    sourceRoot=$(readlink -e "./libgomp")
+    cd $sourceRoot
+  '';
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    autoreconfHook269
+  ];
+
+  configurePlatforms = [
+    "build"
+    "host"
+  ];
+
+  configureFlags = [
+    "--disable-dependency-tracking"
+    "cross_compiling=true"
+    "--disable-multilib"
+  ];
+
+  preConfigure = ''
+    cd "$buildRoot"
+    configureScript=$sourceRoot/configure
+  '';
+
+  doCheck = true;
+
+  passthru = {
+    isGNU = true;
+  };
+
+  meta = gcc_meta // {
+    homepage = "https://gcc.gnu.org/";
+  };
+})
diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix
index 0020ba6df90e..95aca62bfe8a 100644
--- a/pkgs/development/python-modules/claude-agent-sdk/default.nix
+++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "claude-agent-sdk";
-  version = "0.1.49";
+  version = "0.1.50";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "claude-agent-sdk-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UM2kZAKC89NQAkrR6Asyc/fh7U0jziRU5uU5DgQ+iY4=";
+    hash = "sha256-uRuJqcUR+23SsI4i4W0tDCFQSE4lJWGxBcCap+ij7Ns=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix
index 0d3ad9f770d7..73d1ec13ed0a 100644
--- a/pkgs/development/python-modules/importmagic/default.nix
+++ b/pkgs/development/python-modules/importmagic/default.nix
@@ -1,27 +1,24 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  six,
+  fetchFromGitHub,
+  hatchling,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "importmagic";
-  version = "0.1.7";
-  format = "setuptools";
+  version = "0.2.0";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-P3dXpbdMmikeIOEgI7s79xvC+jrfsVoIVwZIq4Pq+Ng=";
+  src = fetchFromGitHub {
+    owner = "alecthomas";
+    repo = "importmagic";
+    tag = finalAttrs.version;
+    hash = "sha256-776HbSRl5hIrSyIyIF7jnNAJF41QzdjXe0vDaKwlCnc=";
   };
 
-  patches = [
-    # https://github.com/alecthomas/importmagic/issues/67
-    ./python-312.patch
-  ];
-
-  propagatedBuildInputs = [ six ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -30,7 +27,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python Import Magic - automagically add, remove and manage imports";
     homepage = "https://github.com/alecthomas/importmagic";
-    license = lib.licenses.bsd0;
+    changelog = "https://github.com/alecthomas/importmagic/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ onny ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/importmagic/python-312.patch b/pkgs/development/python-modules/importmagic/python-312.patch
deleted file mode 100644
index 4985809056f4..000000000000
--- a/pkgs/development/python-modules/importmagic/python-312.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/importmagic/index.py
-+++ b/importmagic/index.py
-@@ -8,18 +8,14 @@
- import logging
- import re
- from contextlib import contextmanager
--from distutils import sysconfig
-+import sysconfig
- 
- from importmagic.util import parse_ast
- 
- 
- LIB_LOCATIONS = sorted(set((
--    (sysconfig.get_python_lib(standard_lib=True), 'S'),
--    (sysconfig.get_python_lib(plat_specific=True), '3'),
--    (sysconfig.get_python_lib(standard_lib=True, prefix=sys.prefix), 'S'),
--    (sysconfig.get_python_lib(plat_specific=True, prefix=sys.prefix), '3'),
--    (sysconfig.get_python_lib(standard_lib=True, prefix='/usr/local'), 'S'),
--    (sysconfig.get_python_lib(plat_specific=True, prefix='/usr/local'), '3'),
-+    (sysconfig.get_path('stdlib'), 'S'),
-+    (sysconfig.get_path('platlib'), '3'),
- )), key=lambda l: -len(l[0]))
- 
- # Regex matching modules that we never attempt to index.
diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix
index d09efcba7390..67478567e2d4 100644
--- a/pkgs/development/python-modules/nutils/default.nix
+++ b/pkgs/development/python-modules/nutils/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "nutils";
-  version = "9.1";
+  version = "9.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "evalf";
     repo = "nutils";
     tag = "v${version}";
-    hash = "sha256-NmWoRDYOfSweqUhw0KTdXubWgXmVr+odrs1dMLXdHEI=";
+    hash = "sha256-Q55nSs7SmB76vG8xJNaSu11vtSuWCXrNn0PRCkTWji4=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/propka/default.nix b/pkgs/development/python-modules/propka/default.nix
index 71c6c9db2fad..eb8d0bc0deae 100644
--- a/pkgs/development/python-modules/propka/default.nix
+++ b/pkgs/development/python-modules/propka/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   setuptools,
   pytestCheckHook,
 }:
@@ -18,6 +19,15 @@ buildPythonPackage rec {
     hash = "sha256-EJQqCe4WPOpqsSxxfbTjF0qETpSPYqpixpylweTCjko=";
   };
 
+  patches = [
+    # Upstream PR: https://github.com/jensengroup/propka/pull/202
+    (fetchpatch {
+      name = "python-3.14.patch";
+      url = "https://github.com/jensengroup/propka/commit/5eb80b7836b2e71b37598d2c7fa06ed8141ff6fd.patch";
+      hash = "sha256-tuhUfc7SGjdGxAPcsbrwOyqgTesg7k+FruJjY05YOUs=";
+    })
+  ];
+
   nativeBuildInputs = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index 18f400ac2847..a6313eff5f65 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -25,6 +25,17 @@ buildPythonPackage rec {
     hash = "sha256-REWX6u3Rc72+e5lIImBwV5uFoBBUTMM5BOfYdKIFL4k=";
   };
 
+  # `find_installation()` without the `name_or_path` argument uses the
+  # Python interpreter that Meson was built with, which may not be the
+  # one we're using to build pycangjie.
+  # https://mesonbuild.com/Python-module.html#find_installation
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace-fail \
+        "import('python').find_installation()" \
+        "import('python').find_installation('python3')"
+  '';
+
   preConfigure = ''
     (
       cd subprojects
diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix
index 4dc2b194966c..252b1b36860e 100644
--- a/pkgs/games/openra_2019/default.nix
+++ b/pkgs/games/openra_2019/default.nix
@@ -72,11 +72,9 @@ lib.recurseIntoAttrs rec {
     {
       name ? null,
       version,
-      description,
-      homepage,
+      meta,
       mods,
       src,
-      pos,
     }@engine:
     # Allow specifying the name at a later point if no name has been given.
     let
@@ -99,10 +97,8 @@ lib.recurseIntoAttrs rec {
       name ? null,
       version,
       title,
-      description,
-      homepage,
+      meta,
       src,
-      pos,
       engine,
       assetsError ? "",
     }@mod:
diff --git a/pkgs/games/openra_2019/engine.nix b/pkgs/games/openra_2019/engine.nix
index ed6342ca0f92..90843e5abe65 100644
--- a/pkgs/games/openra_2019/engine.nix
+++ b/pkgs/games/openra_2019/engine.nix
@@ -17,10 +17,13 @@
   engine,
 }:
 
+let
+  version = "${engine.name}-${engine.version}";
+in
 stdenv.mkDerivation (
-  lib.recursiveUpdate packageAttrs rec {
+  {
     pname = "openra_2019";
-    version = "${engine.name}-${engine.version}";
+    inherit version;
 
     src = engine.src;
 
@@ -61,9 +64,7 @@ stdenv.mkDerivation (
       )}
     '';
 
-    inherit (engine) pos;
-    meta = {
-      inherit (engine) description homepage;
-    };
+    meta = packageAttrs.meta // engine.meta;
   }
+  // removeAttrs packageAttrs [ "meta" ]
 )
diff --git a/pkgs/games/openra_2019/engines.nix b/pkgs/games/openra_2019/engines.nix
index b3eae5a67322..a061fb965087 100644
--- a/pkgs/games/openra_2019/engines.nix
+++ b/pkgs/games/openra_2019/engines.nix
@@ -14,8 +14,10 @@ let
     name:
     (buildOpenRAEngine {
       inherit version;
-      description = "Open-source re-implementation of Westwood Studios' 2D Command and Conquer games";
-      homepage = "https://www.openra.net/";
+      meta = {
+        description = "Open-source re-implementation of Westwood Studios' 2D Command and Conquer games";
+        homepage = "https://www.openra.net/";
+      };
       mods = [
         "cnc"
         "d2k"
@@ -27,7 +29,6 @@ let
         repo = "OpenRA";
         inherit rev sha256 postFetch;
       };
-      pos = __curPos;
     } name).overrideAttrs
       (origAttrs: {
         postInstall = ''
diff --git a/pkgs/games/openra_2019/mod.nix b/pkgs/games/openra_2019/mod.nix
index d174778608dd..167747a7490f 100644
--- a/pkgs/games/openra_2019/mod.nix
+++ b/pkgs/games/openra_2019/mod.nix
@@ -23,10 +23,12 @@ let
 
 in
 # Based on: https://build.opensuse.org/package/show/home:fusion809/openra-ura
+let
+  pname = "openra_2019-${mod.name}";
+in
 stdenv.mkDerivation (
-  lib.recursiveUpdate packageAttrs rec {
-    name = "${pname}-${version}";
-    pname = "openra_2019-${mod.name}";
+  {
+    inherit pname;
     inherit (mod) version;
 
     srcs = [
@@ -47,7 +49,7 @@ stdenv.mkDerivation (
       exit 0
       EOF
 
-      sed -i 's/^VERSION.*/VERSION = ${version}/g' Makefile
+      sed -i 's/^VERSION.*/VERSION = ${mod.version}/g' Makefile
 
       dos2unix *.md
 
@@ -57,7 +59,7 @@ stdenv.mkDerivation (
     configurePhase = ''
       runHook preConfigure
 
-      make version VERSION=${lib.escapeShellArg version}
+      make version VERSION=${lib.escapeShellArg mod.version}
       make -C ${engineSourceName} version VERSION=${lib.escapeShellArg engine.version}
 
       runHook postConfigure
@@ -93,7 +95,7 @@ stdenv.mkDerivation (
       substitute ${./openra-mod.desktop} $(mkdirp $out/share/applications)/${pname}.desktop \
         --subst-var-by name ${lib.escapeShellArg mod.name} \
         --subst-var-by title ${lib.escapeShellArg mod.title} \
-        --subst-var-by description ${lib.escapeShellArg mod.description}
+        --subst-var-by description ${lib.escapeShellArg mod.meta.description}
 
       cp README.md $(mkdirp $out/share/doc/packages/${pname})/README.md
 
@@ -110,9 +112,7 @@ stdenv.mkDerivation (
       runHook postInstall
     '';
 
-    inherit (mod) pos;
-    meta = {
-      inherit (mod) description homepage;
-    };
+    meta = packageAttrs.meta // mod.meta;
   }
+  // removeAttrs packageAttrs [ "meta" ]
 )
diff --git a/pkgs/games/openra_2019/mods.nix b/pkgs/games/openra_2019/mods.nix
index cd983b85b201..f26c9c86c289 100644
--- a/pkgs/games/openra_2019/mods.nix
+++ b/pkgs/games/openra_2019/mods.nix
@@ -16,15 +16,14 @@ in
   ca = buildOpenRAMod {
     version = "96.git.fc3cf0b";
     title = "Combined Arms";
-    description = "A game that combines units from the official OpenRA Red Alert and Tiberian Dawn mods";
-    homepage = "https://github.com/Inq8/CAmod";
+    meta.description = "A game that combines units from the official OpenRA Red Alert and Tiberian Dawn mods";
+    meta.homepage = "https://github.com/Inq8/CAmod";
     src = fetchFromGitHub {
       owner = "Inq8";
       repo = "CAmod";
       rev = "fc3cf0baf2b827650eaae9e1d2335a3eed24bac9";
       sha256 = "15w91xs253gyrlzsgid6ixxjazx0fbzick6vlkiay0znb58n883m";
     };
-    pos = __curPos;
     engine = {
       version = "b8a7dd5";
       src = fetchFromGitHub {
@@ -41,15 +40,14 @@ in
   d2 = unsafeBuildOpenRAMod rec {
     version = "134.git.69a4aa7";
     title = "Dune II";
-    description = "A modernization of the original ${title} game";
-    homepage = "https://github.com/OpenRA/d2";
+    meta.description = "A modernization of the original ${title} game";
+    meta.homepage = "https://github.com/OpenRA/d2";
     src = fetchFromGitHub {
       owner = "OpenRA";
       repo = "d2";
       rev = "69a4aa708e2c26376469c0048fac13592aa452ca";
       sha256 = "1mfch4s6c05slyqvxllklbxpqq8dqcbx3515n3gyylyq43gq481r";
     };
-    pos = __curPos;
     engine = rec {
       version = "release-20181215";
       mods = [
@@ -75,15 +73,14 @@ in
   dr = buildOpenRAMod rec {
     version = "324.git.ffcd6ba";
     title = "Dark Reign";
-    description = "A re-imagination of the original Command & Conquer: ${title} game";
-    homepage = "https://github.com/drogoganor/DarkReign";
+    meta.description = "A re-imagination of the original Command & Conquer: ${title} game";
+    meta.homepage = "https://github.com/drogoganor/DarkReign";
     src = fetchFromGitHub {
       owner = "drogoganor";
       repo = "DarkReign";
       rev = "ffcd6ba72979e5f77508136ed7b0efc13e4b100e";
       sha256 = "07g4qw909649s3i1yhw75613mpwfka05jana5mpp5smhnf0pkack";
     };
-    pos = __curPos;
     engine = {
       version = "DarkReign";
       src = fetchFromGitHub {
@@ -100,15 +97,14 @@ in
   gen = buildOpenRAMod {
     version = "1157.git.4f5e11d";
     title = "Generals Alpha";
-    description = "Re-imagination of the original Command & Conquer: Generals game";
-    homepage = "https://github.com/MustaphaTR/Generals-Alpha";
+    meta.description = "Re-imagination of the original Command & Conquer: Generals game";
+    meta.homepage = "https://github.com/MustaphaTR/Generals-Alpha";
     src = fetchFromGitHub {
       owner = "MustaphaTR";
       repo = "Generals-Alpha";
       rev = "4f5e11d916e4a03d8cf1c97eef484ce2d77d7df2";
       sha256 = "1wnl4qrlhynnlahgdlxwhgsdba5wgdg9yrv9f8hkgi69j60szypd";
     };
-    pos = __curPos;
     engine = rec {
       version = "gen-20190128_3";
       src = fetchFromGitHub {
@@ -130,15 +126,14 @@ in
     (buildOpenRAMod rec {
       inherit version;
       title = "Krush, Kill 'n' Destroy";
-      description = "Re-imagination of the original ${title} game";
-      homepage = "https://kknd-game.com/";
+      meta.description = "Re-imagination of the original ${title} game";
+      meta.homepage = "https://kknd-game.com/";
       src = fetchFromGitHub {
         owner = "IceReaper";
         repo = "KKnD";
         rev = "5530babcb05170e0959e4cf2b079161e9fedde4f";
         sha256 = "07jczrarmgm6zdk0myzwgq200x19yvpjyxrnhdac08mjgyz75zk1";
       };
-      pos = __curPos;
       engine = {
         version = "4e8eab4ca00d1910203c8a103dfd2c002714daa8";
         src = fetchFromGitHub {
@@ -162,15 +157,14 @@ in
   mw = buildOpenRAMod rec {
     version = "257.git.c9be8f2";
     title = "Medieval Warfare";
-    description = "A re-imagination of the original Command & Conquer: ${title} game";
-    homepage = "https://github.com/CombinE88/Medieval-Warfare";
+    meta.description = "A re-imagination of the original Command & Conquer: ${title} game";
+    meta.homepage = "https://github.com/CombinE88/Medieval-Warfare";
     src = fetchFromGitHub {
       owner = "CombinE88";
       repo = "Medieval-Warfare";
       rev = "c9be8f2a6f1dd710b1aedd9d5b00b4cf5020e2fe";
       sha256 = "09fp7k95jd6hjqdasbspbd43z5670wkyzbbgqkll9dfsrv0sky0v";
     };
-    pos = __curPos;
     engine = {
       version = "MedievalWarfareEngine";
       src = fetchFromGitHub {
@@ -187,15 +181,14 @@ in
   ra2 = buildOpenRAMod rec {
     version = "903.git.2f7c700";
     title = "Red Alert 2";
-    description = "Re-imagination of the original Command & Conquer: ${title} game";
-    homepage = "https://github.com/OpenRA/ra2";
+    meta.description = "Re-imagination of the original Command & Conquer: ${title} game";
+    meta.homepage = "https://github.com/OpenRA/ra2";
     src = fetchFromGitHub {
       owner = "OpenRA";
       repo = "ra2";
       rev = "2f7c700d6d63c0625e7158ef3098221fa6741569";
       sha256 = "11vnzwczn47wjfrq6y7z9q234p27ihdrcl5p87i6h2xnrpwi8b6m";
     };
-    pos = __curPos;
     engine = rec {
       version = "release-20180923";
       src = fetchFromGitHub {
@@ -216,15 +209,14 @@ in
   raclassic = buildOpenRAMod {
     version = "183.git.c76c13e";
     title = "Red Alert Classic";
-    description = "A modernization of the original Command & Conquer: Red Alert game";
-    homepage = "https://github.com/OpenRA/raclassic";
+    meta.description = "A modernization of the original Command & Conquer: Red Alert game";
+    meta.homepage = "https://github.com/OpenRA/raclassic";
     src = fetchFromGitHub {
       owner = "OpenRA";
       repo = "raclassic";
       rev = "c76c13e9f0912a66ddebae8d05573632b19736b2";
       sha256 = "1cnr3ccvrkjlv8kkdcglcfh133yy0fkva9agwgvc7wlj9n5ydl4g";
     };
-    pos = __curPos;
     engine = rec {
       version = "release-20190314";
       src = fetchFromGitHub {
@@ -241,15 +233,14 @@ in
   rv = unsafeBuildOpenRAMod {
     version = "1330.git.9230e6f";
     title = "Romanov's Vengeance";
-    description = "Re-imagination of the original Command & Conquer: Red Alert 2 game";
-    homepage = "https://github.com/MustaphaTR/Romanovs-Vengeance";
+    meta.description = "Re-imagination of the original Command & Conquer: Red Alert 2 game";
+    meta.homepage = "https://github.com/MustaphaTR/Romanovs-Vengeance";
     src = fetchFromGitHub {
       owner = "MustaphaTR";
       repo = "Romanovs-Vengeance";
       rev = "9230e6f1dd9758467832aee4eda115e18f0e635f";
       sha256 = "0bwbmmlhp1kh8rgk2nx1ca9vqssj849amndacf318d61gksc1w9n";
     };
-    pos = __curPos;
     engine = {
       version = "f3873ae";
       mods = [ "as" ];
@@ -271,15 +262,14 @@ in
   sp = unsafeBuildOpenRAMod {
     version = "221.git.ac000cc";
     title = "Shattered Paradise";
-    description = "Re-imagination of the original Command & Conquer: Tiberian Sun game";
-    homepage = "https://github.com/ABrandau/OpenRAModSDK";
+    meta.description = "Re-imagination of the original Command & Conquer: Tiberian Sun game";
+    meta.homepage = "https://github.com/ABrandau/OpenRAModSDK";
     src = fetchFromGitHub {
       owner = "ABrandau";
       repo = "OpenRAModSDK";
       rev = "ac000cc15377cdf6d3c2b72c737d692aa0ed8bcd";
       sha256 = "16mzs5wcxj9nlpcyx2c87idsqpbm40lx0rznsccclnlb3hiwqas9";
     };
-    pos = __curPos;
     engine = {
       version = "SP-22-04-19";
       mods = [
@@ -300,15 +290,14 @@ in
   ss = buildOpenRAMod rec {
     version = "77.git.23e1f3e";
     title = "Sole Survivor";
-    description = "A re-imagination of the original Command & Conquer: ${title} game";
-    homepage = "https://github.com/MustaphaTR/sole-survivor";
+    meta.description = "A re-imagination of the original Command & Conquer: ${title} game";
+    meta.homepage = "https://github.com/MustaphaTR/sole-survivor";
     src = fetchFromGitHub {
       owner = "MustaphaTR";
       repo = "sole-survivor";
       rev = "23e1f3e5d8b98c936797b6680d95d56a69a9e2ab";
       sha256 = "104clmxphchs7r8y7hpmw103bychayz80bqj98bp89i64nv9d89x";
     };
-    pos = __curPos;
     engine = {
       version = "6de92de";
       src = fetchFromGitHub {
@@ -325,15 +314,14 @@ in
   ura = buildOpenRAMod {
     version = "431.git.128dc53";
     title = "Red Alert Unplugged";
-    description = "Re-imagination of the original Command & Conquer: Red Alert game";
-    homepage = "http://redalertunplugged.com/";
+    meta.description = "Re-imagination of the original Command & Conquer: Red Alert game";
+    meta.homepage = "http://redalertunplugged.com/";
     src = fetchFromGitHub {
       owner = "RAunplugged";
       repo = "uRA";
       rev = "128dc53741fae923f4af556f2293ceaa0cf571f0";
       sha256 = "1mhr8kyh313z52gdrqv31d6z7jvdldiajalca5mcr8gzg6mph66p";
     };
-    pos = __curPos;
     engine = rec {
       version = "unplugged-cd82382";
       src = fetchFromGitHub {
@@ -349,16 +337,15 @@ in
 
   yr = unsafeBuildOpenRAMod rec {
     version = "199.git.5b8b952";
-    homepage = "https://github.com/cookgreen/yr";
     title = "Yuri's Revenge";
-    description = "Re-imagination of the original Command & Conquer: ${title} game";
+    meta.description = "Re-imagination of the original Command & Conquer: ${title} game";
+    meta.homepage = "https://github.com/cookgreen/yr";
     src = fetchFromGitHub {
       owner = "cookgreen";
       repo = "yr";
       rev = "5b8b952dbe21f194a6d00485f20e215ce8362712";
       sha256 = "0hxzrqnz5d7qj1jjr20imiyih62x1cnmndf75nnil4c4sj82f9a6";
     };
-    pos = __curPos;
     engine = rec {
       version = "release-20190314";
       src = fetchFromGitHub {
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index dc214f05e617..dcfc51edb400 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -13,14 +13,15 @@ let
   beat =
     package: extraArgs:
     buildGoModule (
-      lib.attrsets.recursiveUpdate rec {
+      finalAttrs:
+      {
         pname = package;
         version = elk7Version;
 
         src = fetchFromGitHub {
           owner = "elastic";
           repo = "beats";
-          rev = "v${version}";
+          tag = "v${finalAttrs.version}";
           hash = "sha256-TzcKB1hIHe1LNZ59GcvR527yvYqPKNXPIhpWH2vyMTY=";
         };
 
@@ -36,17 +37,19 @@ let
             dfithian
           ];
           platforms = lib.platforms.linux;
-        };
-      } extraArgs
+        }
+        // (extraArgs.meta or { });
+      }
+      // removeAttrs extraArgs [
+        "meta"
+      ]
     );
 in
 rec {
   auditbeat7 = beat "auditbeat" {
-    pos = __curPos;
     meta.description = "Lightweight shipper for audit data";
   };
   filebeat7 = beat "filebeat" {
-    pos = __curPos;
     meta.description = "Lightweight shipper for logfiles";
     buildInputs = [ systemd ];
     tags = [ "withjournald" ];
@@ -55,11 +58,9 @@ rec {
     '';
   };
   heartbeat7 = beat "heartbeat" {
-    pos = __curPos;
     meta.description = "Lightweight shipper for uptime monitoring";
   };
   metricbeat7 = beat "metricbeat" {
-    pos = __curPos;
     meta.description = "Lightweight shipper for metrics";
     passthru.tests = lib.optionalAttrs config.allowUnfree (
       assert metricbeat7.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.metricbeat.drvPath;
@@ -70,7 +71,6 @@ rec {
   };
   packetbeat7 = beat "packetbeat" {
     buildInputs = [ libpcap ];
-    pos = __curPos;
     meta.description = "Network packet analyzer that ships data to Elasticsearch";
     meta.longDescription = ''
       Packetbeat is an open source network packet analyzer that ships the
diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix
index b9e7c4e3a3f6..abe64a6559d2 100644
--- a/pkgs/servers/mir/common.nix
+++ b/pkgs/servers/mir/common.nix
@@ -272,7 +272,7 @@ stdenv.mkDerivation (
             # Have to double-wrap it...
             installPhase = oa.installPhase + ''
               wrapProgram $out/bin/update-source-version \
-                --add-flag '--file=${lib.strings.removeSuffix "/common.nix" __curPos.file}/default.nix'
+                --add-flag '--file=pkgs/servers/mir/default.nix'
             '';
           });
         in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26d5f2f56ba5..bb60833f9f21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11000,11 +11000,6 @@ with pkgs;
     SDL_image = SDL_image.override { SDL = SDL_sixel; };
   };
 
-  zynaddsubfx = callPackage ../applications/audio/zynaddsubfx {
-    guiModule = "zest";
-    fftw = fftwSinglePrec;
-  };
-
   zynaddsubfx-fltk = zynaddsubfx.override {
     guiModule = "fltk";
   };
diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix
index e440e979d5ce..acb164f047d0 100644
--- a/pkgs/top-level/octave-packages.nix
+++ b/pkgs/top-level/octave-packages.nix
@@ -56,7 +56,7 @@ makeScope newScope (
   in
   {
 
-    inherit callPackage buildOctavePackage computeRequiredOctavePackages;
+    inherit buildOctavePackage computeRequiredOctavePackages;
 
     inherit (callPackage ../development/interpreters/octave/hooks { })
       writeRequiredOctavePackagesHook