Commit Graph

77221 Commits

Author SHA1 Message Date
Arseniy Seroka
24a536f77d Merge pull request #13126 from zimbatm/ricochet-1.1.2
ricochet: 1.1.1 -> 1.1.2
2016-02-19 22:53:42 +03:00
Arseniy Seroka
ba47df7b47 Merge pull request #13082 from svend/ansible2
ansible2: v2.0.0_0.6.rc1 -> v2.0.0.2
2016-02-19 22:53:31 +03:00
Arseniy Seroka
4e305945dc Merge pull request #13112 from datakurre/datakurre-rabbitpy
rabbitpy: init at 0.26.2
2016-02-19 22:53:11 +03:00
Arseniy Seroka
a2a5d234a5 Merge pull request #13101 from zimbatm/dispad
dispad: init at 0.3.1
2016-02-19 22:52:45 +03:00
Arseniy Seroka
0e95958c18 Merge pull request #13110 from puffnfresh/package/ue4
ue4: init at 4.10.2
2016-02-19 22:52:16 +03:00
vbgl
5ed9176c52 Merge pull request #13077 from wizeman/u/ocaml-packages
Add ocamlPackages.{gen,sequence,containers}
2016-02-19 18:14:47 +01:00
Frederik Rietdijk
d3482be0e5 Merge pull request #12886 from pstn/master
Allow kpcli to work with xclip
2016-02-19 17:14:50 +01:00
Pascal Wittmann
cb2362a2d3 Merge pull request #13083 from svend/jenkins-job-builder
jenkins-job-builder: 1.3.0 -> 1.4.0
2016-02-19 17:08:41 +01:00
Pascal Wittmann
7309804597 Merge pull request #13128 from matthiasbeyer/fix-khard
Fix broken "khard"
2016-02-19 17:08:06 +01:00
Matthias Beyer
24edc61fcd khard: Fix version 0.8.1 runtime error by rewriting dependencies 2016-02-19 16:31:43 +01:00
zimbatm
360b5ab9b6 Merge pull request #13123 from nfjinjing/shadowsocks-libev
shadowsocks-libev: init at 2.4.5
2016-02-19 14:29:19 +00:00
zimbatm
883b788ab0 ricochet: 1.1.1 -> 1.1.2 2016-02-19 14:18:48 +00:00
Jinjing Wang
6f466c9dad shadowsocks-libev: init at 2.4.5 2016-02-19 20:58:12 +08:00
Vladimír Čunát
4b581903b3 requireFile: preferLocalBuild = true
There's no point trying to "distribute" showing the error message.
2016-02-19 13:47:50 +01:00
zimbatm
c6d9d8dfa1 Merge pull request #13088 from ebzzry/ugarit-2.0
ugarit: init at 2.0
2016-02-19 12:39:00 +00:00
Thomas Tuegel
7bca3cd8dc kde5: reduce default installation size 2016-02-19 06:21:50 -06:00
Thomas Tuegel
44aed98556 kde5.frameworks: 5.18.0 -> 5.19.0 2016-02-19 06:19:26 -06:00
Pascal Wittmann
7dc93ebdff Merge pull request #13090 from ebzzry/xboxdrv-0.8.8
xboxdrv: 0.8.5 -> 0.8.8
2016-02-19 13:13:57 +01:00
Damien Cassou
dda9f0ba23 Merge pull request #13098 from DamienCassou/vdirsyncer-0.9.0
vdirsyncer: 0.8.1 -> 0.9.0
2016-02-19 12:48:27 +01:00
Damien Cassou
38f0628928 vdirsyncer: 0.8.1 -> 0.9.0 2016-02-19 12:44:49 +01:00
Rommel M. Martinez
54a29f2fca ugarit: init at 2.0 2016-02-19 19:40:20 +08:00
Nikolay Amiantov
b457b7a7ea Merge pull request #13069 from abbradar/m3d
OctoPrint and plugins and support for M3D Micro 3D-printer
2016-02-19 14:27:32 +03:00
Nikolay Amiantov
b64192744a steamPackages.runtime: 20151020 -> 2016-02-18 2016-02-19 14:10:19 +03:00
Nikolay Amiantov
e41c80e790 steamPackages: add runtime-mirror helper derivation 2016-02-19 14:10:13 +03:00
Nikolay Amiantov
9525abdeec steamPackages.runtime: use mirrors, add my mirror 2016-02-19 14:10:09 +03:00
Jascha Geerds
14f1ff80ce gnome3.eog: 3.18.1 -> 3.18.2 2016-02-19 11:32:01 +01:00
Philipp Steinpass
9d1501437d Added perl packages that allow kpcli to work with xclip, squashed fixes. 2016-02-19 11:21:52 +01:00
Domen Kožar
b5d9636c66 Merge pull request #13118 from FRidh/buildPythonApplication
buildPythonApplication: function for building Python applications
2016-02-19 10:05:35 +00:00
Eelco Dolstra
88f5d1c8ba Move CONTRIBUTING.md to .github
See https://github.com/blog/2111-issue-and-pull-request-templates.
2016-02-19 10:59:38 +01:00
Edward Tjörnhammar
65be213581 pythonPackages.ptest: init at 1.5.3 2016-02-19 10:35:37 +01:00
Edward Tjörnhammar
5584ad1dc5 pythonPackages.requests_toolbelt: add test phase dependencies 2016-02-19 10:35:37 +01:00
Frederik Rietdijk
49c68939db buildPythonApplication: function for building Python applications
Currently, the only difference is that namePrefix is not set
2016-02-19 10:30:50 +01:00
Frederik Rietdijk
cc58339345 pythonPackages.scikitlearn: 0.17 -> 0.17.1 2016-02-19 09:07:34 +01:00
Bjørn Forsman
7177d4fa6b live555: 2015.10.12 -> 2016.02.09 (unbreaks download)
The old version is not available in the mirrors.

