commit 338b5bde5de829a4d50ba1e94e821ec7d787272c · pyrox.dev/nixpkgs

+33 -9

pkgs/development/julia-modules/default.nix

···

       11
       11
        
       

     

       12
       12
        
         # Artifacts dependencies

     

       13
       13
        
         fetchurl,

     

       14
       14
       +
         gcc,

     

       14
       15
        
         glibc,

     

       15
       16
        
         pkgs,

     

       16
       17
        
         stdenv,

     
···

       79
       80
        
           PythonCall = [ "PyCall" ];

     

       80
       81
        
         };

     

       81
       82
        
       

     

       82
       82
       -
         # Invoke Julia resolution logic to determine the full dependency closure

     

       83
       83
       +
         # Invoke Julia resolution logic to determine the full dependency closure. Also

     

       84
       84
       +
         # gather information on the Julia standard libraries, which we'll need to

     

       85
       85
       +
         # generate a Manifest.toml.

     

       83
       86
        
         packageOverridesRepoified = lib.mapAttrs util.repoifySimple packageOverrides;

     

       84
       87
        
         closureYaml = callPackage ./package-closure.nix {

     

       85
       88
        
           inherit

     
···

       89
       92
        
             packageImplications

     

       90
       93
        
             ;

     

       91
       94
        
           packageOverrides = packageOverridesRepoified;

     

       95
       95
       +
         };

     

       96
       96
       +
         stdlibInfos = callPackage ./stdlib-infos.nix {

     

       97
       97
       +
           inherit julia;

     

       92
       98
        
         };

     

       93
       99
        
       

     

       94
       100
        
         # Generate a Nix file consisting of a map from dependency UUID --> package info with fetchgit call:

     
···

       181
       187
        
                 "${dependencyUuidToRepoYaml}" \

     

       182
       188
        
                 "$out"

     

       183
       189
        
             '';

     

       190
       190
       +
         project =

     

       191
       191
       +
           runCommand "julia-project"

     

       192
       192
       +
             {

     

       193
       193
       +
               buildInputs = [

     

       194
       194
       +
                 (python3.withPackages (

     

       195
       195
       +
                   ps: with ps; [

     

       196
       196
       +
                     toml

     

       197
       197
       +
                     pyyaml

     

       198
       198
       +
                   ]

     

       199
       199
       +
                 ))

     

       200
       200
       +
                 git

     

       201
       201
       +
               ];

     

       202
       202
       +
             }

     

       203
       203
       +
             ''

     

       204
       204
       +
               python ${./python}/project.py \

     

       205
       205
       +
                 "${closureYaml}" \

     

       206
       206
       +
                 "${stdlibInfos}" \

     

       207
       207
       +
                 '${lib.generators.toJSON { } overridesOnly}' \

     

       208
       208
       +
                 "${dependencyUuidToRepoYaml}" \

     

       209
       209
       +
                 "$out"

     

       210
       210
       +
             '';

     

       184
       211
        
       

     

       185
       212
        
         # Next, deal with artifacts. Scan each artifacts file individually and generate a Nix file that

     

       186
       213
        
         # produces the desired Overrides.toml.

     
