3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

119466 commits

Author SHA1 Message Date
Frederik Rietdijk dd851a8d75
Merge pull request #31254 from LumiGuide/graphite-python-overrides
graphite: override django and django_tagging
2017-11-05 09:40:59 +01:00
Frederik Rietdijk f825642e74
Merge pull request #30266 from Ralith/matrix-synapse
matrix-synapse: 0.22.1 -> 0.24.1
2017-11-05 09:39:16 +01:00
aszlig 316de025d1
python/meliae: Fix version string for download URL
While the version listed on PyPI is "0.4.0.final.0", the actual tarball
however is called just "meliae-0.4.0.tar.gz", which is the same *name*
(but different hash) as the one before the update in
7ce848309e.

Here is the PyPI page for reference:

https://pypi.python.org/pypi/meliae/0.4.0.final.0

After checking the tarballs contents, the version string however *is*
"0.4.0.final.0", so I'm only changing the version in the download URL
rather than in the version attribute.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @FRidh
2017-11-05 06:47:20 +01:00
Orivej Desh 51186eb015
Merge pull request #31265 from danielfullmer/adapta-3.92.1.72
adapta-gtk-theme: 3.91.2.147 -> 3.92.1.72
2017-11-05 04:42:55 +00:00
Orivej Desh 0c104e40cb
Merge pull request #30558 from volth/tixati-2.55
tixati: init at 2.55
2017-11-05 04:22:17 +00:00
Orivej Desh 5369837c0b
Merge pull request #28873 from michalrus/hubstaff
hubstaff: init at 1.2.14
2017-11-05 04:18:54 +00:00
Michal Rus 07e2460afd
hubstaff: init at 1.2.14 2017-11-05 04:02:28 +01:00
Herwig Hochleitner e64dc25434 Revert "services.xserver: assert that either desktop- or window manager is not "none""
This reverts commit 93c54acf97.
This reopens #30517 @nbp @Ma27

Breaking people's config for this is hardly reasonable as is. If it
absolutely cannot be avoided, at the very least, we need to provide
clear instructions on what people need to upgrade in their config. I
actually had to bisect to the commit, to even find out what property I
should change or define, as the error message was useless. It didn't
even mention a property name.

Discussion on the PR seems to be ongoing, so I'm reverting this, so we
don't break people's systems on unstable.
2017-11-05 01:51:13 +01:00
Michael Raskin 7be7698612
Merge pull request #25552 from antonxy/master
lightworks: init at 14.0.0
2017-11-05 00:01:48 +00:00
Vincent Laporte 0cabd5fa67
ocamlPackages.ocaml-migrate-parsetree: 1.0.5 -> 1.0.7 2017-11-04 23:47:44 +00:00
Michael Raskin af7be86125
Merge pull request #31264 from kini/acl2-update
acl2: 6.5 -> 7.4; sbcl: remove 1.2.0 and 1.3.12
2017-11-04 23:17:30 +00:00
Michael Raskin d715c087b1
Merge pull request #20423 from DerTim1/add-service-wrapper
service-wrapper: init at 16.04.0
2017-11-04 22:16:59 +00:00
Daniel Fullmer bfe218e3cb adapta-gtk-theme: 3.91.2.147 -> 3.92.1.72 2017-11-04 18:03:04 -04:00
knupfer d71833ee36 fetchipfs: init
Fixes #18296
2017-11-04 23:01:27 +01:00
Graham Christensen 59c995ce06
Merge pull request #31259 from mimadrid/update/elixir-1.5.2
elixir: 1.5.1 -> 1.5.2
2017-11-04 16:58:40 -04:00
Keshav Kini 21db63d669 sbcl: remove old versions 1.2.0, 1.3.12
SBCL 1.2.0 was being retained for the acl2 package, which no longer
needs it.  SBCL 1.3.12 was being retained for the maxima package,
which appears to no longer need it.
2017-11-04 13:48:22 -07:00
Keshav Kini 0094ca20cc acl2: 6.5 -> 7.4, refactor
The `make regression` line was failing because the expression was
downloading a core-system-only, no-libraries source tarball.  I
switched to using fetchFromGitHub, which downloads the full source
code -- the core system as well as the "community books",
i.e. libraries -- but the libraries unfortunately do not build yet
because they have more dependencies than the core system, and they
also run into some impurity problems during the build process.

This commit changes the ACL2 package so that at least the user will
obtain the latest version of the core system, even though they won't
get the community books.  In a later commit I hope to fix this; it
will require either changes to ACL2 itself, or a patch to be applied
to ACL2 in nixpkgs.

ACL2 7.4 has no trouble building on the current version of SBCL in
nixpkgs, so I let it do so instead of using the ancient SBCL version
1.2.0 from 2014.

I also added myself as a maintainer to this package, since I'm an
active contributor to the ACL2 project and am interested in seeing it
working on Nix.
2017-11-04 13:48:22 -07:00
Michael Weiss af3a11b8f6 pgpdump: Add support for compressed data packets
This will add support for compressed data packets (Tag 8) [0] and enable
it by default.

[0]: https://tools.ietf.org/html/rfc4880#section-5.6
2017-11-04 21:23:14 +01:00
Orivej Desh 86415c9c83
Merge pull request #27790 from MatrixAI/masterpdfeditor
masterpdfeditor: init at 4.2.70
2017-11-04 20:19:40 +00:00
Michael Raskin 53d4649ddc
Merge pull request #31257 from c0bw3b/pkg/nsjail
nsjail: 2.1 -> 2.2
2017-11-04 20:04:57 +00:00
mimadrid a6e12e5cf5
elixir: 1.5.1 -> 1.5.2 2017-11-04 20:30:27 +01:00
Peter Simons d594ca69fd hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.6-15-g404d240 from Hackage revision
be48096efe.
2017-11-04 20:02:45 +01:00
Peter Simons a09460b827 ghc: add 8.2.2-rc2 2017-11-04 20:02:31 +01:00
Renaud 9754503c6b
nsjail: 2.1 -> 2.2
plus fixed meta.license which should be Apache License 2.0
2017-11-04 20:02:23 +01:00
Renaud 27114d45ae
stdenv.lib.maintainers: add c0bw3b 2017-11-04 19:56:04 +01:00
Vincent Laporte 9e0159c04c
ocamlPackages.stdio: 0.9.0 -> 0.9.1 2017-11-04 18:50:23 +00:00
Michael Raskin 6f686c47ff
Merge pull request #31231 from mimadrid/update/sbcl-1.4.1
sbcl: 1.4.0 -> 1.4.1
2017-11-04 18:24:05 +00:00
Vincent Laporte a8c4829f7c
ocamlPackages.base: 0.9.3 -> 0.9.4 2017-11-04 17:47:38 +00:00
Vladimír Čunát 8ea1b79003
wxGTK-{2.9,3.0}: apply an upstream patch
Close #30909.
2017-11-04 18:28:33 +01:00
Vincent Laporte 8923737cd5
ocamlPackages.sexplib: 0.9.2 -> 0.9.3 2017-11-04 17:09:50 +00:00
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