1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-19 03:47:13 -04:00
Commit graph

82253 commits

Author SHA1 Message Date
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
Tobias Geerinckx-Rice 364181b317
fatrace: add patch to fix crash
Will be included in next release.
2016-04-25 13:31:48 +02:00
Nikolay Amiantov 69a072484d gcc-wrapper-old: fix binutils and coreutils' paths 2016-04-25 14:27:51 +03:00
Théophane Hufschmitt 201590fd97 zerobin service : init 2016-04-25 13:18:58 +02:00
Théophane Hufschmitt 22e2cfe92b pythonPackages.zerobin : init at 20160108 2016-04-25 13:18:58 +02:00
Théophane Hufschmitt 21f6437365 pythonPackages.clize : init at 3.0 2016-04-25 13:18:58 +02:00
Théophane Hufschmitt f770fe4768 pythonPackages.sigtool : init at 1.1a3 2016-04-25 13:18:58 +02:00
Théophane Hufschmitt 130078a73a pythonPackages.repeated_test : init at 0.1a3 2016-04-25 13:18:58 +02:00
jraygauthier ddc401ed0a 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.
2016-04-25 13:16:47 +02:00
Joachim Fasting d7e79dcacf Merge pull request #14963 from swistak35/pws
pws: Init at 1.0.6
2016-04-25 12:48:59 +02:00
Tiago de Paula Peixoto d1d779fcbc graph-tool: 2.12 -> 2.16 (#14848)
* graph-tool: 2.12 -> 2.16

* graph-tool: Use correct upstream source

* graph-tool: Use correct hash
2016-04-25 12:37:18 +02:00
Nikolay Amiantov daa8ba26c9 atomEnv: use makeSearchPathOutput 2016-04-25 13:24:40 +03:00
Nikolay Amiantov 96a5c34bc5 cmake2_8: use get(Output) functions 2016-04-25 13:24:40 +03:00
Nikolay Amiantov 5ede7d4d92 octoprint: use makeSearchPathOutput 2016-04-25 13:24:40 +03:00
Nikolay Amiantov d4794c3630 stdenv: clarify how outputsToInstall is chosen
See https://github.com/NixOS/nixpkgs/pull/14694/files#r60013871
2016-04-25 13:24:39 +03:00
Nikolay Amiantov 5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Nikolay Amiantov c779e30d53 make*Path: implement via makeSearchPathOutput 2016-04-25 13:24:39 +03:00
Nikolay Amiantov ab0a0c004e makeSearchPathOutputs: refactor to makeSearchPathOutput 2016-04-25 13:24:39 +03:00
Christoph Hrdinka 3895a0b7dd qtpass: 1.1.0 -> 1.1.1
Updates qtpass and fixes the current installation method. It further installs
the desktop file and application icon.
2016-04-25 12:24:31 +02:00
Nikolay Amiantov 7d3e75827b getOutput function: init 2016-04-25 13:22:41 +03:00
Nikolay Amiantov 5f3987f44f Revert "tryAttrs: init function"
This reverts commit 338340f993.
2016-04-25 13:22:41 +03:00
Nikolay Amiantov 31d76ae1b1 Merge pull request #14871 from abbradar/choice-cdrtools-cdrkit
CD/DVD writing improvements
2016-04-25 13:42:03 +04:00
Vladimír Čunát 7cf8daa2bb nixos: rename chroot* to sandbox*
On Nix side this was done months ago:
https://github.com/NixOS/nix/pull/682
2016-04-25 11:04:08 +02:00