3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

82325 commits

Author SHA1 Message Date
Emery Hemingway 79a215e78d dir2opus: 0.12.1 -> 0.12.2 2016-04-25 20:20:20 +02:00
Vladimír Čunát 74a47fcd40 perlPackages.EncodeEUCJPASCII: fix build
Fixes #14986.
2016-04-25 20:08:14 +02:00
Nikolay Amiantov 618c75de7b tdesktop: fix build 2016-04-25 20:47:29 +03:00
Arseniy Seroka fd5ed06b0d Merge pull request #14977 from jerith666/crashplan-46-r3
Crashplan: 4.6.0-r2 -> 4.6.0-r3
2016-04-25 20:38:42 +03:00
Arseniy Seroka 77acc7f019 Merge pull request #14981 from markus1189/asciinema
asciinema: 1.1.1 -> 1.2.0
2016-04-25 20:37:06 +03:00
Allen Nelson 88a1b69090 ordereddict: do not restrict to python2.6 2016-04-25 12:06:34 -05:00
Christoph Hrdinka 2dcf536e44 Merge pull request #14968 from hrdinka/update/qtpass
qtpass: 1.1.0 -> 1.1.1
2016-04-25 18:55:38 +02:00
Markus Hauck 0ec4627d8a asciinema: 1.1.1 -> 1.2.0 2016-04-25 18:42:25 +02:00
Frederik Rietdijk a6f7e0a8a2 Merge pull request #14605 from bcdarwin/python_theano
theano: init at 0.8.1
2016-04-25 18:40:57 +02:00
Ben Darwin a4ad51f0c1 switch from pkgs.blas to numpy.blas 2016-04-25 12:33:31 -04:00
Michael Raskin 496b751313 Merge pull request #14979 from adnelson/purify_lsof
lsof: stop configure script from searching /usr paths
2016-04-25 16:29:59 +00:00
Frederik Rietdijk f2f7ec3f97 Revert "pythonPackages.numpy: don't propagate blas"
This reverts commit 983f300d74.
2016-04-25 18:20:01 +02:00
Frederik Rietdijk 443ac8970d Revert "pythonPackages.scipy: don't propagate blas"
This reverts commit d05783a8d7.
2016-04-25 18:19:50 +02:00
Frederik Rietdijk 164ef75dcc Revert "pythonPackages.qutip: use numpy.blas"
This reverts commit 291ec17c58.
2016-04-25 18:19:37 +02:00
Frederik Rietdijk 3dc10d62de Revert "pythonPackages.scikitlearn: don't propagate blas"
This reverts commit 18396e8273.
2016-04-25 18:19:13 +02:00
Franz Pletz a8f1a96540 libeatmydata: 82 -> 105 2016-04-25 18:15:52 +02:00
Franz Pletz e16851b900 networking module: Add some missing literalExample 2016-04-25 18:15:52 +02:00
Allen Nelson b48e1dd601 lsof: stop configure script from searching /usr paths 2016-04-25 11:14:22 -05:00
Matt McHenry 344f1c19aa crashplan: 4.6.0-r2 -> 4.6.0-r3 2016-04-25 12:14:10 -04:00
Eric Seidel 7e92ae903e fish: only use kbd on linux 2016-04-25 09:13:06 -07:00
Eric Seidel 2177bf3074 fossil: add libiconv on darwin 2016-04-25 09:12:05 -07:00
Matt McHenry 8262d7bdd4 crashplan: always overwrite binaries in /var/lib/ to ensure that updates are applied fully 2016-04-25 12:11:50 -04:00
Frederik Rietdijk 14b704c842 Merge pull request #14975 from FRidh/pythonblas
Python: don't propagate blas
2016-04-25 18:00:36 +02:00
Frederik Rietdijk 5649788371 pythonPackages.scipy_0_16: use correct numpy 2016-04-25 17:58:24 +02:00
Frederik Rietdijk 18396e8273 pythonPackages.scikitlearn: don't propagate blas 2016-04-25 17:58:24 +02:00
Frederik Rietdijk 291ec17c58 pythonPackages.qutip: use numpy.blas 2016-04-25 17:47:05 +02:00
Frederik Rietdijk d05783a8d7 pythonPackages.scipy: don't propagate blas 2016-04-25 17:46:15 +02:00
Frederik Rietdijk 983f300d74 pythonPackages.numpy: don't propagate blas 2016-04-25 17:46:06 +02:00
Eric Merritt cd27abe751 rebar3: refactor
cleanup up the code quite a bit in the bootstrapper
2016-04-25 08:34:55 -07:00
Tuomas Tynkkynen 26f90102b8 openssl: fix indentation 2016-04-25 18:19:40 +03:00
Vladimír Čunát c7377b0e4a zlib, bash: mass-rebuild cleanup 2016-04-25 17:12:49 +02:00
Nikolay Amiantov a5cf243134 Merge branch 'staging' of ssh://github.com/NixOS/nixpkgs into staging 2016-04-25 18:03:35 +03:00
Nikolay Amiantov 62616ec5e2 Merge commit 'refs/pull/14907/head' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:47 +03:00
Nikolay Amiantov 5e85760ff1 Merge commit 'refs/pull/14909/head' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:32 +03:00
Nikolay Amiantov 5f19542581 Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:23 +03:00
Nikolay Amiantov 09f02b918e Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:10 +03:00
Vladimír Čunát f9e5eccb13 Merge #14953: fix fallout after splitting nix
I rebased this against master to avoid getting staging commits for now.
2016-04-25 16:46:19 +02:00
Tuomas Tynkkynen 1d4b21ef42 treewide: Use correct output of config.nix.package in non-string contexts 2016-04-25 16:44:38 +02:00
Tuomas Tynkkynen 60f5659dad treewide: Use correct output in ${config.nix.package}/bin 2016-04-25 16:44:37 +02:00
Tuomas Tynkkynen bee04a37ad amazon-init.nix: Use makeBinPath
This also fixes the incorrect use of 'dev' outputs from
config.nix.package and pkgs.systemd.
2016-04-25 16:44:37 +02:00
Tuomas Tynkkynen 70f5c840af nix-daemon service: Don't have the output in the `nix.package' option
1) It unnecessarily exposes implementation details.
2) It breaks all existing configs that have e.g.
   `nix.package = pkgs.nixUnstable;`.
