dd6c33bab7
fix: update flake
2022-12-18 04:25:45 +03:00
58e74a26cd
Revert "Merge branch 'revert-441acd3e' into 'master'"
...
This reverts commit f170da4da6aa7569061b
2022-09-08 12:28:56 +03:00
e55b541bcc
Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
...
This reverts merge request !2951
2022-09-08 08:33:35 +00:00
999984d15a
build(nix): refactor, dont pass git hash and tag
2022-09-03 16:00:11 +03:00
1302b7da77
docs(nix): update formatting instructions
2022-09-02 21:13:57 +03:00
a0b7446f58
build(nix): format nix files, fix git lfs error
2022-09-02 21:13:57 +03:00
120ee6b6c0
Fix typos
2022-07-15 18:59:37 +02:00
88eca50c36
docs(nix): add notice for vulkan driver error potentially relating to nixpkgs mismatches
2021-08-03 17:45:42 +03:00
b8249cc64c
build(nix): fix audio resource patching
2021-06-27 23:23:01 +03:00
1b3a8db8d4
build(nix): update audio resource patch
2021-06-23 08:52:04 +03:00
81bc3d1966
build(nix): fix git ref not found and git lfs check
2021-06-19 22:05:22 +03:00
685f4971ac
build(nix): switch to crate2nix
2021-04-27 05:18:12 +03:00
abad01ee87
build(nix): add git-lfs setup instructions for nix into git-lfs check abort message
2021-04-17 21:37:59 +03:00
62844d816a
build(nix): switch to nix-cargo-integration
2021-04-17 21:37:57 +03:00
6331f4e1cc
build(nix): remove useless rustpkgs
2021-04-15 00:28:35 +03:00
6c13cf930e
docs(nix): update nix commands to match latest nix changes
2021-03-27 12:41:35 +03:00
e9a7ff7dd7
build(nix): switch to naersk
2021-03-23 16:02:47 +03:00
726cfcb8c9
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
582ddfc3cd
Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot
2021-02-09 13:52:03 +01:00
0b4aeb5794
Cargo.nix override instead of requiring manual intervention
2020-12-17 12:15:47 +01:00
4a11356f50
nix chore: regenerate Cargo.nix
2020-12-14 18:13:01 +03:00
9ecaba8552
nix: workaround an issue with crate2nix, change some errors to be more clear
2020-12-12 21:14:29 +03:00
c5a7db06fb
nix: better instructions for nixGL
2020-12-12 17:53:48 +03:00
23d1abc8a6
nix: add missing dependency xcb
2020-12-12 17:26:02 +03:00
b75a5ab32c
nix: regenerate Cargo.nix
2020-12-12 17:11:51 +03:00
64812249ad
nix: add bundle subcommand usage
2020-12-12 17:10:55 +03:00
9e62a6c322
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
9f8ec7e010
nix: refactor crateDeps in common to look better
2020-12-12 17:10:54 +03:00
4c61914b91
nix: remove version from package names
2020-12-12 17:10:54 +03:00
dd68285d79
nix: fix veloren version string in game, remove obsolete utils
2020-12-12 17:10:54 +03:00
3870f9d6b3
Fix nix rust channel hash mismatch
2020-12-11 13:36:56 +01:00
3f498522db
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
39843e847d
nix: update niv deps, regenerate Cargo.nix, add some comments and remove an unused variable
2020-12-02 23:38:26 +03:00
1a8caaf4de
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
a0ca0c1517
nix: add rust-src component to rust toolchain
2020-12-02 12:48:14 +01:00
eb730f6904
nix: add .desktop file to veloren-voxygen derivation, update deps and other minor stuff
2020-12-01 00:15:18 +03:00
bb1a481d1d
nix: add envrc and envrc-nvidia file for auto dev env setup with direnv
2020-11-30 23:51:05 +03:00
3c7d682361
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
515e444e3d
nix: add git-lfs setup to shell hook for dev shell
2020-11-29 16:59:13 +03:00
e0096a1a91
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
3c7f0e4375
nix: fix build failing when on tag, combine nixpkgs.nix and common.nix
2020-11-28 17:45:58 +03:00
62d34422fe
fix and improve nix build: actually output a proper veloren voxygen package now
2020-11-25 02:00:50 +03:00
b15ea2d9bd
fieed and updated nix
2020-08-18 16:51:25 +02:00
725d9469fd
nix: regenerate Cargo.nix and update niv dependencies
2020-08-10 17:20:52 +03:00
f49b4a9908
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
f6bdc57f1b
nix: Add nixfmt package to shell.nix, update readme
2020-06-23 20:51:32 +03:00
6cfa48e82e
nix: Switch to crate2nix, and niv for dependency management
2020-06-23 20:51:32 +03:00
