3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

14818 commits

Author SHA1 Message Date
Adrien Devresse 28d2d78b55 neuron: fix issue with incorrectly prefixed python path 2016-09-01 13:41:26 +02:00
Tuomas Tynkkynen 8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Frederik Rietdijk 684f08166c fixup 2016-09-01 12:03:10 +02:00
Adrien Devresse ae2800378f neuron: fix issue #17914 -> Add python bindings to neuron derivation and minor fixes
- Add support for python bindings
- make neuron respect standard pythonpath prefix
- force exec_prefix == prefix to respect standard nix file hierarchy
- normalize indentation
- propagate dependencies necessary for nrniv_makefile usage
- Add support for darwin
2016-09-01 12:03:10 +02:00
Eelco Dolstra 02ee9d83d0 enableParallelBuild -> enableParallelBuilding 2016-09-01 10:46:47 +02:00
Thomas Tuegel c643770861
Merge branch 'emacs-packages' 2016-08-31 17:41:36 -05:00
Thomas Tuegel 017691035d melpaStablePackages 2016-08-31 2016-08-31 17:27:06 -05:00
Thomas Tuegel 432b57b853 melpaPackages 2016-08-30 2016-08-31 16:49:10 -05:00
Tuomas Tynkkynen b691bc22ef golden-cheetah: Use 'dev' output of qttools 2016-08-31 19:37:05 +03:00
Eelco Dolstra 25c9f2729e thunderbird: 45.2.0 -> 45.3.0 2016-08-31 14:00:44 +02:00
Eelco Dolstra 4309d99b70 Merge pull request #18150 from taku0/thunderbird-bin-45.3.0
thunderbird-bin: 45.2.0 -> 45.3.0
2016-08-31 13:39:57 +02:00
Robin Gloster 7b1597bec2
qemu: 2.6.0 -> 2.6.1 2016-08-31 13:31:22 +02:00
Robin Gloster 7eaa83a3e9
qemu: patch security issues in 9pfs
CVE-2016-7116, others have no ID assigned, yet.
Fixes from 2.7 tree.
2016-08-31 13:31:22 +02:00
Tuomas Tynkkynen 6086142ece mupdf: Split 'dev' output 2016-08-31 13:12:11 +03:00
Tuomas Tynkkynen 96dae0f286 xxkb: Fix 'lib.optional' use 2016-08-31 12:54:28 +03:00
Tuomas Tynkkynen b87a2245b1 root: Fix libc dev reference 2016-08-31 12:54:28 +03:00
Tuomas Tynkkynen feed8beb47 virtualbox: Fix glibc dev reference 2016-08-31 12:32:34 +03:00
Joachim F 986e64280e Merge pull request #17970 from adolfogc/pjsip
pjsip: 2.1 -> 2.5.5
2016-08-30 22:30:55 +02:00
Lancelot SIX 400995e46d Merge pull request #18125 from romildo/upd.mkvtoolnix
mkvtoolnix: 9.3.1 -> 9.4.0

Built and tested locally
2016-08-30 22:07:36 +02:00
Thomas Tuegel 8c21a4ee2e
elpaPackages 2016-08-30 2016-08-30 12:24:08 -05:00
Frederik Rietdijk 94c41a5d25 Merge pull request #18123 from lancelotsix/update_qgis_2.16.2
qgis: 2.16.1 -> 2.16.2
2016-08-30 17:29:00 +02:00
José Romildo Malaquias b2a68b73dc mkvtoolnix: 9.3.1 -> 9.4.0 2016-08-30 10:24:06 -03:00
Thomas Tuegel 6b20d5b75e Merge pull request #18113 from layus/emacs-closure-size
emacs24: nuke extra references to buildInputs
2016-08-30 08:17:58 -05:00
Lancelot SIX 290ea9102c
qgis: 2.16.1 -> 2.16.2 2016-08-30 15:10:07 +02:00
Ram Kromberg f254db331e qweechat: init at 2016-07-29 (#18094) 2016-08-30 14:29:45 +02:00
Matthias Beyer 87cecbeba6 timewarrior: 1.0.0.beta1 -> 1.0.0 (#18120) 2016-08-30 14:19:19 +02:00
Frederik Rietdijk a734be3239 Merge pull request #18097 from leenaars/manuskript
manuskript: cleanup of install
2016-08-30 14:18:48 +02:00
Tuomas Tynkkynen d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Luca Bruno 5c5fd1cb60 Merge pull request #18096 from leenaars/wavrsocvt
wavrsocvt: init at 1.0.2.0
2016-08-30 11:41:08 +02:00
Luca Bruno cca72718b3 Merge pull request #18095 from Mic92/valauncher
valauncher: init at 1.2
2016-08-30 11:36:42 +02:00
Guillaume Maudoux 5b00f4037e emacs24: nuke extra references to buildInputs 2016-08-30 11:00:54 +02:00
Jörg Thalheim 2de7e30c0f valauncher: init at 1.2 2016-08-30 10:04:43 +02:00
Tuomas Tynkkynen aef35c52f0 treewide: Fix output references to libX11 2016-08-30 03:40:23 +03:00
taku0 816e86cba3 thunderbird-bin: 45.2.0 -> 45.3.0 2016-08-30 09:12:11 +09:00
Tuomas Tynkkynen c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
Tuomas Tynkkynen 048a30e4e4 treewide: Fix dev references to libxml2 2016-08-30 03:02:32 +03:00
Michiel Leenaars fe87145c58 wavrsocvt: init at 1.0.2.0 2016-08-29 22:57:14 +02:00
Michiel Leenaars fd69c7d944 manuskript: cleanup of install 2016-08-29 22:55:45 +02:00
Frederik Rietdijk 357fbe1ccf Merge pull request #18080 from vbgl/qarte-3
qarte: 2.4.0 -> 3.2.0
2016-08-29 21:47:26 +02:00
Franz Pletz 04ab7cee02 Merge pull request #18088 from groxxda/fix/libcommuni
libcommuni: 2016-03-23 -> 2016-08-17, communi 2016-01-03 -> 2016-08-19
2016-08-29 18:32:16 +02:00
Vladimír Čunát acca6d2293 libreoffice: remove a flaky test on i686
... by a patch from Debian.
2016-08-29 18:29:12 +02:00
Adolfo E. García Castro 64667ae3ef pjsip: 2.1 -> 2.5.5 2016-08-29 10:22:34 -06:00
Alexander Ried 8d26e56608 communi: 2016-01-03 -> 2016-08-19 2016-08-29 17:04:27 +02:00
Vincent Laporte 17af87323d maxima: 5.36.1 -> 5.38.1 2016-08-29 15:52:05 +02:00
Robin Gloster 005a147f92
sage: fix build
closes #17842
2016-08-29 12:46:51 +00:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
obadz b74793bd1c Merge branch 'master' into staging
Conflicts:
	pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
Frederik Rietdijk aebabb9871 qarte: create python env 2016-08-29 13:36:50 +02:00
Vincent Laporte 58738e4bc7 qarte: 2.4.0 -> 3.2.0 2016-08-29 13:36:50 +02:00
Frederik Rietdijk aca4801f53 mendeley: add missing liborc 2016-08-29 10:35:30 +02:00