summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Python: don't propagate blas"origin/revert-14975-pythonblasFrederik Rietdijk2016-04-253-8/+8
* fish: only use kbd on linuxEric Seidel2016-04-251-0/+1
* fossil: add libiconv on darwinEric Seidel2016-04-251-2/+3
* Merge pull request #14975 from FRidh/pythonblas•••Python: don't propagate blasFrederik Rietdijk2016-04-253-8/+8
|\
| * pythonPackages.scipy_0_16: use correct numpyFrederik Rietdijk2016-04-251-1/+1
| * pythonPackages.scikitlearn: don't propagate blasFrederik Rietdijk2016-04-251-3/+3
| * pythonPackages.qutip: use numpy.blasFrederik Rietdijk2016-04-251-1/+1
| * pythonPackages.scipy: don't propagate blasFrederik Rietdijk2016-04-251-2/+2
| * pythonPackages.numpy: don't propagate blasFrederik Rietdijk2016-04-251-2/+2
* | Merge #14953: fix fallout after splitting nix•••I rebased this against master to avoid getting staging commits for now. Vladimír Čunát2016-04-2519-32/+32
|\ \
| * | treewide: Use correct output of config.nix.package in non-string contextsTuomas Tynkkynen2016-04-256-8/+8
| * | treewide: Use correct output in ${config.nix.package}/binTuomas Tynkkynen2016-04-2512-21/+21
| * | amazon-init.nix: Use makeBinPath•••This also fixes the incorrect use of 'dev' outputs from config.nix.package and pkgs.systemd. Tuomas Tynkkynen2016-04-251-1/+1
| * | 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;`. Tuomas Tynkkynen2016-04-251-2/+2
|/ /
* | Merge pull request #14971 from rardiol/the-powder-toy•••the-powder-toy: 90.2.322 -> 91.3.328Nikolay Amiantov2016-04-252-16/+11
|\ \
| * | the-powder-toy: 90.2.322 -> 91.3.328Ricardo Ardissone2016-04-252-16/+11
* | | foswiki, egypt, wml: fix buildVladimír Čunát2016-04-253-1/+7
* | | perlPackages.EncodeJIS2K: fix buildVladimír Čunát2016-04-251-0/+1
* | | phonon : fix configuration pathsKarn Kallio2016-04-251-3/+3
* | | Merge pull request #14942 from artuuge/beignet•••beignet: init at 1.1.2Joachim Fasting2016-04-253-0/+193
|\ \ \
| * | | beignet: init at 1.1.2artuuge2016-04-253-0/+193
|/ / /
* | | Merge pull request #14845 from regnat/zerobin•••pythonPackages.zerobin : init at 7da1615 and add serviceFrederik Rietdijk2016-04-253-0/+203
|\ \ \
| * | | zerobin service : initThéophane Hufschmitt2016-04-252-0/+103
| * | | pythonPackages.zerobin : init at 20160108Théophane Hufschmitt2016-04-251-0/+24
| * | | pythonPackages.clize : init at 3.0Théophane Hufschmitt2016-04-251-0/+23
| * | | pythonPackages.sigtool : init at 1.1a3Théophane Hufschmitt2016-04-251-0/+30
| * | | pythonPackages.repeated_test : init at 0.1a3Théophane Hufschmitt2016-04-251-0/+23
* | | | geolite-legacy: 2016-04-19 -> 2016-04-25Tobias Geerinckx-Rice2016-04-251-3/+3
* | | | fatrace: add patch to fix crash•••Will be included in next release. Tobias Geerinckx-Rice2016-04-251-1/+10
* | | | icon-conv-tools: init at 0.0.0 (#13905)•••A nix specific set of tools for converting icon files that are not in a freedesktop ready format. I plan on using these tools for both `keepass` and `retroarch` packages. It may benifit many other packages.jraygauthier2016-04-254-0/+135
* | | | Merge pull request #14963 from swistak35/pws•••pws: Init at 1.0.6Joachim Fasting2016-04-256-0/+92
|\ \ \ \
| * | | | pws: Init at 1.0.6Rafał Łasocha2016-04-256-0/+92
* | | | | graph-tool: 2.12 -> 2.16 (#14848)•••* graph-tool: 2.12 -> 2.16 * graph-tool: Use correct upstream source * graph-tool: Use correct hash Tiago de Paula Peixoto2016-04-251-3/+3
| |/ / / |/| | |
* | | | Merge pull request #14871 from abbradar/choice-cdrtools-cdrkit•••CD/DVD writing improvementsNikolay Amiantov2016-04-258-15/+108
|\ \ \ \
| * | | | brasero: move cdrtools dependency to a wrapperNikolay Amiantov2016-04-232-1/+26
| * | | | k3b: move cdrtools dependency to a wrapperNikolay Amiantov2016-04-233-6/+30
| * | | | brasero: use libburn and libisofs instead of some packagesNikolay Amiantov2016-04-231-4/+4
| * | | | cdrtools: mark as free but don't distribute in binary formNikolay Amiantov2016-04-231-4/+5
| * | | | libisofs: init at 1.4.2Nikolay Amiantov2016-04-232-0/+23
| * | | | libburn: init at 1.4.2.pl01Nikolay Amiantov2016-04-232-0/+20
* | | | | nixos: rename chroot* to sandbox*•••On Nix side this was done months ago: https://github.com/NixOS/nix/pull/682 Vladimír Čunát2016-04-253-9/+13
* | | | | dosbox: pass mesa explicitly (needed for glu.h)Michael Raskin2016-04-251-2/+2
| |/ / / |/| | |
* | | | workrave: fix version format and tarball nameTobias Geerinckx-Rice2016-04-251-3/+7
* | | | emacs25pre: 25.0.92 -> 25.0.93•••joachifm: also update the name & re-use it in the url Nicolas Petton2016-04-241-3/+3
* | | | Merge pull request #14960 from dguibert/xpra•••xpra: 0.16.2 -> 0.17.0Joachim Fasting2016-04-241-2/+2
|\ \ \ \
| * | | | xpra: 0.16.2 -> 0.17.0David Guibert2016-04-241-2/+2
* | | | | kodi: 16.0 -> 16.1Edward Tjörnhammar2016-04-241-4/+4
* | | | | gpsprune: 18.3 -> 18.4Robert Helgesson2016-04-241-2/+2
* | | | | perl-Software-License: 0.103011 -> 0.103012Robert Helgesson2016-04-241-2/+2
* | | | | perl-Role-Tiny: 2.000001 -> 2.000003Robert Helgesson2016-04-241-3/+2