3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

119739 commits

Author SHA1 Message Date
Guillaume Maudoux 7325ad9ab7 graphite: override django and django_tagging
instead of depending on specific versions in the django_tagging_0_4_3
and graphite_web derivations.

This should fix: https://github.com/NixOS/nixpkgs/pull/30277#discussion_r145393088

This was joint work of @basvandijk and @layus at NixCon 2017.
2017-11-04 17:53:35 +01:00
Daiderd Jordan a9f13a4614
Merge pull request #31213 from acowley/qt5-cmake-cleanup
qt5: fix cmake cleanup on darwin
2017-11-04 16:51:56 +01:00
Tim Steinbach d9024786f2
Merge pull request #31011 from leenaars/hex
beamPackages.hex: 0.14.0 => 0.17.1
2017-11-04 11:19:02 -04:00
Tim Steinbach 9691c3e522
Merge pull request #31246 from c0bw3b/doc/meta-platforms
nixpkgs manual : clearer meta.platforms description
2017-11-04 11:14:07 -04:00
Renaud 4e892b9c03 nixpkgs manual : clearer meta.platforms description
Refer to doubles.nix for a list of common platforms types used in packages
2017-11-04 16:08:14 +01:00
Tim Steinbach 97f172a1d5
Merge pull request #31146 from NeQuissimus/kafka_updates
Kafka: Update + Tests
2017-11-04 11:06:32 -04:00
Tim Steinbach a789f5b2f1
Merge pull request #31233 from mimadrid/update/rofi-pass-1.5.3
rofi-pass: 1.5.2 -> 1.5.3
2017-11-04 11:04:41 -04:00
Tim Steinbach 21b587a6dd
Merge pull request #31232 from mimadrid/update/tmuxp-1.3.4
tmuxp: 1.3.1 -> 1.3.4
2017-11-04 10:58:27 -04:00
mimadrid 9720703d24
mawk: 1.3.4-20161120 -> 1.3.4-20171017 2017-11-04 15:56:31 +01:00
Tim Steinbach b7fe5577e5
Merge pull request #31245 from pbogdan/openrct2-fix-build
openrct2: fix build
2017-11-04 10:52:06 -04:00
Tim Steinbach 2452bd2e80
Merge pull request #31240 from gjeusel/tortoisehg-update
tortoisehg: 4.1.1 -> 4.3.1
2017-11-04 10:48:29 -04:00
Tim Steinbach 433703254b
Merge pull request #31248 from mimadrid/update/jruby-9.1.13.0
jruby: 9.1.12.0 -> 9.1.13.0
2017-11-04 10:42:42 -04:00
Tim Steinbach aab92cba7d
Merge pull request #31243 from pbogdan/tcpflow-fix-build
tcpflow: fix build
2017-11-04 10:42:18 -04:00
Tim Steinbach 73714d8a56
Merge pull request #31247 from Shados/synergy-repo-rename
synergy: track upstream repository name change.
2017-11-04 10:38:06 -04:00
mimadrid 303ad53e7e
jruby: 9.1.12.0 -> 9.1.13.0 2017-11-04 15:36:17 +01:00
Tim Steinbach e049e462ff
Merge pull request #31226 from adisbladis/firefox-beta-bin-57_0b14
firefox-beta-bin: 57.0b13 -> 57.0b14
2017-11-04 10:32:33 -04:00
Alexei Robyn 97594ffd86 synergy: track upstream repository name change. 2017-11-05 01:30:20 +11:00
Maximilian Bosch 93c54acf97 services.xserver: assert that either desktop- or window manager is not "none"
resolves #11064
2017-11-04 15:30:20 +01:00
mimadrid 84ad480e0c
tilix: 1.6.4 -> 1.7.1 2017-11-04 15:25:33 +01:00
Daiderd Jordan de62516777
Merge pull request #31174 from eqyiel/fix-lame
lame: prevent build failure from using outdated symbol list
2017-11-04 15:20:33 +01:00
Piotr Bogdan 9e59605bab openrct2: fix build 2017-11-04 14:18:47 +00:00
Michael Raskin 8868daa5e6
Merge pull request #31244 from pbogdan/textadept-fix-build
textadept: fix build
2017-11-04 14:07:01 +00:00
Piotr Bogdan 0936dd0d57 textadept: fix build 2017-11-04 13:56:32 +00:00
Piotr Bogdan adf5aea0b6 tcpflow: fix build 2017-11-04 12:45:59 +00:00
Michael Raskin cc3c38d788
Merge pull request #31238 from c0bw3b/pkg/fdm
fdm: 1.8 -> 1.9.0.20170124
2017-11-04 12:36:06 +00:00
Renaud 5fe398fdc9 fdm: 1.8 -> 1.9.0.20170124
sf.net repo does not exist anymore
2017-11-04 13:27:39 +01:00
rnhmjoj 632a1807db
hyp: move expression out python-packages.nix 2017-11-04 12:57:58 +01:00
Michael Raskin eafd703a63 lispPackages.clwrapper: make sure to patch shebangs in the scripts before using them 2017-11-04 12:46:56 +01:00
Maciej Kazulak 42b70ae5ed nixpkgs manual: add rstudio shell.nix example
Provide an example of a self-contained shell.nix for rstudio with
additional packages.
2017-11-04 12:26:08 +01:00
Joachim Fasting 86bc99cc8a
tor-browser-bundle-bin: 7.0.8 -> 7.0.9 2017-11-04 12:19:58 +01:00
Daiderd Jordan 0d95b319c0
Merge pull request #31234 from mimadrid/update/rlwrap-0.43
rlwrap: 0.42 -> 0.43
2017-11-04 11:56:19 +01:00
Daiderd Jordan 7ada6b5ad2
Merge pull request #31229 from mimadrid/update/fzf-0.17.1
fzf: 0.17.1
2017-11-04 11:50:19 +01:00
gjeusel ba885e1d7d tortoisehg: 4.1.1 -> 4.3.1
Signed-off-by: gjeusel <jeusel.guillaume@gmail.com>
2017-11-04 11:48:38 +01:00
Jean-Philippe Bernardy 6269306a8d pythonPackages.tensorflow: add flags for efficent math on CPU 2017-11-04 13:18:11 +03:00
Maximilian Bosch 5633431c2b
statsd: repackage with node2nix 2017-11-04 10:23:28 +01:00
Vladimír Čunát bb87d2c81a
drbd: fix evaluation after #30872 2017-11-04 10:20:39 +01:00
Frederik Rietdijk decaeb3040
Merge pull request #30872 from FRidh/udev
systemd: remove udev attributes
2017-11-04 10:02:01 +01:00
Frederik Rietdijk ae23084237
Merge pull request #30107 from danbst/patch-13
declarative containers: improve example config
2017-11-04 09:59:09 +01:00
Joerg Thalheim 6ec3bf3a77 bcc: add myself as maintainer 2017-11-04 08:58:04 +00:00
Joerg Thalheim 292f23c4b5 bcc: fix module installation
BCC_KERNEL_MODULES_DIR should have not been removed
2017-11-04 08:57:20 +00:00
Frederik Rietdijk 4bd9b3b7cf
Merge pull request #25274 from lheckemann/weechat-plugin-split
Weechat plugin split
2017-11-04 09:55:09 +01:00
mimadrid 97d251e6ac
rofi-pass: 1.5.2 -> 1.5.3 2017-11-04 09:31:18 +01:00
mimadrid c375ed9b86
rlwrap: 0.42 -> 0.43 2017-11-04 09:29:49 +01:00
mimadrid 16172d4299
fzf: 0.17.1 2017-11-04 08:36:33 +01:00
mimadrid 765091d80b
tmuxp: 1.3.1 -> 1.3.4 2017-11-04 08:25:03 +01:00
mimadrid 4b5d30df2d
sbcl: 1.4.0 -> 1.4.1 2017-11-04 08:20:37 +01:00
Orivej Desh 3ea077e638
Merge pull request #30942 from andrestylianos/joker
joker: init at 0.8.6
2017-11-04 07:09:56 +00:00
Orivej Desh a167ea6875 joker: do not install private generators 2017-11-04 07:03:06 +00:00
Graham Christensen ec270cd40b
Merge pull request #31225 from adisbladis/firefox-devedition-bin-58_0b1
firefox-devedition-bin: 57.0b13 -> 58.0b1
2017-11-04 02:38:02 -04:00
Orivej Desh 436dec1958
Merge pull request #31227 from adisbladis/audacity-2_2_0
audacity: 2.1.3 -> 2.2.0
2017-11-04 05:53:01 +00:00