Commit graph

28515 commits

Author SHA1 Message Date
Joachim Schiele 12f7c0666a qgit version bump from 2.3 to 2.5 2013-08-11 14:35:23 +00:00
Joachim Schiele e5c1a1f627 Merge branch 'master' of github.com:NixOS/nixpkgs 2013-08-11 14:33:51 +00:00
Bjørn Forsman 078213e892 orc: add a comment about the license 2013-08-11 14:50:55 +02:00
Domen Kožar 1cdc07296d update deform,colander,translationstring python modules 2013-08-11 14:29:40 +02:00
Domen Kožar cade6959e4 Merge pull request #823 from ivan/typo-fix-1
Fix a few typos
2013-08-11 04:32:34 -07:00
Domen Kožar cc2c757fc2 Merge pull request #818 from iyzsong/orc
add orc 0.4.17
2013-08-11 04:32:01 -07:00
Domen Kožar daf1b6bc1a Merge pull request #821 from offlinehacker/pythonPackages.graphite_web/fix
pythonPackages: fix graphite_web, make it usable
2013-08-11 04:21:44 -07:00
Ivan Kozik 1866619acc Fix a few typos 2013-08-11 10:55:53 +00:00
Joachim Schiele 06b3a158b4 Merge branch 'master' of github.com:NixOS/nixpkgs 2013-08-11 10:22:11 +00:00
Jaka Hudoklin 50021ebb0a pythonPackages: fix graphite_web, make it usable 2013-08-11 12:05:02 +02:00
Song Wenwu 5f4fc730b1 add myself to maintainers list, keep it sorted
orc: add myself as a maintainer
2013-08-11 15:14:12 +08:00
Evgeny Egorochkin d068505b2f leiningen: fix hash 2013-08-11 07:59:30 +03:00
Evgeny Egorochkin 8b02246373 Merge pull request #812 from the-kenny/leiningen-2.3.0
Update leiningen to 2.3.0.
2013-08-10 21:46:41 -07:00
Song Wenwu 8e023d078c orc: add missing license (bsd3) 2013-08-11 12:07:57 +08:00
Domen Kožar a5a9ccffc9 Merge pull request #816 from offlinehacker/pycurl2
Add pycurl2, a Python interface to libcurl
2013-08-10 20:23:12 -07:00
Domen Kožar 007f563124 Merge pull request #817 from offlinehacker/pythonPackages.carbon
pythonPackages: fix carbon, move dependecies to propagated build inputs
2013-08-10 20:22:53 -07:00
Domen Kožar f3ba80f9f8 Merge pull request #819 from iyzsong/libvisual
add libvisual 0.4.0
2013-08-10 20:22:32 -07:00
Song Wenwu 4705462a2f add libvisual 0.4.0 2013-08-11 11:15:07 +08:00
Song Wenwu 094ffb2b08 add orc 0.4.17 2013-08-11 11:00:45 +08:00
Domen Kožar f3cae400e0 unclutter: add to channel 2013-08-10 20:26:51 +02:00
Evgeny Egorochkin 3065a7686b torbutton: package version 1.6.1 2013-08-10 20:09:18 +03:00
Michael Raskin 15637cf207 Add HTTPS support to Midori 2013-08-10 21:00:14 +04:00
Jaka Hudoklin 46d887aca9 pythonPackages: fix carbon, move dependecies to propagated build inputs 2013-08-10 15:27:25 +02:00
Jaka Hudoklin cf4e29b916 Add pycurl2, a Python interface to libcurl 2013-08-10 15:06:01 +02:00
Bjørn Forsman 70ea99cfa8 lttng-modules: new package
Add linux kernel modules needed to do kernel tracing with LTTng.

To make them available to lttng in NixOS, add this to configuration.nix:

  boot.extraModulePackages = [ pkgs.linuxPackages.lttngModules ];