2016-04-25 16:44:37 +02:00
Nikolay Amiantov 559a563208 Merge pull request #14971 from rardiol/the-powder-toy
the-powder-toy: 90.2.322 -> 91.3.328
2016-04-25 18:43:48 +04:00
Vladimír Čunát 1c9234fd6c foswiki, egypt, wml: fix build 2016-04-25 16:22:52 +02:00
Vladimír Čunát ecf75f1b4f perlPackages.EncodeJIS2K: fix build 2016-04-25 15:55:01 +02:00
Karn Kallio b6e63fba6d phonon : fix configuration paths 2016-04-25 08:23:45 -05:00
Joachim Fasting 4df02f777b Merge pull request #14942 from artuuge/beignet
beignet: init at 1.1.2
2016-04-25 15:22:46 +02:00
Ricardo Ardissone a51da70189 the-powder-toy: 90.2.322 -> 91.3.328 2016-04-25 10:15:44 -03:00
artuuge 0472cc82ea beignet: init at 1.1.2 2016-04-25 14:51:30 +02:00
Frederik Rietdijk 25c35529f4 Merge pull request #14845 from regnat/zerobin
pythonPackages.zerobin : init at 7da1615 and add service
2016-04-25 14:04:32 +02:00
Tobias Geerinckx-Rice 0f479e3016
geolite-legacy: 2016-04-19 -> 2016-04-25 2016-04-25 13:32:05 +02:00