3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

70968 commits

Author SHA1 Message Date
Arseniy Seroka 3225c34dcc Merge pull request #10644 from NixOS/revert-10635-i3log
Revert "i3wm: Add debug & logging options"
2015-10-27 13:40:29 +03:00
Arseniy Seroka 42eabf1c4a Revert "i3wm: Add debug & logging options" 2015-10-27 13:40:04 +03:00
Domen Kožar 6a226db299 Merge pull request #10643 from FRidh/jupyter
python qtconsole: 4.0.1 -> 4.1.0
2015-10-27 11:31:19 +01:00
Rickard Nilsson e0a650d87a printrun: 2014^C01 -> 20150310 2015-10-27 11:23:12 +01:00
Frederik Rietdijk 8ec97910cb python qtconsole: 4.0.1 -> 4.1.0 2015-10-27 11:22:34 +01:00
Frederik Rietdijk 5d5a7d12a3 Revert "python qtconsole: 4.0.1 -> 4.0.3"
Wrong version number.

This reverts commit 38d35c50f2.
2015-10-27 11:21:00 +01:00
Arseniy Seroka 50f5122d72 Merge pull request #10635 from layus/i3log
i3wm: Add debug & logging options
2015-10-27 12:51:50 +03:00
Domen Kožar 16c6420c25 Merge pull request #10642 from henrytill/fix-emacs-eval
emacs24Macport: fix evaluation
2015-10-27 10:43:25 +01:00
Henry Till cf2668392a emacs24Macport: fix evaluation 2015-10-27 05:35:41 -04:00
Domen Kožar 6947aa5b7d Merge pull request #10638 from desiderius/reportlab-3.2.0
pythonPackages.reportlab: 3.1.8 -> 3.2.0
2015-10-27 10:20:55 +01:00
Domen Kožar 6016328d37 Merge pull request #10640 from chris-martin/atom-gvfs
atom: add gvfs/bin to wrapper PATH
2015-10-27 10:20:34 +01:00
Jude Taylor 0d5edad2f5 emacs24Macport: fix build 2015-10-27 01:23:42 -07:00
Chris Martin dab75ab440 atom: add gvfs/bin to wrapper PATH
Atom deletes files by invoking `gvfs-trash`. Without it, deletions
fail silently.
2015-10-27 04:05:25 -04:00
Jude Taylor 950261bb9a darwin: fix gtk+3 dependencies 2015-10-27 00:38:06 -07:00
Moritz Ulrich 5baf95cc71 clojure: 1.6.0 -> 1.7.0 2015-10-27 08:11:37 +01:00
desiderius c8c0ee3493 pythonPackages.reportlab: 3.1.8 -> 3.2.0
- enables unit tests,
- adds a dependency to Pillow.
2015-10-27 07:48:45 +01:00
Tobias Geerinckx-Rice 86805242ac simple-scan: remove PackageKit dependency
It has now been made properly optional.
2015-10-27 03:17:17 +01:00
Tobias Geerinckx-Rice 4b27f54db7 simple-scan 3.18.1 -> 3.19.1 2015-10-27 03:17:16 +01:00
Tobias Geerinckx-Rice 4a1a5e7ed6 netsniff-ng 0.5.9-{110-gfc4646b -> 121-gd91abbd} 2015-10-27 03:17:16 +01:00
Jude Taylor 5469e9c581 fix xquartz build 2015-10-26 18:37:05 -07:00
Jude Taylor cf12f3e4d2 patch out system include in libAppleWM 2015-10-26 17:13:29 -07:00
Jude Taylor 2e29399993 update packages with new cf-private compatibility 2015-10-26 17:13:29 -07:00
Jude Taylor 5ea8770263 cf-private: prepend self to system includes 2015-10-26 17:13:29 -07:00
Jude Taylor 0a23e412b4 in darwin sdk, copy headers rather than linking them 2015-10-26 17:13:29 -07:00
Arseniy Seroka 12277d2a38 Merge pull request #10503 from cleverca22/master
open-iscsi: save the staticly linked binary in its own output for use in the initrd
2015-10-27 00:57:29 +03:00
Arseniy Seroka 1a5c57ca3a Merge pull request #10631 from cleverca22/teamviewer
teamviewer: fix the expressions
2015-10-27 00:47:44 +03:00
Guillaume Maudoux eb46e0fc72 i3wm: Add debug & logging options 2015-10-26 22:33:11 +01:00
aszlig 82d88b5bcb
vmTools.commonDebPackages: Add "mawk".
While debugging an issue with running NixOps tests, I found out that the
output from debClosureGenerator is not deterministic.

