Compare commits

..

No commits in common. "bd62ef48c2aaba62a34e5e06e20a79a192482c6f" and "2b4b2a901f29e6662425fb3ad68088fe363f8ac2" have entirely different histories.

7 changed files with 41 additions and 39 deletions

View File

@ -89,11 +89,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1672770368, "lastModified": 1672688183,
"narHash": "sha256-iO6Z9blIe8dcPh3VT2nkej9EimORCoskGQR6xNjICWI=", "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d01e7280ad7d13a5a0fae57355bd0dbfe5b81969", "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,14 +124,17 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1661367362,
"narHash": "sha256-KP+2qdZlhmRkrafuuEofg7YnNdVmGV95ipvpuqmJneI=", "narHash": "sha256-Qc8MXcV+YCPREu8kk6oggk23ZBKLqeQRAIsLbHEviPE=",
"path": "out-of-tree/nixGL", "owner": "guibou",
"type": "path" "repo": "nixGL",
"rev": "7165ffbccbd2cf4379b6cd6d2edd1620a427e5ae",
"type": "github"
}, },
"original": { "original": {
"path": "out-of-tree/nixGL", "owner": "guibou",
"type": "path" "repo": "nixGL",
"type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
@ -151,11 +154,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1672617983, "lastModified": 1672525397,
"narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=", "narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4", "rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -11,7 +11,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixgl.url = "path:out-of-tree/nixGL"; nixgl.url = "github:guibou/nixGL";
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
# Allows default.nix to call onto flake.nix. Useful for nix eval and automations # Allows default.nix to call onto flake.nix. Useful for nix eval and automations
flake-compat = { flake-compat = {

View File

@ -47,12 +47,9 @@ let
# Language-specific stuffs # Language-specific stuffs
pkgs.sumneko-lua-language-server pkgs.sumneko-lua-language-server
# TODO: the devShell should provide rust-analyzer so that pkgs.rust-analyzer
# cargo test builds binaries compatible with rust-analyzer rust_pkgs
pkgs.evcxr # Rust REPL for Conjure!
# pkgs.rust-analyzer
# rust_pkgs
# pkgs.evcxr # Rust REPL for Conjure!
# Python3 as alternative to bash scripts :^) # Python3 as alternative to bash scripts :^)
# (pkgs.python310Full.withPackages (pypkgs: [ # (pkgs.python310Full.withPackages (pypkgs: [

View File

@ -69,11 +69,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1672770368, "lastModified": 1672688183,
"narHash": "sha256-iO6Z9blIe8dcPh3VT2nkej9EimORCoskGQR6xNjICWI=", "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d01e7280ad7d13a5a0fae57355bd0dbfe5b81969", "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-KP+2qdZlhmRkrafuuEofg7YnNdVmGV95ipvpuqmJneI=", "narHash": "sha256-KP+2qdZlhmRkrafuuEofg7YnNdVmGV95ipvpuqmJneI=",
"path": "./../../out-of-tree/nixGL", "path": "/nix/store/zcawhhz89smqvmyqp985cmlsh6y81789-source/out-of-tree/nixGL",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "./../../out-of-tree/nixGL", "path": "/nix/store/zcawhhz89smqvmyqp985cmlsh6y81789-source/out-of-tree/nixGL",
"type": "path" "type": "path"
} }
}, },
@ -131,11 +131,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1672617983, "lastModified": 1672525397,
"narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=", "narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4", "rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -7,7 +7,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixgl.url = "path:./../../out-of-tree/nixGL"; nixgl.url = "./../../out-of-tree/nixGL";
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
# Allows default.nix to call onto flake.nix. Useful for nix eval and automations # Allows default.nix to call onto flake.nix. Useful for nix eval and automations
flake-compat = { flake-compat = {

View File

@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1672525397, "lastModified": 1671359686,
"narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=", "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa", "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -11,21 +11,23 @@
let let
overlays = [ rust-overlay.overlays.default ]; overlays = [ rust-overlay.overlays.default ];
pkgs = import nixpkgs { inherit system overlays; }; pkgs = import nixpkgs { inherit system overlays; };
rust_pkgs = (pkgs.rust-bin.selectLatestNightlyWith
(
toolchain:
toolchain.default.override {
extensions = [ "rust-src" "rust-analyzer" "rust-docs" "clippy" "miri" ];
}
));
naersk-lib = pkgs.callPackage naersk { }; naersk-lib = pkgs.callPackage naersk { };
in in
{ {
defaultPackage = naersk-lib.buildPackage ./.; defaultPackage = naersk-lib.buildPackage ./.;
devShell = with pkgs; mkShell { devShell = with pkgs; mkShell {
buildInputs = [ buildInputs = [
rust_pkgs (pkgs.rust-bin.selectLatestNightlyWith
(
toolchain:
toolchain.default.override {
extensions = [ "rust-src" ];
}
))
pkgs.rust-analyzer
pkgs.bacon # rust background code checker
]; ];
RUST_SRC_PATH = rustPlatform.rustLibSrc;
shellHook = '' shellHook = ''
# nix flake update # is this even needed? # nix flake update # is this even needed?
''; '';