Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[18.09] fix dwarf fortress package #48469

Merged
merged 9 commits into from Oct 15, 2018
Merged

[18.09] fix dwarf fortress package #48469

merged 9 commits into from Oct 15, 2018

Conversation

Lassulus
Copy link
Member

Motivation for this change

Fix dwarf fortress in 18.09

numinit and others added 9 commits October 15, 2018 17:27
@numinit @Lassulus
dwarf-fortress: Support multiple unfuck/dfhack/TWBT versions
d66a253 
(cherry picked from commit 4ada74e)
@numinit @Lassulus
Fix dfhack's Dwarf Fortress MD5 in the correct environment
5f56347 
(cherry picked from commit f14d3b4)
@numinit @Lassulus
Let the user override dfVersion in dwarf-fortress-full
aa12b85 
(cherry picked from commit 7a55215)
@numinit @Lassulus
Therapist needs to depend on the DF version, since it uses its MD5
99b1a44 
(cherry picked from commit fe847fc)
@numinit @Lassulus
Fix dangling DFHack "Git:" version text
811d527 
(cherry picked from commit 870f05c)
@numinit @Lassulus
Use stdenv.mkDerivation for Therapist wrapper
982080d 
(cherry picked from commit 5f1013d)
@numinit @Lassulus
Update twbt to 6.54
0f3b98a 
(cherry picked from commit 2cd2571)
@numinit @Lassulus
Inline JSON files
35becce 
(cherry picked from commit 213b545)
@Lassulus
dwarf-fortress: fix build error
12847b9 
(cherry picked from commit 0d57159)
@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@Mic92 Mic92 merged commit c15e342 into NixOS:release-18.09 Oct 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Lassulus @GrahamcOfBorg @Mic92 @numinit