Yusuf Bera Ertan
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
Yusuf Bera Ertan
9f8ec7e010
nix: refactor crateDeps in common to look better
2020-12-12 17:10:54 +03:00
Yusuf Bera Ertan
4c61914b91
nix: remove version from package names
2020-12-12 17:10:54 +03:00
Yusuf Bera Ertan
dd68285d79
nix: fix veloren version string in game, remove obsolete utils
2020-12-12 17:10:54 +03:00
Ludvig Böklin
3870f9d6b3
Fix nix rust channel hash mismatch
2020-12-11 13:36:56 +01:00
Ludvig Böklin
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
Yusuf Bera Ertan
39843e847d
nix: update niv deps, regenerate Cargo.nix, add some comments and remove an unused variable
2020-12-02 23:38:26 +03:00
Yusuf Bera Ertan
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
Justus K
a0ca0c1517
nix: add rust-src component to rust toolchain
2020-12-02 12:48:14 +01:00
Yusuf Bera Ertan
eb730f6904
nix: add .desktop file to veloren-voxygen derivation, update deps and other minor stuff
2020-12-01 00:15:18 +03:00
Yusuf Bera Ertan
bb1a481d1d
nix: add envrc and envrc-nvidia file for auto dev env setup with direnv
2020-11-30 23:51:05 +03:00
Yusuf Bera Ertan
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
Yusuf Bera Ertan
515e444e3d
nix: add git-lfs setup to shell hook for dev shell
2020-11-29 16:59:13 +03:00
Yusuf Bera Ertan
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
Yusuf Bera Ertan
3c7f0e4375
nix: fix build failing when on tag, combine nixpkgs.nix and common.nix
2020-11-28 17:45:58 +03:00
Yusuf Bera Ertan
62d34422fe
fix and improve nix build: actually output a proper veloren voxygen package now
2020-11-25 02:00:50 +03:00
marius david
b15ea2d9bd
fieed and updated nix
2020-08-18 16:51:25 +02:00
Yusuf Bera Ertan
725d9469fd
nix: regenerate Cargo.nix and update niv dependencies
2020-08-10 17:20:52 +03:00
Yusuf Bera Ertan
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
Yusuf Bera Ertan
f6bdc57f1b
nix: Add nixfmt package to shell.nix, update readme
2020-06-23 20:51:32 +03:00
Yusuf Bera Ertan
6cfa48e82e
nix: Switch to crate2nix, and niv for dependency management
2020-06-23 20:51:32 +03:00
