Commit Graph

36 Commits

Author SHA1 Message Date
78b1773c05 build(nix): switch to crate2nix 2021-04-27 05:18:12 +03:00
dc3b11d28a build(nix): add git-lfs setup instructions for nix into git-lfs check abort message 2021-04-17 21:37:59 +03:00
84a7f666c2 build(nix): switch to nix-cargo-integration 2021-04-17 21:37:57 +03:00
70d1bb78f6 build(nix): remove useless rustpkgs 2021-04-15 00:28:35 +03:00
a89ac2d898 docs(nix): update nix commands to match latest nix changes 2021-03-27 12:41:35 +03:00
e5aabf1830 build(nix): switch to naersk 2021-03-23 16:02:47 +03:00
9caef83915 Merge branch 'cargo-override' into 'master'
Cargo.nix override instead of requiring manual intervention

See merge request veloren/veloren!1647
2021-03-05 17:04:29 +00:00
b151f88b63 Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot 2021-02-09 13:52:03 +01:00
b8dd7ad481 Cargo.nix override instead of requiring manual intervention 2020-12-17 12:15:47 +01:00
f9617740cc nix chore: regenerate Cargo.nix 2020-12-14 18:13:01 +03:00
9545b65e5f nix: workaround an issue with crate2nix, change some errors to be more clear 2020-12-12 21:14:29 +03:00
834d009f2e nix: better instructions for nixGL 2020-12-12 17:53:48 +03:00
f6c47d89d9 nix: add missing dependency xcb 2020-12-12 17:26:02 +03:00
02fa679dc2 nix: regenerate Cargo.nix 2020-12-12 17:11:51 +03:00
124bf069c8 nix: add bundle subcommand usage 2020-12-12 17:10:55 +03:00
8ccf5b3012 nix: update README, remove nixGL selection from dev shell (which also removes envrc-nvidia), update envrc to be used by both flakes, tidy up some stuff 2020-12-12 17:10:54 +03:00
d4e6928aa6 nix: refactor crateDeps in common to look better 2020-12-12 17:10:54 +03:00
354aa53ef4 nix: remove version from package names 2020-12-12 17:10:54 +03:00
2f995af47f nix: fix veloren version string in game, remove obsolete utils 2020-12-12 17:10:54 +03:00
0db8e59d7a Fix nix rust channel hash mismatch 2020-12-11 13:36:56 +01:00
b8fb250b00 flake-compat (unify flake and non-flake build process/environment)
The only user-facing changes is the process for version pinning, which will be
slightly less convenient without access to the `nix flake` feature. This is
justified by it rarely being necessary, for the benefit of relying on an
upcoming built-in nix feature rather than a non-standard third-party tool.

- deprecate `niv` for version pinning
- legacy nix now uses the flake via `flake-compat`
  - remove `sources.{nix,json}` (versions now pinned in `flake.lock`)
  - move contents of `nix/default.nix` to `nix/veloren.nix`
  - make `nix-build nix/default.nix` produce the same output as `flake build`
  - move contents of `nix/shell.nix` into `nix/devShell.nix`
  - make `nix-shell nix/shell.nix` produce the same environment as `flake develop`
- Move `tag` parameter into `sourceInfo`
- Tidy up and autoformat with `nixpkgs-fmt`
- update README to reflect new usage
- revert input versions to match those previously specified in nix/sources.json
2020-12-11 12:00:04 +00:00
1e2c719f11 nix: update niv deps, regenerate Cargo.nix, add some comments and remove an unused variable 2020-12-02 23:38:26 +03:00
106d377299 nix: envrc-common doesn't work apparently, so copy contents in it to both envrc-nvidia and envrc 2020-12-02 23:16:00 +03:00
d57b23a82e nix: add rust-src component to rust toolchain 2020-12-02 12:48:14 +01:00
893b2de47b nix: add .desktop file to veloren-voxygen derivation, update deps and other minor stuff 2020-12-01 00:15:18 +03:00
3ed3e39c51 nix: add envrc and envrc-nvidia file for auto dev env setup with direnv 2020-11-30 23:51:05 +03:00
2a4aeb4f8d nix: dont run git-lfs shell hook if its already initialized, add experimental nix-bundle bundling command, add nixGL to shell.nix for non-nixos users, switch to nixpkgs-fmt for formatting, update niv deps and many other minor improvements 2020-11-30 03:48:00 +03:00
c2d82eb773 nix: add git-lfs setup to shell hook for dev shell 2020-11-29 16:59:13 +03:00
8b0f060def nix: auto setup cachix cache, do git-lfs check in Nix, link assets dir directly (no assets package) and other minor improvements 2020-11-29 02:02:46 +03:00
46221a1620 nix: fix build failing when on tag, combine nixpkgs.nix and common.nix 2020-11-28 17:45:58 +03:00
3046cdbf55 fix and improve nix build: actually output a proper veloren voxygen package now 2020-11-25 02:00:50 +03:00
8bf6bba5dc fieed and updated nix 2020-08-18 16:51:25 +02:00
2475782310 nix: regenerate Cargo.nix and update niv dependencies 2020-08-10 17:20:52 +03:00
cef9913e74 nix: regenerate Cargo.nix, update dependencies, some tweaks for better reproducibility, remove rustup from shell.nix (causes issues) and add rustc, cargo instead 2020-07-16 13:40:39 +00:00
d367511b77 nix: Add nixfmt package to shell.nix, update readme 2020-06-23 20:51:32 +03:00
bddbe51a1d nix: Switch to crate2nix, and niv for dependency management 2020-06-23 20:51:32 +03:00