Skip to content

Commit bc36f8f

Browse files
committed
Try using julia defined by flake (on master)
1 parent 3147611 commit bc36f8f

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

extract_artifacts.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#! /usr/bin/env nix-shell
2-
#! nix-shell -i julia -p julia-lts-bin
31

42
using Pkg, Pkg.Artifacts, Pkg.BinaryPlatforms, Pkg.PlatformEngines
53

flake.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
description = "julia2nix";
33

4-
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
4+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/master";
55
inputs.flake-utils.url = "github:numtide/flake-utils";
66

77
outputs = { self, nixpkgs, flake-utils }:
@@ -21,7 +21,7 @@
2121
cp -r ${./templates} $out/bin/templates
2222
2323
wrapProgram $out/bin/julia2nix \
24-
--set PATH ${lib.makeBinPath [nix python3]}
24+
--set PATH ${lib.makeBinPath [nix python3 julia-stable-bin]}
2525
'';
2626
};
2727
});

gather_packages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def process_item(name):
9696
if url and githash:
9797
sha256 = fetch_sha256(url, rev=githash)
9898
src = 'fetchgit { ' + f'url = "{url}"; rev = "{githash}"; sha256 = "{sha256}";' + ' }'
99-
artifacts = subprocess.check_output([script_dir.joinpath("extract_artifacts.jl"), src]).decode()
99+
artifacts = subprocess.check_output(["julia", script_dir.joinpath("extract_artifacts.jl"), src]).decode()
100100

101101
# If our URL came from the Manifest file, modify it to point to a Nix path
102102
if details[0].get("repo-url"):

0 commit comments

Comments
 (0)