Commit graph

76248 commits

Author SHA1 Message Date
Nikolay Amiantov 82a0dde83c dwarf-fortress: remove short md5 sums 2016-01-26 03:06:57 +03:00
Nikolay Amiantov d3b642ce9a dwarf-fortress-wrapper: add themes support
Theme can be specified either as a derivation or as a string, in which
case it will be taken by name from a pre-defined set of themes available in
nixpkgs.
2016-01-26 03:06:07 +03:00
Nikolay Amiantov 7fe01a7279 phoebus-theme: update for 0.42.05, make a derivation
Also specify license, see https://github.com/fricy/Phoebus/issues/5
2016-01-26 03:05:50 +03:00
Adam Russell 6c9dd96377 dwarf-fortress: add phoebus 2016-01-26 03:05:49 +03:00
Nikolay Amiantov fdae86fb4e dwarf-therapist: 31.0.0 -> 36.0.0 2016-01-26 03:05:38 +03:00
Nikolay Amiantov 92cda7a6bb dwarf-fortress: 0.40.24 -> 0.42.05, split derivations
This is a massive rework of the current dwarf_fortress package.
The main reason for rework is to split game, its libraries and wrappers,
enabling builds on Hydra and general maintainability.

dfhack, dwarf-fortress-unfuck, dwarf-fortress-original and dwarf-fortress
are now all separate derivations. All were updated to the latest versions
supporting DF 0.42.04 (some things taken from development branches):

dfhack: 20150927 -> 20160118
dwarf-fortress-unfuck: 0.40.24 -> 20160118
dwarf-fortress-original: 0.40.24 -> 0.42.05

dfhack got a patch for using more system libraries.

Wrapper scripts were also redone -- now they support DF_DIR variable (for
setting another data directory) and try to save more space by means of
symlinking. They now try to be more smart, updating those directories that were
not touched by user automatically.

All the new packages now reside in dwarf-fortress-packages. dwarf_fortress was
renamed into dwarf-fortress per our conventions, old name is deprecated. Also
duplicate dfhack derivation is removed.