Build tested with vlc, the only immediate dependee.
2016-02-19 08:28:05 +01:00
Asko Soukka
bfea299a6a rabbitpy: init at 0.26.2 2016-02-19 07:07:48 +02:00
Brian McKenna
392699a82d ue4: init at 4.10.2
This builds Unreal Engine 4 and has a wrapper to start the editor.

Sadly the application requires write access to a lot of paths. I have a
hack to do a symlink tree under $HOME and it works well, the UE4Editor
binary just needs to be not a symlink.
2016-02-19 14:41:51 +11:00
Charles Strahan
412dd80149 Merge pull request #13093 from cstrahan/ghcjs-fix-rebase
Fix GHCJS for cabal-install-1.22.8.0
2016-02-18 19:24:01 -05:00
Charles Strahan
c374ce26b0 ghcjs-shims: 2016/01/07 -> 2016/02/10
Bump revisions: 45f44f5f027 -> 4df1808d031
2016-02-18 19:15:02 -05:00
Charles Strahan
516057ffa9 ghcjs: replace integer-simple with integer-gmp
GHCJS uses integer-gmp, but cabal2nix generates a dependency list that
includes integer-simple instead. This tweaks the stage2 generator to
replace any instance of integer-simple with integer-gmp.

Things currently still work without this change (assuming
integer-simple is defined as null), as ghcjs includes integer-gmp in
its stage1 packages - so it's always available.

However, this change makes things a bit more explicit, rather than
leaving things to chance. If at any point the stage1 packages are also
split up into separate derivations, the integer-gmp package will need to
be passed along to the packages that depend on it. This change should
prevent some confusion going forward.
2016-02-18 18:32:58 -05:00
Charles Strahan
e6e9970891 ghcjs: don't propagate Cabal to all packages
Previously, we were compiling Setup.hs with ghcjs (instead of  ghc),
and that required that Cabal be available, otherwise the Setup.hs would
fail to compile.

Now that we are compiling Setup.hs with ghc, it's no longer necessary
to add Cabal as a dependency to all ghcjs packages.
2016-02-18 15:00:34 -05:00
Bjørn Forsman
b2b1511353 nixos/collectd: add defaultText to package option
CC @fpletz
2016-02-18 20:30:05 +01:00
Eelco Dolstra
8af685d089 Merge pull request #13097 from jerith666/antrun
ant: preserve antRun script
2016-02-18 19:48:12 +01:00
Shea Levy
c4910af815 Merge branch 'redis-3.0.7' of https://github.com/kragniz/nixpkgs 2016-02-18 13:30:57 -05:00
Eelco Dolstra
7b2ac69ada aws-sdk-cpp: Allow building some APIS and disabling custom memory management 2016-02-18 19:29:40 +01:00
Eelco Dolstra
42255f8945 Merge pull request #13087 from rasendubi/gdb_multitarget
gdb: add multitarget option
2016-02-18 19:14:41 +01:00
Arseniy Seroka
5a7ff03fe6 Merge pull request #12923 from mboes/update-spark
spark: 1.5 -> 1.6.
2016-02-18 20:37:20 +03:00
Louis Taylor
6326172fed redis: 3.0.6 -> 3.0.7 2016-02-18 17:36:36 +00:00
Mathieu Boespflug
936312879c spark: 1.4 -> 1.6. 2016-02-18 18:29:44 +01:00
zimbatm
cb10518806 dispad: init at 0.3.1 2016-02-18 17:14:17 +00:00
Luca Bruno
b7c57c831f Merge pull request #13099 from datakurre/datakurre-dockertools
dockerTools: Fix issue where image name with repository prefix was no…
2016-02-18 17:30:54 +01:00