2013-08-10 14:47:55 +02:00
Bjørn Forsman 5a3a82d81c lttv: new package
Linux Trace Toolkit Viewer is a GUI program to visualize LTTng trace
files. (An alternative to this program is the LTTng plugin for the
Eclipse IDE.)
2013-08-10 14:32:57 +02:00
Bjørn Forsman 1eb38f2ccb babeltrace: new package
Babeltrace is a command-line tool and library to read and convert LTTng
tracefiles. Give it a (binary) trace file/dir path and it will print a
human readable event log to standard out.
2013-08-10 14:32:57 +02:00
Bjørn Forsman 6a4f068b9e lttng-tools: new package
This is the Linux Trace Toolkit. Included in this package:

Command-line client:
  lttng
Tracing daemons:
  lttng-sessiond (automatically started by lttng)
  lttng-relayd   (remote trace collection daemon)

Userspace tracing can be done by using liblttng-ust. To do kernel
tracing we also need the LTTng kernel modules.

I've added a patch that changes "/sbin/modprobe" to just "modprobe".
2013-08-10 14:32:57 +02:00
Bjørn Forsman 33d78777a3 lttng-ust: new package
This is the user space library for LTTng. It is needed to do user space
tracing, as opposed to kernel space tracing.
2013-08-10 14:32:56 +02:00
Bjørn Forsman 4e8dfe71d3 liburcu: new package
liburcu is a userspace RCU (read-copy-update) library that is used by
LTTng - Linux Trace Toolkit (next generation).
2013-08-10 14:32:56 +02:00
Bjørn Forsman e242ae058d virtualbox: fix extension pack hash (must be base16) 2013-08-10 14:30:53 +02:00
Bjørn Forsman 5a1593ed22 Revert "Add taskjuggler ruby gem"
This reverts commit 67a46ce928.

It seems this commit is the reason for this hydra breakage:

  building /nix/store/hwdyx4mf5638mxkka64cxjcj75vw3hmz-nixpkgs-tarball-1.0pre28245_67a46ce
  unpacking sources
  [...snip lots of stuff...]
  'manual.pdf' successfully built
  make: Leaving directory `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/doc'
  running tests
  checking pkgs/top-level/all-packages.nix on i686-linux
  error: while evaluating the attribute `drvPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:19:9':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `ruby-actionmailer-4.0.0' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5':
  while evaluating the derivation attribute `propagatedNativeBuildInputs' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/stdenv/generic/default.nix:78:17':
  while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `ruby-actionpack-4.0.0' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5':
  while evaluating the derivation attribute `propagatedNativeBuildInputs' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/stdenv/generic/default.nix:78:17':
  while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `ruby-activesupport-4.0.0' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5':
  while evaluating the derivation attribute `propagatedNativeBuildInputs' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/stdenv/generic/default.nix:78:17':
  while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `ruby-multi_json-1.7.8' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5':
  while evaluating the derivation attribute `src' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:11:5':
  while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  hash `no hash' has wrong length for hash type `sha256'
  build time elapsed:  0m0.038s 0m0.023s 0m20.586s 0m2.004s
  builder for `/nix/store/lxmyqg7z1l71ji5vdar2m5w66dx45v20-nixpkgs-tarball-1.0pre28245_67a46ce.drv' failed with exit code 1
  error: build of `/nix/store/lxmyqg7z1l71ji5vdar2m5w66dx45v20-nixpkgs-tarball-1.0pre28245_67a46ce.drv' failed
2013-08-10 14:15:20 +02:00
Mathijs Kwik 59025453e7 linux-3.10: backport a fix for "btrfs send"
It has been submitted for inclusion in mainline, so it will probably
make it into 3.11 (or 3.12 as 3.11 is fairly close to release).

It is very local, only affecting people who use the "send" feature.
Without it, send is unstable/unsafe to use incrementally.

