Commit Graph

32 Commits

Author SHA1 Message Date
Yusuf Bera Ertan
4191b341d0
build(nix): update flake deps 2022-12-19 01:03:50 +03:00
Yusuf Bera Ertan
dd6c33bab7
fix: update flake 2022-12-18 04:25:45 +03:00
Yusuf Bera Ertan
58e74a26cd
Revert "Merge branch 'revert-441acd3e' into 'master'"
This reverts commit f170da4da6, reversing
changes made to aa7569061b.
2022-09-08 12:28:56 +03:00
Joshua Yanovski
e55b541bcc Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
This reverts merge request !2951
2022-09-08 08:33:35 +00:00
Yusuf Bera Ertan
cdfb2ae040
build(nix): fix recompilation issues and improve build overhead 2022-09-07 02:42:37 +03:00
Yusuf Bera Ertan
511922baa5
build(nix): use correct linker in main derivation compile 2022-09-04 16:46:45 +03:00
Yusuf Bera Ertan
960aac307d
build(nix): refactor flake with new nci 2022-09-04 01:26:34 +03:00
Yusuf Bera Ertan
8c4c0c2021
build(nix): update flake deps 2022-09-03 07:06:56 +03:00
Yusuf Bera Ertan
7f3100cc2c
build(nix): update flake deps 2022-09-03 02:32:38 +03:00
Yusuf Bera Ertan
b442b016a6
build(nix): add source filtering for server-cli, use mold for server-cli too 2022-09-03 01:57:24 +03:00
Yusuf Bera Ertan
9c307e3e23
build(nix): update deps 2022-09-02 21:39:44 +03:00
Yusuf Bera Ertan
5b901d9775
build(nix): update flake lock, fix stuff 2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
99cb326e54
chore(nix): update flake lock 2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
2afcc7195b
build(nix): fix lib not found error 2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
b9586673d5
build(nix): update flake to use latest nix-cargo-integration 2022-09-02 21:13:56 +03:00
Yusuf Bera Ertan
3952d8b86f
chore(deps): update nix flake deps 2021-08-03 17:45:41 +03:00
Ludvig Böklin
400734cc0a Fix gliderwield downhill run jitter 2021-08-01 11:20:46 +00:00
Yusuf Bera Ertan
055a46e3aa
build(nix): use default-publish for release builds of voxygen 2021-07-05 05:06:41 +03:00
Yusuf Bera Ertan
b8249cc64c
build(nix): fix audio resource patching 2021-06-27 23:23:01 +03:00
Yusuf Bera Ertan
1b3a8db8d4
build(nix): update audio resource patch 2021-06-23 08:52:04 +03:00
Yusuf Bera Ertan
81bc3d1966
build(nix): fix git ref not found and git lfs check 2021-06-19 22:05:22 +03:00
Yusuf Bera Ertan
e27a6fcaa1
build(nix): switch back to master branch nix-cargo-integration, use defaultOutputs 2021-06-13 19:33:38 +03:00
Yusuf Bera Ertan
faf5b3fc9c
chore(deps): update nix flake deps 2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
221e848b71
chore(deps): update nix flake deps 2021-06-03 23:33:13 +03:00
Yusuf Bera Ertan
57bfe95939
chore(deps): update nix flake deps 2021-05-04 11:57:14 +03:00
Yusuf Bera Ertan
aecdd19767
chore(deps): update nix flake deps 2021-04-29 05:01:05 +03:00
Yusuf Bera Ertan
685f4971ac
build(nix): switch to crate2nix 2021-04-27 05:18:12 +03:00
Yusuf Bera Ertan
62844d816a
build(nix): switch to nix-cargo-integration 2021-04-17 21:37:57 +03:00
Yusuf Bera Ertan
ff1d86cee3
chore(deps): update nix flake lock 2021-04-15 00:19:55 +03:00
Yusuf Bera Ertan
e9a7ff7dd7
build(nix): switch to naersk 2021-03-23 16:02:47 +03:00
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
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