···

       220
       247
        
               ;

     

       221
       248
        
           }

     

       222
       249
        
           // lib.optionalAttrs (!stdenv.targetPlatform.isDarwin) {

     

       223
       223
       -
             inherit glibc;

     

       250
       250
       +
             inherit gcc glibc;

     

       224
       251
        
           }

     

       225
       252
        
         );

     

       226
       253
        
         overridesJson = writeTextFile {

     
···

       235
       262
        
                 "$out"

     

       236
       263
        
             '';

     

       237
       264
        
       

     

       238
       238
       -
         # Build a Julia project and depot. The project contains Project.toml/Manifest.toml, while the

     

       239
       239
       -
         # depot contains package build products (including the precompiled libraries, if precompile=true)

     

       265
       265
       +
         # Build a Julia project and depot under $out/project and $out/depot respectively

     

       240
       266
        
         projectAndDepot = callPackage ./depot.nix {

     

       241
       267
        
           inherit

     

       242
       268
        
             closureYaml

     
···

       247
       273
        
             precompile

     

       248
       274
        
             ;

     

       249
       275
        
           julia = juliaWrapped;

     

       276
       276
       +
           inherit project;

     

       250
       277
        
           registry = minimalRegistry;

     

       251
       251
       -
           packageNames =

     

       252
       252
       -
             if makeTransitiveDependenciesImportable then

     

       253
       253
       -
               lib.mapAttrsToList (uuid: info: info.name) dependencyUuidToInfo

     

       254
       254
       -
             else

     

       255
       255
       -
               packageNames;

     

       256
       278
        
         };

     

       257
       279
        
       

     

       258
       280
        
       in

     
···

       276
       298
        
             inherit artifactsNix;

     

       277
       299
        
             inherit overridesJson;

     

       278
       300
        
             inherit overridesToml;

     

       301
       301
       +
             inherit project;

     

       279
       302
        
             inherit projectAndDepot;

     

       303
       303
       +
             inherit stdlibInfos;

     

       280
       304
        
           };

     

       281
       305
        
         }

     

       282
       306
        
         (

+18 -21

pkgs/development/julia-modules/depot.nix

···

       14
       14
        
         juliaCpuTarget,

     

       15
       15
        
         overridesToml,

     

       16
       16
        
         packageImplications,

     

       17
       17
       -
         packageNames,

     

       17
       17
       +
         project,

     

       18
       18
        
         precompile,

     

       19
       19
        
         registry,

     

       20
       20
        
       }:

     
