1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Commit graph

34589 commits

Author SHA1 Message Date
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
adisbladis 408f6b2843
pythonPackages.pycurl: Move to separate file 2018-03-16 01:14:12 +08:00
adisbladis a2a7037937
Merge pull request #37038 from dtzWill/update/pycurl-7.43.0.1
pycurl: 7.19.5.1 -> 7.43.0.1
2018-03-16 01:08:04 +08:00
Timo Kaufmann 488835ec6e conan: Locally pin deps, enable tests 2018-03-15 13:48:58 +01:00
lewo a3205ea5f3
Merge pull request #36928 from roosemberth/pcm
pcm: init at 201710
2018-03-15 08:48:40 +01:00
Andrew Dunham 92a77abd31 xgboost: Enable building on Darwin (#37046)
* xgboost: Enable building on Darwin

* Review feedback: pass `xgboost` to the python package
2018-03-15 04:17:55 +03:00
Herwig Hochleitner 80582c600d vimb-unwrapped: depend on generic webkitgtk instead of 218x
Currently ahead of the upgrade to webkitgtk220x, this will make future
webkitgtk maintenance easier.

WebkitGTK, from 2.6 onwards has maintained API stability and will
continue to do so, as opposed to the jump from 2.4 to 2.6

cc @rickynils
2018-03-15 01:52:52 +01:00
John Ericson 2e87550ace
Merge pull request #36985 from obsidiansystems/no-allBut
treewide: get rid of platforms.allBut
2018-03-14 18:57:28 -04:00
Will Dietz 99131b4fc2 pycurl: 7.19.5.1 -> 7.43.0.1 2018-03-14 17:50:25 -05:00
John Ericson f79f80dbf2 treewide: get rid of platforms.allBut
Negative reasoning like `allBut` is a bad idea with an open world of
platforms. Concretely, if we add a new, quite different sort of
platform, existing packages with `allBut` will claim they work on it
even though they probably won't.
2018-03-14 18:44:42 -04:00
Robert Schütz d78a411d98
Merge pull request #36899 from aborsu/spacy
Spacy
2018-03-14 23:36:46 +01:00
Daiderd Jordan 0c8e8ce7e8
cdo: fix darwin build
/cc ZHF #36454
2018-03-14 23:16:31 +01:00
Daiderd Jordan ee6d0a7025
ccl: fix darwin build
/cc ZHF #36454
2018-03-14 23:02:52 +01:00
Joachim F bfb4e0822a
Merge pull request #36482 from matthewbauer/json2hcl
json2hcl: init at 0.0.6
2018-03-14 20:51:12 +00:00
Roosembert Palacios 3328709918
pcm: init at 201710
Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
2018-03-14 21:28:55 +01:00
Will Dietz 66a0aaddbb
Merge pull request #37016 from dtzWill/feature/gllvm
gllvm: init at 2018-02-09
2018-03-14 15:01:29 -05:00
Will Dietz 43c474457c gllvm: init at 2018-02-09 2018-03-14 14:50:17 -05:00
Daiderd Jordan f18a23acf3
Merge pull request #37008 from knedlsepp/fix-pycurl-on-darwin
pythonPackages.pycurl: Fix darwin build
2018-03-14 20:43:01 +01:00
Daiderd Jordan db691029d6
avian: fix darwin build
/cc ZHF #36454
2018-03-14 20:38:54 +01:00
Augustin Borsu 5568e25fa0 python.msgpack-numpy: init 0.4.1 2018-03-14 20:29:07 +01:00
Robert Schütz 6d661f37d8
Merge pull request #34361 from mbode/doitlive_3_0_3
doitlive: init at 3.0.3
2018-03-14 20:18:48 +01:00
Maximilian Bode 2217c706d4 doitlive: init at 3.0.3 2018-03-14 20:00:00 +01:00
Josef Kemetmüller 42555f6c7d pythonPackages.pycurl: Fix darwin build 2018-03-14 19:58:02 +01:00
Daiderd Jordan 9b044a1dba
python-tkinter: mark linux only
/cc ZHF #36454
2018-03-14 19:52:34 +01:00
xeji b298f4e185 pythonPackages.nevow: fix build, 0.14.2->0.14.3
fix tests, minor update, move to development/python-modules/

(cherry picked from commit 9a10c55a8a)
2018-03-14 19:05:47 +01:00
Robert Schütz c8a7aa1e1b
Merge pull request #36944 from xeji/nevow
python27Packages.nevow: fix build, 0.14.2->0.14.3
2018-03-14 19:04:49 +01:00
Nikolay Amiantov dc2104d132 sleekxmpp: 1.3.1 -> 1.3.3 2018-03-14 20:45:31 +03:00
xeji 9a10c55a8a pythonPackages.nevow: fix build, 0.14.2->0.14.3
fix tests, minor update, move to development/python-modules/
2018-03-14 18:41:45 +01:00
Vincent Laporte 4fcadba5ea ocamlPackages: default to 4.05 2018-03-14 16:24:27 +01:00
Michael Raskin 352c567d1c graphviz_2_32: restore libgraph, the reason to keep this version 2018-03-14 11:45:16 +01:00
mt_caret cce7d1b60a satysfi: init at 2018-03-07 (#36428) 2018-03-14 10:57:08 +01:00
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Franz Pletz 50fdcd414e
Merge pull request #36888 from volth/xfce-naming
xfce: do not use old names
2018-03-13 18:44:59 +00:00
Will Dietz 29d46471e0 metrics: fix "values" to be count not bytes, to match prev behavior
https://github.com/NixOS/nixpkgs/pull/36896#discussion_r174163744
2018-03-13 13:29:15 -05:00
Franz Pletz 4b72196874
Merge pull request #36806 from timokau/conan-fix
conan: Fix build
2018-03-13 13:16:21 +00:00
Peter Simons 54ade273e7
Merge pull request #36526 from idontgetoutmuch/master
Add sundials
2018-03-13 13:29:17 +01:00
Eelco Dolstra 2aa8a208b0
Merge pull request #36896 from dtzWill/fix/metrics-sed
metrics: fixup sed expr to work with Nix 2
2018-03-13 13:24:35 +01:00
Timo Kaufmann 5fdfe61b35 conan: Fix build
conan has very strict requirements on the versions of its dependencies.
This patch adds downgraded versinos of node-semver and distro to
statisfy these requirements.
2018-03-13 11:36:45 +01:00
volth 7ec0471242 treewide: s/xlibs/xorg/g (#36889) 2018-03-13 10:16:03 +00:00
adisbladis ce78db79a3
overmind: init at 1.1.1 2018-03-13 17:44:00 +08:00
volth cedfe31648 frostwire: restore download-and-unpack derivation as frostwire-bin 2018-03-13 09:54:51 +01:00
Will Dietz 5eb07e2396 metrics: fixup sed expr to work with Nix 2 2018-03-12 22:49:17 -05:00
Michael Weiss 310a665b98 androidStudioPackages.beta: 3.1.0.12 -> 3.1.0.14 2018-03-13 02:29:01 +01:00
Franz Pletz efd7102026
Merge pull request #36814 from xeji/p/ufraw
ufraw: fix build
2018-03-12 23:37:06 +00:00
Franz Pletz 73f8157adc
Merge pull request #36817 from xeji/p/vxl
vxl: fix build by using gcc6
2018-03-12 23:29:12 +00:00
Franz Pletz a1af032fcc
Merge pull request #36776 from Ma27/fix-gplaycli
pythonPackages.gplaycli: 0.1.2 -> 3.21
2018-03-12 23:27:44 +00:00
volth fe70fbdefe xfce: do not use old names 2018-03-12 23:01:06 +00:00
Nikolay Amiantov bef8321f9f kega-fusion: init at 3.63x 2018-03-13 01:08:50 +03:00
Nikolay Amiantov 5ed883a40b warsow: 1.03 -> 2.1.2
Fix build, split into engine and game to build engine on Hydra.
2018-03-13 01:08:50 +03:00
Amine Chikhaoui d5dd7f4413 pcstat: init at 2017-05-28 (#33643) 2018-03-12 21:51:38 +00:00