nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 03:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

swift.swiftArch, swift.swiftOs: fix the eval

Browse Source 
Without the chnage the eval fails as:

    $ nix eval 'nixpkgs/staging#swift.swiftArch'
    error:
       … in the left operand of the update (//) operator
         at «github:NixOS/nixpkgs/9cfde996e4f874e9b58a0e9efb5193d565b6daf3»/lib/derivations.nix:265:8:
          264|     drv
          265|     // mapAttrs (_: lib.warn msg) drvToWrap
             |        ^
          266|     // (

       … while calling the 'mapAttrs' builtin
         at «github:NixOS/nixpkgs/9cfde996e4f874e9b58a0e9efb5193d565b6daf3»/lib/derivations.nix:265:8:
          264|     drv
          265|     // mapAttrs (_: lib.warn msg) drvToWrap
             |        ^
          266|     // (

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: expected a set but found a string: "x86_64"
This commit is contained in:
Sergei Trofimovich
2026-09-20 20:47:59 +01:00
parent f6001f38f7
commit bb0f35f8a0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/swift/by-name/sw/swift/package.nix
View File

@@ -241,9 +241,9 @@ stdenv.mkDerivation (finalAttrs: {
// lib.optionalAttrs config.allowAliases {
# Legacy aliases for the old Swift packaging. These should eventually be removed.
swift = lib.warnOnInstantiate "`swift` is an alias for this (`swift`) package. Just use it directly." finalAttrs.finalPackage;
swiftArch = lib.warnOnInstantiate "'swiftArch' is an alias for 'stdenv.hostPlatform.swift.arch'." stdenv.hostPlatform.swift.arch;
swiftArch = lib.warn "'swiftArch' is an alias for 'stdenv.hostPlatform.swift.arch'." stdenv.hostPlatform.swift.arch;
swiftDriver = lib.warnOnInstantiate "'swiftDriver' has been renamed to 'swift-driver'" finalAttrs.passthru.swift-driver;
swiftOs = lib.warnOnInstantiate "'swiftOs' is an alias for 'stdenv.hostPlatform.swift.platform'." stdenv.hostPlatform.swift.platform;
swiftOs = lib.warn "'swiftOs' is an alias for 'stdenv.hostPlatform.swift.platform'." stdenv.hostPlatform.swift.platform;
};
meta = {