It can probably be applied to 3.9 and 3.8 as well, but as I only
tested it against 3.10, so I didn't bother.
2013-08-10 13:53:17 +02:00
Mathijs Kwik 31648f889d btrfsprogs: upgrade to current git master 2013-08-10 13:53:17 +02:00
Michael Raskin 7701b22977 Merge pull request #814 from garbas/vifm-update
vifm: update to 0.7.5 and enabling new options
2013-08-10 04:03:01 -07:00
Rok Garbas 24a0e6ad5f callPackage automatically inherits from xlibs 2013-08-10 13:00:43 +02:00
Evgeny Egorochkin 37996253e6 Steam: fix and update to 1.0.0.39 2013-08-10 06:08:19 +03:00
Carles Pagès 5885cf1286 steam: add flashplayer plugin support.
The videos work, but there is a problem with sound:
ALSA lib dlmisc.c:236:(snd1_dlobj_cache_get) Cannot open shared library
/nix/store/9z51hr9l19vdhgmqd60jwwrg6ny5md2d-alsa-plugins-1.0.26/lib/alsa-lib/libasound_module_pcm_pulse.so

It tries to open a 64bit plugin, which obviously fails. I think this depends on
/etc/asound.conf, but I'm not sure how to fix it.

Regardless of the problem, in one computer I tried the sound works but other
apps cannot output sound. In another, the sound doesn't work and other apps
continue working as normal.
2013-08-10 06:08:18 +03:00
Carles Pagès 4d853ae94f steam: revert adding amd64 version.
It turns out that the .deb only contains the changelog and some other docs.
Revert back to using the i686 version, but keep the double url for the future.
2013-08-10 06:08:18 +03:00
Carles Pagès 97ea8d61e6 steam: add amd64 version and point url to fix version (as suggested by aristid).
Valve has a repository with fixed version packages, so use that instead of the
steam.deb I was using. They also have amd64 packages there.
2013-08-10 06:08:18 +03:00
Carles Pagès 3f4557b0eb steam: update to 1.0.0.28 2013-08-10 06:08:18 +03:00
Carles Pagès bd44348baf steam: create some missing symlinks in the script.
In the original script it says they are temporary, but without those simlinks
Osmos and others fail to start with SteamAPI_Init() failed.
2013-08-10 06:08:18 +03:00
Carles Pagès 2725cbef42 Add libtxc_dxtn-1.0.1.
I thought this was needed by Steam, but it only applies when not using
propietary drivers, and even then it doesn't look like well supported.
2013-08-10 06:08:17 +03:00
Carles Pagès 87c5a418ec steam: create proper symlinks in $HOME/.steam 2013-08-10 06:08:17 +03:00
Carles Pagès a249fa67d9 steam: add libXdmcp to dependencies.
I must have been blind. libXdmcp is in nixpkgs, contrary to what I said.
2013-08-10 06:08:17 +03:00
Carles Pagès dc10fabb2f steam: update to 1.0.0.27
It needed some more sed'ing and more deps. It's still not working as I seem to
need libXdmcp which is not in nixpkgs.
2013-08-10 06:08:17 +03:00
Carles Pagès f42cece8f5 steam: update to 1.0.0.21.
I also updated the patches for the bootsrapper script and fixed a typo, but
didn't test anything.
2013-08-10 06:08:17 +03:00
Carles Pagès 094c0662e8 steam: add mesa to library path.
Mesa is needed for Superbrothers: S&S EP, which links to libGLU.
2013-08-10 06:08:17 +03:00
Carles Pagès 10f722dc04 steam: workaround segfault at startup.
I don't know why, if I call ld-linux.so.2 to launch the game, it segfaults, so
I renamed it to ld.so.
2013-08-10 06:08:16 +03:00
Carles Pagès c75cccc469 steam: update to 1.0.0.18.
I forgot in the previous commit to update the version as I had changed the
tarball hash.

I also modified a bit the launcher script, since xz should only be needed by
the installer.
2013-08-10 06:08:16 +03:00