Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'yusdacra/chore/nix' into 'master'

Browse Source 
build(nix): use default-publish for release builds of voxygen

See merge request veloren/veloren!2556
This commit is contained in:
Ben Wallis
2021-07-05 06:26:50 +00:00
parent dcdf1c83a3 055a46e3aa
commit e05a79e6c4
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock generated
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"devshell": { "devshell": {
"locked": { "locked": {
"lastModified": 1624738949, "lastModified": 1625086391,
"narHash": "sha256-62pEoJ1jQARZ/fAuTw67j8MqTShd8BBm+ZoSs7aeJus=", "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "d4be23644b0b6471d556503e03cae3215d3f9cf6", "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -24,11 +24,11 @@
"rustOverlay": "rustOverlay" "rustOverlay": "rustOverlay"
}, },
"locked": { "locked": {
"lastModified": 1624760770, "lastModified": 1625378930,
"narHash": "sha256-6dVQ0B0DJf6BPGl49MA/V0QhEh8rky1TX2qaP/XWzpY=", "narHash": "sha256-iBnCmrLweBmtN9VkG6AX4wSE5UUF//4VtfX6Ebhbaew=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "89de4b1e831d6e8572e713fc3b3a016157f8c3ba", "rev": "4d6efcfd0bc6c6235b180837257ab8020f108c23",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1624668028, "lastModified": 1625375231,
"narHash": "sha256-FUxvXMBPQ5jrGhS47jwBFZQte0yDkMCBI5M24mJi5X0=", "narHash": "sha256-dbp2RRftypbAYad/xhDBBG0N7s1WQW+T4jazimvtvRo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e85975942742a3728226ac22a3415f2355bfc897", "rev": "8aff53d3cf23b5eb67c0ba9ba2392d694ade3930",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,11 +62,11 @@
"rustOverlay": { "rustOverlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1624760275, "lastModified": 1625364738,
"narHash": "sha256-GVHe1Pshxf56kpu1YDTH2zBYE6HkdT181EPqkTIijp4=", "narHash": "sha256-TPlpEcywGnB8jNIPOlCqFVbioskGOpasrVhxdw0BHzA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "50c100eab4bf1cb9eb7a99ac1b8201fe9eb8a4e0", "rev": "f08a653d9d6bbf06b5cc5dd1e570f1c449acbcf3",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@ -20,6 +20,10 @@
overrides = { overrides = {
build = common: prev: { build = common: prev: {
runTests = !prev.release && prev.runTests; runTests = !prev.release && prev.runTests;
rootFeatures =
if prev.release && common.cargoPkg.name == "veloren-voxygen"
then [ "default-publish" ]
else prev.rootFeatures;
}; };
crateOverrides = common: prev: crateOverrides = common: prev:
let let