Also drop dwarfFortress.enableDFHack config option; it can be re-added later
but now is deemed controversial.
2016-01-26 03:03:12 +03:00
Jascha Geerds 9e56b18cde morituri: Add missing platforms attribute 2016-01-25 23:13:21 +01:00
Nikolay Amiantov 5bc8f09b65 Merge pull request #12577 from zohl/flashplayer
Standalone flashplayers
2016-01-26 00:49:02 +03:00
John Wiegley 5009b4a8cf coq_8_5: 8.5rc1 -> 8.5 2016-01-25 12:33:31 -08:00
Arseniy Seroka e395cb0214 Merge pull request #12601 from tomberek/gateone_update
Gateone: fix cacerts dependency
2016-01-25 23:14:53 +03:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Tobias Geerinckx-Rice 7b6454cbb9 geolite-legacy 2016-01-18 -> 2016-01-25 2016-01-25 16:37:13 +01:00
Shea Levy 495e8a6906 rt: Include version in drv 2016-01-25 10:21:09 -05:00
Vincent Laporte c0691a0659 compcert: 2.5 -> 2.6 2016-01-25 11:48:47 +01:00
Vladimír Čunát 1f2b819783 binutils: extend meta.platforms to unix to fix #12606
Also refactor meta.
Maybe we could have platforms.all in there, but I leave it here.
2016-01-25 11:18:10 +01:00
Eelco Dolstra 310aadc48b Merge pull request #12557 from ryanartecona/nixos-manual-custom-options
NixOS manual: allow options from nix packages
2016-01-25 10:43:39 +01:00
Franz Pletz ff51021920 Merge pull request #12590 from exi/askpass-in-env
nixos-ssh: set SSH_ASKPASS globally and not just on interactive shells
2016-01-25 10:42:31 +01:00
Nikolay Amiantov 3622038d20 easyrsa2: init at 2.2.0 2016-01-25 12:14:01 +03:00
Tomasz Czyż 7362936cd6 quicksynergy: init at 0.9.0 (close #12325)
vcunat moved `version` into the derivation.
2016-01-25 09:30:00 +01:00
Vladimír Čunát 3e1599f57b nixos-generate-config: fix #12595: broadcom quoting 2016-01-25 07:57:53 +01:00
Jude Taylor c473bea69a Merge pull request #12603 from zimbatm/ruby-fixes
Ruby fixes
2016-01-24 22:48:14 -08:00
Tobias Geerinckx-Rice 626c09bb46 scanbd: init at 1.4.4 2016-01-25 03:43:19 +01:00
Tobias Geerinckx-Rice 87df7fc745 sane-backends: propagate libjpeg library path 2016-01-25 03:43:18 +01:00
Tobias Geerinckx-Rice c5bb4f503b libconfuse: init at 2.8 2016-01-25 02:48:27 +01:00
Tobias Geerinckx-Rice d186a66d33 sane-backends-git -> 2016-01-25 2016-01-25 01:40:20 +01:00
zimbatm e9eda43928 buildRubyGem: fix missing libobjc in darwin
This was preventing any ruby gem with a c extension to build.

mkmf would fail with a misleading error:

    /nix/store/dmkcai8fnv21qxiasx628nim3mq4r4wg-ruby-2.2.3-p0/lib/ruby/2.2.0/mkmf.rb:456:in `try_do': The compiler failed to generate an executable file. (RuntimeError)
    You have to install development tools first.
2016-01-24 23:15:40 +00:00
zimbatm 9a55295c49 buildRubyGem: fix NoMethodError
generate_stub doesn't exist and the output is not used in the code so I just
removed the line.

This was preventing the binstubs from generating properly.
2016-01-24 23:14:00 +00:00
Charles Strahan 95d892ec26 ghcjs: update and fix ghcjs/reflex libs
Set dontStrip when building ghcjs libs, which fixes the ghcjs-dom lib
and also makes the logs cleaner.
2016-01-24 17:13:45 -05:00
Thomas Bereknyei 80d38d12b4 Gateone: fix cacerts dependency 2016-01-24 16:52:06 -05:00
Arseniy Seroka e9950f465c Merge pull request #12566 from sheganinans/master
kdbplus bump
2016-01-24 23:24:36 +03:00
Arseniy Seroka 10f7070bf0 Merge pull request #12221 from spinus/solaar
solaar: init at 0.9.2
2016-01-24 23:16:12 +03:00
Arseniy Seroka 988fcf8890 Merge pull request #12561 from Baughn/factorio
factorio: init at 0.12.20
2016-01-24 23:13:49 +03:00
Arseniy Seroka d6d22151fa Merge pull request #12588 from dezgeg/pr-binutils-platforms
binutils: Add platforms
2016-01-24 23:12:14 +03:00
Peter Simons afba955d21 Merge pull request #12598 from cstrahan/haskell-post-patch
haskell-packages: properly set postPatch
2016-01-24 21:06:52 +01:00
Tobias Geerinckx-Rice 76b2ffbb08 Merge pull request #12587 from timbertson/gup
gup: 0.5.1 -> 0.5.3
2016-01-24 20:48:38 +01:00
Eric Seidel dd6d4ca8cc racket: change meta.platorms to unix 2016-01-24 11:33:34 -08:00
Frederik Rietdijk 28b460cdaa pythonPackages.CommonMark: disable tests 2016-01-24 19:51:17 +01:00
Frederik Rietdijk 33c3e2e404 pythonPackages.xarray: fix test runner 2016-01-24 19:51:17 +01:00
Frederik Rietdijk 63353f9270 pythonPackages.cloudpickle: disable tests 2016-01-24 19:51:17 +01:00
Frederik Rietdijk 6f32d2a805 pythonPackages.tinycss: fix tests 2016-01-24 19:51:16 +01:00
Frederik Rietdijk b194f07fda pythonPackages.dask: fix test runner, disable tests 2016-01-24 19:51:16 +01:00
Frederik Rietdijk 08d43cd52e pythonPackages.cloudpickle: init at 0.1.1 2016-01-24 19:51:16 +01:00
Frederik Rietdijk 3f82220c38 pythonPackages.umalqurra: no tests included 2016-01-24 19:51:16 +01:00
Frederik Rietdijk 6d478b3faf pythonPackages.seaborn: fix test runner, disable tests 2016-01-24 19:51:15 +01:00
Frederik Rietdijk 64e4bdf109 pythonPackages.le: disable tests 2016-01-24 19:51:15 +01:00
Frederik Rietdijk e72f0f2a6c pythonPackages.joblib: 0.9.0b4 -> 0.9.4 2016-01-24 19:51:15 +01:00
Domen Kožar 31e465b584 dill: disable tests 2016-01-24 19:51:15 +01:00
Frederik Rietdijk 707f512c7d fix eval 2016-01-24 19:51:14 +01:00
Frederik Rietdijk af6d9c876c pythonPackages.tinycss: fix test runner 2016-01-24 19:51:14 +01:00