The reason behind this is the way how Provides and Replaces fields are
handled. I haven't yet found out what's the exact issue, but so far
packages "Provides" are more or less picked at random.

So, running the NixOps Hetzner tests we get either mawk, original-awk or
gawk altering on every invocation.

While for the test it isn't poisionous whether wi have mawk or gawk,
having original-awk certainly is, because live-build only works with
mawk or gawk.

The best solution would obviously be to make debClosureGenerator
deterministic, but in the case of "Provides: awk", we can safely pick
mawk by default, because the latter has a "Priority: required" in its
package description.

This also has the advantage that we can safely cherry-pick this to
release-15.09 because it's very unlikely that we'll break the
debClosureGenerator by adding a dependency to commonDebPackages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-26 20:56:42 +01:00
Domen Kožar 3b85cf704c Merge pull request #10632 from grwlf/urweb-bump
Urweb bump
2015-10-26 20:11:36 +01:00
Sergey Mironov 2cfa1e8f98 urweb: bump to 20151018 2015-10-26 21:48:33 +03:00
Luca Bruno acfe53e61f urweb: add back openssl configure flags to fix build, cc @aseipp 2015-10-26 21:48:33 +03:00
Arseniy Seroka bad15da924 Merge pull request #10628 from devhell/mp3val
mp3val: Better installPhase
2015-10-26 21:34:09 +03:00
Arseniy Seroka 2e6e2e02d3 Merge pull request #10606 from mucaho/rstudio_runtime
rstudio: add run-time dependency gnumake
2015-10-26 21:33:26 +03:00
Arseniy Seroka 1c9a2def0d Merge pull request #10614 from elasticdog/transcrypt
transcrypt: init at 0.9.7
2015-10-26 21:32:44 +03:00
Arseniy Seroka 4d15fc8383 Merge pull request #10626 from annejan/master
QtPass 1.0.1 to 1.0.3
2015-10-26 21:32:04 +03:00
michael bishop b81f51cecf teamviewer: fix the expressions 2015-10-26 15:22:01 -03:00
devhell b2e3c05c48 mp3val: Better installPhase
As mentioned by @aszlig, it's more elegant and sane to use coreutils'
`install`. This commit also changes `platforms` to `unix` since this
should also compile on Darwin for example.
2015-10-26 17:36:50 +00:00
Domen Kožar 6e9f77dc29 Merge pull request #10616 from spencerjanssen/kodi-15.2
kodi: 15.1 -> 15.2
2015-10-26 17:11:14 +01:00
Spencer Janssen a3343c3ec3 kodiPlugins.genesis: 4.0.1 -> 5.1.3 2015-10-26 10:59:23 -05:00
Spencer Janssen 0e59efc7d9 kodiPlugins.svtplay: 4.0.14 -> 4.0.15 2015-10-26 10:57:24 -05:00
Anne Jan Brouwer 6998586b8f QtPass 1.0.1 to 1.0.3
I'm guessing the sha256 wasn't correct for 1.0.1 or I'm doing something wrong here myself . .
2015-10-26 16:56:04 +01:00
Domen Kožar dc71104e3a Merge pull request #10625 from FRidh/jupyter
python: updates to jupyter notebook / qtconsole
2015-10-26 16:23:59 +01:00
Eelco Dolstra 52c9e4415b linux: Support x2APIC
Without this, certain servers with lots of CPU cores would show only
one core.
2015-10-26 16:20:02 +01:00
Eelco Dolstra 50ab972b5a linux: Pass through configuration file
This enables "nix-build -A linux.configfile" to get the generated
kernel config.
2015-10-26 16:20:01 +01:00
Domen Kožar f1508b3a23 nova-image: use make-disk-image.nix 2015-10-26 16:16:45 +01:00
Frederik Rietdijk 38d35c50f2 python qtconsole: 4.0.1 -> 4.0.3 2015-10-26 16:10:20 +01:00
Frederik Rietdijk 93a190c0c6 python notebook: 4.0.5 -> 4.0.6 2015-10-26 16:10:07 +01:00
Frederik Rietdijk e5e3d6bb15 python jupyter_client: 4.0.0 -> 4.1.1 2015-10-26 16:09:51 +01:00
Frederik Rietdijk 9db2927f31 python ipykernel: 4.0.3 -> 4.1.1 2015-10-26 16:09:38 +01:00
Domen Kožar 1703d4dc5d Merge pull request #10296 from FRidh/pandas
python packages updates
2015-10-26 15:59:14 +01:00