roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-09-11 10:55:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

patch deletion of zig-overlay repo

Browse Source
This commit is contained in:
Anton-4 2022-08-22 17:55:15 +02:00
parent 172e58f96b
commit 68f2c6ed1d
No known key found for this signature in database
GPG Key ID: A13F4A6E21141925
2 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
flake.lock
View File

@ -30,21 +30,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"locked": {
"lastModified": 1629481132,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "997f7efcb746a9c140ce1f13c72263189225f482",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -86,8 +71,7 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay"
"zig": "zig"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -110,27 +94,6 @@
"repo": "rust-overlay", "repo": "rust-overlay",
"type": "github" "type": "github"
} }
},
"zig": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1651452199,
"narHash": "sha256-lq6mTsoPeOCsji/oMFf6953/uOtOhZZ7HSdtjNVDh6I=",
"owner": "roarkanize",
"repo": "zig-overlay",
"rev": "c3bd59086dbc731c240c924fd2bc3581720d0035",
"type": "github"
},
"original": {
"owner": "roarkanize",
"repo": "zig-overlay",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

11
flake.nix
View File

@ -9,11 +9,6 @@
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# using an overlay allows for quick updates after zig releases
zig = {
url = "github:roarkanize/zig-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
# to easily make configs for multiple architectures # to easily make configs for multiple architectures
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
# to be able to use vulkan system libs for editor graphics # to be able to use vulkan system libs for editor graphics
@ -23,7 +18,7 @@
}; };
}; };
outputs = { self, nixpkgs, rust-overlay, zig, flake-utils, nixgl }: outputs = { self, nixpkgs, rust-overlay, flake-utils, nixgl }:
let supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; let supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
in flake-utils.lib.eachSystem supportedSystems (system: in flake-utils.lib.eachSystem supportedSystems (system:
let let
@ -64,8 +59,6 @@
Security Security
]); ]);
zig-toolchain = zig.packages.${system}."0.9.1";
# For debugging LLVM IR # For debugging LLVM IR
debugir = pkgs.stdenv.mkDerivation { debugir = pkgs.stdenv.mkDerivation {
name = "debugir"; name = "debugir";
@ -98,7 +91,7 @@
llvmPkgs.clang llvmPkgs.clang
libxkbcommon libxkbcommon
pkg-config pkg-config
zig-toolchain # roc builtins are implemented in zig, see compiler/builtins/bitcode/ zig # roc builtins are implemented in zig, see compiler/builtins/bitcode/
# lib deps # lib deps
libffi libffi