···

       44
       44
        
             (python3.withPackages (ps: with ps; [ pyyaml ]))

     

       45
       45
        
           ]

     

       46
       46
        
           ++ extraLibs;

     

       47
       47
       -
           inherit precompile registry;

     

       47
       47
       +
           inherit precompile project registry;

     

       48
       48
        
         }

     

       49
       49
        
         (

     

       50
       50
        
           ''

     
···

       52
       52
        
       

     

       53
       53
        
             echo "Building Julia depot and project with the following inputs"

     

       54
       54
        
             echo "Julia: ${julia}"

     

       55
       55
       +
             echo "Project: $project"

     

       55
       56
        
             echo "Registry: $registry"

     

       56
       57
        
             echo "Overrides ${overridesToml}"

     

       57
       58
        
       

     

       58
       59
        
             mkdir -p $out/project

     

       59
       60
        
             export JULIA_PROJECT="$out/project"

     

       61
       61
       +
             cp "$project/Manifest.toml" "$JULIA_PROJECT/Manifest.toml"

     

       62
       62
       +
             cp "$project/Project.toml" "$JULIA_PROJECT/Project.toml"

     

       60
       63
        
       

     

       61
       64
        
             mkdir -p $out/depot/artifacts

     

       62
       65
        
             export JULIA_DEPOT_PATH="$out/depot"

     

       63
       66
        
             cp ${overridesToml} $out/depot/artifacts/Overrides.toml

     

       64
       67
        
       

     

       65
       68
        
             # These can be useful to debug problems

     

       66
       66
       -
             # export JULIA_DEBUG=Pkg

     

       67
       67
       -
             # export JULIA_DEBUG=loading

     

       69
       69
       +
             # export JULIA_DEBUG=Pkg,loading

     

       68
       70
        
       

     

       69
       71
        
             ${setJuliaSslCaRootsPath}

     

       70
       72
        
       

     
···

       104
       106
        
       

     

       105
       107
        
               Pkg.Registry.add(Pkg.RegistrySpec(path="${registry}"))

     

       106
       108
        
       

     

       107
       107
       -
               input = ${lib.generators.toJSON { } packageNames} ::Vector{String}

     

       109
       109
       +
               # No need to Pkg.activate() since we set JULIA_PROJECT above

     

       110
       110
       +
               println("Running Pkg.instantiate()")

     

       111
       111
       +
               Pkg.instantiate()

     

       108
       112
        
       

     

       109
       109
       -
               if isfile("extra_package_names.txt")

     

       110
       110
       -
                 append!(input, readlines("extra_package_names.txt"))

     

       111
       111
       -
               end

     

       113
       113
       +
               # Build is a separate step from instantiate.

     

       114
       114
       +
               # Needed for packages like Conda.jl to set themselves up.

     

       115
       115
       +
               println("Running Pkg.build()")

     

       116
       116
       +
               Pkg.build()

     

       112
       117
        
       

     

       113
       113
       -
               input = unique(input)

     

       118
       118
       +
               if "precompile" in keys(ENV) && ENV["precompile"] != "0" && ENV["precompile"] != ""

     

       119
       119
       +
                 if isdefined(Sys, :CPU_NAME)

     

       120
       120
       +
                   println("Precompiling with CPU_NAME = " * Sys.CPU_NAME)

     

       121
       121
       +
                 end

     

       114
       122
        
       

     

       115
       115
       -
               if !isempty(input)

     

       116
       116
       -
                 println("Adding packages: " * join(input, " "))

     

       117
       117
       -
                 Pkg.add(input; preserve=PRESERVE_NONE)

     

       118
       118
       -
                 Pkg.instantiate()

     

       119
       119
       -
       

     

       120
       120
       -
                 if "precompile" in keys(ENV) && ENV["precompile"] != "0" && ENV["precompile"] != ""

     

       121
       121
       -
                   if isdefined(Sys, :CPU_NAME)

     

       122
       122
       -
                     println("Precompiling with CPU_NAME = " * Sys.CPU_NAME)

     

       123
       123
       -
                   end

     

       124
       124
       -
       

     

       125
       125
       -
                   Pkg.precompile()

     

       126
       126
       -
                 end

     

       123
       123
       +
                 Pkg.precompile()

     

       127
       124
        
               end

     

       128
       125
        
       

     

       129
       126
        
               # Remove the registry to save space

pkgs/development/julia-modules/package-closure.nix

···

       43
       43
        
                   println(io, "- name: " * spec.name)

     

       44
       44
        
                   println(io, "  uuid: " * string(spec.uuid))

     

       45
       45
        
                   println(io, "  version: " * string(spec.version))

     

       46
       46
       +
                   println(io, "  tree_hash: " * string(spec.tree_hash))

     

       46
       47
        
                   if endswith(spec.name, "_jll") && haskey(deps_map, spec.uuid)

     

       47
       48
        
                       println(io, "  depends_on: ")

     

       48
       49
        
                       for (dep_name, dep_uuid) in pairs(deps_map[spec.uuid])

     

       49
       50
        
                           println(io, "    \"$(dep_name)\": \"$(dep_uuid)\"")

     

       50
       51
        
                       end

     

       52
       52
       +
                   end

     

       53
       53
       +
                   println(io, "  deps: ")

     

       54
       54
       +
                   for (dep_name, dep_uuid) in pairs(deps_map[spec.uuid])

     

       55
       55
       +
                       println(io, "  - name: \"$(dep_name)\"")

     

       56
       56
       +
                       println(io, "    uuid: \"$(dep_uuid)\"")

     

       57
       57
       +
                   end

     

       58
       58
       +
                   if spec.name in input

     

       59
       59
       +
                       println(io, "  is_input: true")

     

       51
       60
        
                   end

     

       52
       61
        
               end

     

       53
       62
        
           end

+6 -3

pkgs/development/julia-modules/python/extract_artifacts.py

···

       47
       47
        
       

     

       48
       48
        
                   ''"""

     

       49
       49
        
         else:

     

       50
       50
       +
           # We provide gcc.cc.lib by default in order to get some common libraries

     

       51
       51
       +
           # like libquadmath.so. A number of packages expect this to be available and

     

       52
       52
       +
           # will give linker errors if it isn't.

     

       50
       53
        
           fixup = f"""fixupPhase = let

     

       51
       54
        
                   libs = lib.concatMap (lib.mapAttrsToList (k: v: v.path))

     

       52
       55
        
                                      [{" ".join(["uuid-" + x for x in depends_on])}];

     

       53
       56
        
                   in ''

     

       54
       57
        
                     find $out -type f -executable -exec \

     

       55
       55
       -
                       patchelf --set-rpath \$ORIGIN:\$ORIGIN/../lib:${{lib.makeLibraryPath (["$out" glibc] ++ libs ++ (with pkgs; [{" ".join(other_libs)}]))}} {{}} \;

     

       58
       58
       +
                       patchelf --set-rpath \\$ORIGIN:\\$ORIGIN/../lib:${{lib.makeLibraryPath (["$out" glibc gcc.cc.lib] ++ libs ++ (with pkgs; [{" ".join(other_libs)}]))}} {{}} \\;

     

       56
       59
        
                     find $out -type f -executable -exec \

     

       57
       57
       -
                       patchelf --set-interpreter ${{glibc}}/lib/ld-linux-x86-64.so.2 {{}} \;

     

       60
       60
       +
                       patchelf --set-interpreter ${{glibc}}/lib/ld-linux-x86-64.so.2 {{}} \\;

     

       58
       61
        
                   ''"""

     

       59
       62
        
       

     

       60
       63
        
         return f"""stdenv.mkDerivation {{

     
···

       145
       148
        
           if is_darwin:

     

       146
       149
        
             f.write("{ lib, fetchurl, pkgs, stdenv }:\n\n")

     

       147
       150
        
           else:

     

       148
       148
       -
             f.write("{ lib, fetchurl, glibc, pkgs, stdenv }:\n\n")

     

       151
       151
       +
             f.write("{ lib, fetchurl, gcc, glibc, pkgs, stdenv }:\n\n")

     

       149
       152
        
       

     

       150
       153
        
           f.write("rec {\n")

     

       151
       154

+39 -10

pkgs/development/julia-modules/python/minimal_registry.py

···

       24
       24
        
       

     

       25
       25
        
       uuid_to_versions = defaultdict(list)

     

       26
       26
        
       for pkg in desired_packages:

     

       27
       27
       -
           uuid_to_versions[pkg["uuid"]].append(pkg["version"])

     

       27
       27
       +
         uuid_to_versions[pkg["uuid"]].append(pkg["version"])

     

       28
       28
        
       

     

       29
       29
        
       with open(dependencies_path, "r") as f:

     

       30
       30
        
         uuid_to_store_path = yaml.safe_load(f)

     

       31
       31
        
       

     

       32
       32
        
       os.makedirs(out_path)

     

       33
       33
        
       

     

       34
       34
       -
       registry = toml.load(registry_path / "Registry.toml")

     

       34
       34
       +
       full_registry = toml.load(registry_path / "Registry.toml")

     

       35
       35
       +
       registry = full_registry.copy()

     

       35
       36
        
       registry["packages"] = {k: v for k, v in registry["packages"].items() if k in uuid_to_versions}

     

       36
       37
        
       

     

       37
       38
        
       for (uuid, versions) in uuid_to_versions.items():

     
···

       80
       81
        
             if (registry_path / path / f).exists():

     

       81
       82
        
               shutil.copy2(registry_path / path / f, out_path / path)

     

       82
       83
        
       

     

       83
       83
       -
           # Copy the Versions.toml file, trimming down to the versions we care about

     

       84
       84
       +
           # Copy the Versions.toml file, trimming down to the versions we care about.

     

       85
       85
       +
           # In the case where versions=None, this is a weak dep, and we keep all versions.

     

       84
       86
        
           all_versions = toml.load(registry_path / path / "Versions.toml")

     

       85
       85
       -
           versions_to_keep = {k: v for k, v in all_versions.items() if k in versions}

     

       87
       87
       +
           versions_to_keep = {k: v for k, v in all_versions.items() if k in versions} if versions != None else all_versions

     

       86
       88
        
           for k, v in versions_to_keep.items():

     

       87
       89
        
             del v["nix-sha256"]

     

       88
       90
        
           with open(out_path / path / "Versions.toml", "w") as f:

     

       89
       91
        
             toml.dump(versions_to_keep, f)

     

       90
       92
        
       

     

       91
       91
       -
           # Fill in the local store path for the repo

     

       92
       92
       -
           if not uuid in uuid_to_store_path: continue

     

       93
       93
       -
           package_toml = toml.load(registry_path / path / "Package.toml")

     

       94
       94
       -
           package_toml["repo"] = "file://" + uuid_to_store_path[uuid]

     

       95
       95
       -
           with open(out_path / path / "Package.toml", "w") as f:

     

       96
       96
       -
             toml.dump(package_toml, f)

     

       93
       93
       +
           if versions is None:

     

       94
       94
       +
             # This is a weak dep; just grab the whole Package.toml

     

       95
       95
       +
             shutil.copy2(registry_path / path / "Package.toml", out_path / path / "Package.toml")

     

       96
       96
       +
           elif uuid in uuid_to_store_path:

     

       97
       97
       +
             # Fill in the local store path for the repo

     

       98
       98
       +
             package_toml = toml.load(registry_path / path / "Package.toml")

     

       99
       99
       +
             package_toml["repo"] = "file://" + uuid_to_store_path[uuid]

     

       100
       100
       +
             with open(out_path / path / "Package.toml", "w") as f:

     

       101
       101
       +
               toml.dump(package_toml, f)

     

       102
       102
       +
       

     

       103
       103
       +
       # Look for missing weak deps and include them. This can happen when our initial

     

       104
       104
       +
       # resolve step finds dependencies, but we fail to resolve them at the project.py

     

       105
       105
       +
       # stage. Usually this happens because the package that depends on them does so

     

       106
       106
       +
       # as a weak dep, but doesn't have a Package.toml in its repo making this clear.

     

       107
       107
       +
       for pkg in desired_packages:

     

       108
       108
       +
         for dep in (pkg.get("deps", []) or []):

     

       109
       109
       +
           uuid = dep["uuid"]

     

       110
       110
       +
           if not uuid in uuid_to_versions:

     

       111
       111
       +
             entry = full_registry["packages"].get(uuid)

     

       112
       112
       +
             if not entry:

     

       113
       113
       +
               print(f"""WARNING: found missing UUID but couldn't resolve it: {uuid}""")

     

       114
       114
       +
               continue

     

       97
       115
        
       

     

       116
       116
       +
             # Add this entry back to the minimal Registry.toml

     

       117
       117
       +
             registry["packages"][uuid] = entry

     

       118
       118
       +
       

     

       119
       119
       +
             # Bring over the Package.toml

     

       120
       120
       +
             path = Path(entry["path"])

     

       121
       121
       +
             if (out_path / path / "Package.toml").exists():

     

       122
       122
       +
               continue

     

       123
       123
       +
             Path(out_path / path).mkdir(parents=True, exist_ok=True)

     

       124
       124
       +
             shutil.copy2(registry_path / path / "Package.toml", out_path / path / "Package.toml")

     

       125
       125
       +
       

     

       126
       126
       +
       # Finally, dump the Registry.toml

     

       98
       127
        
       with open(out_path / "Registry.toml", "w") as f:

     

       99
       128
        
           toml.dump(registry, f)

+104

pkgs/development/julia-modules/python/project.py

···

       1
       1
       +
       

     

       2
       2
       +
       from collections import defaultdict

     

       3
       3
       +
       import json

     

       4
       4
       +
       import os

     

       5
       5
       +
       from pathlib import Path

     

       6
       6
       +
       import sys

     

       7
       7
       +
       import toml

     

       8
       8
       +
       import yaml

     

       9
       9
       +
       

     

       10
       10
       +
       

     

       11
       11
       +
       desired_packages_path = Path(sys.argv[1])

     

       12
       12
       +
       stdlib_infos_path = Path(sys.argv[2])

     

       13
       13
       +
       package_overrides = json.loads(sys.argv[3])

     

       14
       14
       +
       dependencies_path = Path(sys.argv[4])

     

       15
       15
       +
       out_path = Path(sys.argv[5])

     

       16
       16
       +
       

     

       17
       17
       +
       with open(desired_packages_path, "r") as f:

     

       18
       18
       +
         desired_packages = yaml.safe_load(f) or []

     

       19
       19
       +
       

     

       20
       20
       +
       with open(stdlib_infos_path, "r") as f:

     

       21
       21
       +
         stdlib_infos = yaml.safe_load(f) or []

     

       22
       22
       +
       

     

       23
       23
       +
       with open(dependencies_path, "r") as f:

     

       24
       24
       +
         uuid_to_store_path = yaml.safe_load(f)

     

       25
       25
       +
       

     

       26
       26
       +
       result = {

     

       27
       27
       +
         "deps": defaultdict(list)

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       for pkg in desired_packages:

     

       31
       31
       +
         if pkg["uuid"] in package_overrides:

     

       32
       32
       +
           info = package_overrides[pkg["uuid"]]

     

       33
       33
       +
           result["deps"][info["name"]].append({

     

       34
       34
       +
             "uuid": pkg["uuid"],

     

       35
       35
       +
             "path": info["src"],

     

       36
       36
       +
           })

     

       37
       37
       +
           continue

     

       38
       38
       +
       

     

       39
       39
       +
         path = uuid_to_store_path.get(pkg["uuid"], None)

     

       40
       40
       +
         isStdLib = False

     

       41
       41
       +
         if pkg["uuid"] in stdlib_infos["stdlibs"]:

     

       42
       42
       +
           path = stdlib_infos["stdlib_root"] + "/" + stdlib_infos["stdlibs"][pkg["uuid"]]["name"]

     

       43
       43
       +
           isStdLib = True

     

       44
       44
       +
       

     

       45
       45
       +
         if path:

     

       46
       46
       +
           if (Path(path) / "Project.toml").exists():

     

       47
       47
       +
             project_toml = toml.load(Path(path) / "Project.toml")

     

       48
       48
       +
       

     

       49
       49
       +
             deps = []

     

       50
       50
       +
             weak_deps = project_toml.get("weakdeps", {})

     

       51
       51
       +
             extensions = project_toml.get("extensions", {})

     

       52
       52
       +
       

     

       53
       53
       +
             if "deps" in project_toml:

     

       54
       54
       +
               # Build up deps for the manifest, excluding weak deps

     

       55
       55
       +
               weak_deps_uuids = weak_deps.values()

     

       56
       56
       +
               for (dep_name, dep_uuid) in project_toml["deps"].items():

     

       57
       57
       +
                 if not (dep_uuid in weak_deps_uuids):

     

       58
       58
       +
                   deps.append(dep_name)

     

       59
       59
       +
           else:

     

       60
       60
       +
             # Not all projects have a Project.toml. In this case, use the deps we

     

       61
       61
       +
             # calculated from the package resolve step. This isn't perfect since it

     

       62
       62
       +
             # will fail to properly split out weak deps, but it's better than nothing.

     

       63
       63
       +
             print(f"""WARNING: package {pkg["name"]} didn't have a Project.toml in {path}""")

     

       64
       64
       +
             deps = [x["name"] for x in pkg.get("deps", [])]

     

       65
       65
       +
             weak_deps = {}

     

       66
       66
       +
             extensions = {}

     

       67
       67
       +
       

     

       68
       68
       +
           tree_hash = pkg.get("tree_hash", "")

     

       69
       69
       +
       

     

       70
       70
       +
           result["deps"][pkg["name"]].append({

     

       71
       71
       +
             "version": pkg["version"],

     

       72
       72
       +
             "uuid": pkg["uuid"],

     

       73
       73
       +
             "git-tree-sha1": (tree_hash if tree_hash != "nothing" else None) or None,

     

       74
       74
       +
             "deps": deps or None,

     

       75
       75
       +
             "weakdeps": weak_deps or None,

     

       76
       76
       +
             "extensions": extensions or None,

     

       77
       77
       +
       

     

       78
       78
       +
             # We *don't* set "path" here, because then Julia will try to use the

     

       79
       79
       +
             # read-only Nix store path instead of cloning to the depot. This will

     

       80
       80
       +
             # cause packages like Conda.jl to fail during the Pkg.build() step.

     

       81
       81
       +
             #

     

       82
       82
       +
             # "path": None if isStdLib else path ,

     

       83
       83
       +
           })

     

       84
       84
       +
         else:

     

       85
       85
       +
           print("WARNING: adding a package that we didn't have a path for, and it doesn't seem to be a stdlib", pkg)

     

       86
       86
       +
           result["deps"][pkg["name"]].append({

     

       87
       87
       +
             "version": pkg["version"],

     

       88
       88
       +
             "uuid": pkg["uuid"],

     

       89
       89
       +
             "deps": [x["name"] for x in pkg["deps"]]

     

       90
       90
       +
           })

     

       91
       91
       +
       

     

       92
       92
       +
       os.makedirs(out_path)

     

       93
       93
       +
       

     

       94
       94
       +
       with open(out_path / "Manifest.toml", "w") as f:

     

       95
       95
       +
         f.write(f'julia_version = "{stdlib_infos["julia_version"]}"\n')

     

       96
       96
       +
         f.write('manifest_format = "2.0"\n\n')

     

       97
       97
       +
         toml.dump(result, f)

     

       98
       98
       +
       

     

       99
       99
       +
       with open(out_path / "Project.toml", "w") as f:

     

       100
       100
       +
         f.write('[deps]\n')

     

       101
       101
       +
       

     

       102
       102
       +
         for pkg in desired_packages:

     

       103
       103
       +
           if pkg.get("is_input", False):

     

       104
       104
       +
             f.write(f'''{pkg["name"]} = "{pkg["uuid"]}"\n''')

+6 -2

pkgs/development/julia-modules/python/sources_nix.py

···

       24
       24
        
         Ensure a version string is a valid Julia-parsable version.

     

       25
       25
        
         It doesn't really matter what it looks like as it's just used for overrides.

     

       26
       26
        
         """

     

       27
       27
       -
         return re.sub('[^0-9\.]','', version)

     

       27
       27
       +
         return re.sub('[^0-9.]','', version)

     

       28
       28
        
       

     

       29
       29
        
       with open(out_path, "w") as f:

     

       30
       30
        
         f.write("{fetchgit}:\n")

     
···

       41
       41
        
           treehash = "{treehash}";

     

       42
       42
        
         }};\n""")

     

       43
       43
        
           elif uuid in registry["packages"]:

     

       44
       44
       +
             # The treehash is missing for stdlib packages. Don't bother downloading these.

     

       45
       45
       +
             if (not ("tree_hash" in pkg)) or pkg["tree_hash"] == "nothing": continue

     

       46
       46
       +
       

     

       44
       47
        
             registry_info = registry["packages"][uuid]

     

       45
       48
        
             path = registry_info["path"]

     

       46
       49
        
             packageToml = toml.load(registry_path / path / "Package.toml")

     
···

       65
       68
        
           treehash = "{version_to_use["git-tree-sha1"]}";

     

       66
       69
        
         }};\n""")

     

       67
       70
        
           else:

     

       68
       68
       -
             # print("Warning: couldn't figure out what to do with pkg in sources_nix.py", pkg)

     

       71
       71
       +
             # This is probably a stdlib

     

       72
       72
       +
             # print("WARNING: couldn't figure out what to do with pkg in sources_nix.py", pkg)

     

       69
       73
        
             pass

     

       70
       74
        
       

     

       71
       75
        
         f.write("}")

+1 -49

pkgs/development/julia-modules/resolve_packages.jl

···

       46
       46
        
       foreach(pkg -> ctx.env.project.deps[pkg.name] = pkg.uuid, pkgs)

     

       47
       47
        
       

     

       48
       48
        
       # Save the original pkgs for later. We might need to augment it with the weak dependencies

     

       49
       49
       -
       orig_pkgs = pkgs

     

       49
       49
       +
       orig_pkgs = deepcopy(pkgs)

     

       50
       50
        
       

     

       51
       51
        
       pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, pkgs, PRESERVE_NONE, ctx.julia_version)

     

       52
       52
       -
       

     

       53
       53
       -
       if VERSION >= VersionNumber("1.9")

     

       54
       54
       -
           while true

     

       55
       55
       -
               # Check for weak dependencies, which appear on the RHS of the deps_map but not in pkgs.

     

       56
       56
       -
               # Build up weak_name_to_uuid

     

       57
       57
       -
               uuid_to_name = Dict()

     

       58
       58
       -
               for pkg in pkgs

     

       59
       59
       -
                   uuid_to_name[pkg.uuid] = pkg.name

     

       60
       60
       -
               end

     

       61
       61
       -
               weak_name_to_uuid = Dict()

     

       62
       62
       -
               for (uuid, deps) in pairs(deps_map)

     

       63
       63
       -
                   for (dep_name, dep_uuid) in pairs(deps)

     

       64
       64
       -
                       if !haskey(uuid_to_name, dep_uuid)

     

       65
       65
       -
                           weak_name_to_uuid[dep_name] = dep_uuid

     

       66
       66
       -
                       end

     

       67
       67
       -
                   end

     

       68
       68
       -
               end

     

       69
       69
       -
       

     

       70
       70
       -
               if isempty(weak_name_to_uuid)

     

       71
       71
       -
                   break

     

       72
       72
       -
               end

     

       73
       73
       -
       

     

       74
       74
       -
               # We have nontrivial weak dependencies, so add each one to the initial pkgs and then re-run _resolve

     

       75
       75
       -
               println("Found weak dependencies: $(keys(weak_name_to_uuid))")

     

       76
       76
       -
       

     

       77
       77
       -
               orig_uuids = Set([pkg.uuid for pkg in orig_pkgs])

     

       78
       78
       -
       

     

       79
       79
       -
               for (name, uuid) in pairs(weak_name_to_uuid)

     

       80
       80
       -
                   if uuid in orig_uuids

     

       81
       81
       -
                       continue

     

       82
       82
       -
                   end

     

       83
       83
       -
       

     

       84
       84
       -
                   pkg = PackageSpec(name, uuid)

     

       85
       85
       -
       

     

       86
       86
       -
                   push!(orig_uuids, uuid)

     

       87
       87
       -
                   push!(orig_pkgs, pkg)

     

       88
       88
       -
                   ctx.env.project.deps[name] = uuid

     

       89
       89
       -
                   entry = Pkg.Types.manifest_info(ctx.env.manifest, uuid)

     

       90
       90
       -
                   if VERSION >= VersionNumber("1.11")

     

       91
       91
       -
                       orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, nothing, nothing, false)

     

       92
       92
       -
                   else

     

       93
       93
       -
                       orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, false)

     

       94
       94
       -
                   end

     

       95
       95
       -
               end

     

       96
       96
       -
       

     

       97
       97
       -
               global pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, orig_pkgs, PRESERVE_NONE, ctx.julia_version)

     

       98
       98
       -
           end

     

       99
       99
       -
       end

+36

pkgs/development/julia-modules/stdlib-infos.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         julia,

     

       3
       3
       +
         runCommand,

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
         juliaExpression = ''

     

       8
       8
       +
           using Pkg

     

       9
       9
       +
           open(ENV["out"], "w") do io

     

       10
       10
       +
               println(io, "stdlib_root: \"$(Sys.STDLIB)\"")

     

       11
       11
       +
       

     

       12
       12
       +
               println(io, "julia_version: \"$(string(VERSION))\"")

     

       13
       13
       +
       

     

       14
       14
       +
               stdlibs = Pkg.Types.stdlibs()

     

       15
       15
       +
               println(io, "stdlibs:")

     

       16
       16
       +
               for (uuid, (name, version)) in stdlibs

     

       17
       17
       +
                   println(io, "  \"$(uuid)\": ")

     

       18
       18
       +
                   println(io, "    name: $name")

     

       19
       19
       +
                   println(io, "    version: $version")

     

       20
       20
       +
               end

     

       21
       21
       +
           end

     

       22
       22
       +
         '';

     

       23
       23
       +
       in

     

       24
       24
       +
       

     

       25
       25
       +
       runCommand "julia-stdlib-infos.yml"

     

       26
       26
       +
         {

     

       27
       27
       +
           buildInputs = [

     

       28
       28
       +
             julia

     

       29
       29
       +
           ];

     

       30
       30
       +
         }

     

       31
       31
       +
         ''

     

       32
       32
       +
           # Prevent a warning where Julia tries to download package server info

     

       33
       33
       +
           export JULIA_PKG_SERVER=""

     

       34
       34
       +
       

     

       35
       35
       +
           julia -e '${juliaExpression}';

     

       36
       36
       +
         ''