Vladimír Čunát
b1eeae8cac
Merge branch 'master' into x-updates
...
Conflicts (easy):
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Vladimír Čunát
9ac8a16277
vimprobable2, surf: fix the settings-schemas problem
...
Note that they still segfault.
2013-03-14 16:01:53 +01:00
Vladimír Čunát
86639d9bb9
Merge branch 'master' into x-updates
...
Conflicts (taken master versions):
pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
pkgs/desktops/xfce/applications/gigolo.nix
pkgs/desktops/xfce/applications/mousepad.nix
pkgs/desktops/xfce/applications/ristretto.nix
pkgs/desktops/xfce/applications/terminal.nix
pkgs/desktops/xfce/applications/xfce4-mixer.nix
pkgs/desktops/xfce/applications/xfce4-notifyd.nix
pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
pkgs/desktops/xfce/art/xfce4-icon-theme.nix
pkgs/desktops/xfce/core/exo.nix
pkgs/desktops/xfce/core/garcon.nix
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
pkgs/desktops/xfce/core/libxfce4ui.nix
pkgs/desktops/xfce/core/libxfce4util.nix
pkgs/desktops/xfce/core/libxfcegui4.nix
pkgs/desktops/xfce/core/thunar-volman.nix
pkgs/desktops/xfce/core/thunar.nix
pkgs/desktops/xfce/core/tumbler.nix
pkgs/desktops/xfce/core/xfce4-appfinder.nix
pkgs/desktops/xfce/core/xfce4-panel.nix
pkgs/desktops/xfce/core/xfce4-power-manager.nix
pkgs/desktops/xfce/core/xfce4-session.nix
pkgs/desktops/xfce/core/xfce4-settings.nix
pkgs/desktops/xfce/core/xfconf.nix
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/desktops/xfce/core/xfwm4.nix
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
pkgs/development/libraries/webkit/default.nix
pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Shea Levy
e07a7e6156
Merge branch 'master' of git://github.com/fignuts/nixpkgs
...
This updates mysql-workbench. Didn't compile before, compiles now.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:01:04 -05:00
Peter Simons
d96af07c9f
xmobar: patch to support <freeratio> variable in memory monitor
2013-03-08 13:37:58 +01:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Andrew Morsillo
7d4d40e82b
Update mysql workbench version
2013-03-06 20:08:30 +01:00
Vladimír Čunát
e6143c35e2
Merge pull request #344 from ierton/zathura-improve
...
zathura: fix manpages, include .desktop icon
2013-03-03 05:21:03 -08:00
Vladimír Čunát
26af997d41
Merge branch 'master' into stdenv-updates
...
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Jordi
cf8d64b458
New wraper for surf
2013-03-01 19:53:42 +01:00
Jordi
0d6f6e6d37
Wraper with glib_network
2013-03-01 19:31:00 +01:00
Vladimír Čunát
a606eab76e
tangogps: fix bad includes
2013-02-28 14:07:50 +01:00
Sergey Mironov
061627feed
zathura: fix man pages; include .desktop icon
2013-02-28 12:08:36 +04:00
Sergey Mironov
7cd4a5b0a1
zathura: set myself as a maintainer
...
Conflicts:
pkgs/applications/misc/zathura/default.nix
2013-02-28 12:07:46 +04:00
Lluís Batlle i Rossell
a5192222e9
surf: updating to 0.6
...
it didn't work since the libsoup update, and now it doesn't work either.
Let's see after fixing libsoup.
2013-02-25 21:08:16 +01:00
Peter Simons
5f32207dfc
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-24 19:27:08 +01:00
Peter Simons
ce9500ea1d
grip: update to version 3.3.1
2013-02-23 20:44:23 +01:00
Rok Garbas
5077600d9a
zathura: update to 0.2.2 (also plugins), added correct license and myself as maintainer
2013-02-23 11:39:32 +01:00
Rok Garbas
e4236f1ade
girara: update to 0.1.5, correct license and add myself as maintainer
2013-02-23 11:38:30 +01:00
Vladimír Čunát
dd4a846b0f
update evince, seems to work now
2013-02-21 21:19:50 +01:00
Shea Levy
acd4299e75
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/top-level/all-packages.nix
Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
Vladimír Čunát
0d72174dbd
Merge branch stdenv-updates into x-updates
...
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Bjørn Forsman
224a5ea9da
Add evtest, a simple tool for input event debugging
2013-02-20 21:17:32 +01:00
Lluís Batlle i Rossell
bcbf9472ea
Merge remote-tracking branch 'central/master' into x-updates
2013-02-18 13:49:11 +01:00
Peter Simons
9e68734d61
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-18 11:54:56 +01:00
Peter Simons
33b130ee69
ikiwiki: update to version 3.20130212
2013-02-18 11:11:34 +01:00
Vladimír Čunát
26e4a5561c
blender: add the forgotten patch
2013-02-16 18:38:52 +01:00
Vladimír Čunát
08abf5a84a
blender: minor update to work with libpng-1.6
...
also other fixes needed in order to build
2013-02-16 18:13:05 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Vladimír Čunát
ee9a5d864c
calibre: make build by minor upgrade + new dependencies
...
0.9.* won't build: https://bugs.launchpad.net/calibre/+bug/1094719
2013-02-13 09:18:27 +01:00
Vladimír Čunát
35a927149f
Merge branch 'master' into x-updates
...
Conflicts (both messed with mesa):
pkgs/top-level/all-packages.nix
2013-02-02 21:11:00 +01:00
Vladimír Čunát
c4daf6d2b5
djvulibre: minor update, refactored dependencies
2013-01-29 14:55:14 +01:00
Eelco Dolstra
8317cd1f14
kde-3: Remove
...
KDE 3 hasn't built in a long time. Also remove six, the only package
with a dependency on KDE 3.
2013-01-29 12:43:53 +01:00
Eelco Dolstra
0a47a28f1d
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-22 23:23:53 +01:00
Vladimír Čunát
9397f5b25f
goldendict: fix missing pkgconfig
2013-01-21 17:49:37 +01:00
Eelco Dolstra
5bb548d2e4
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-17 14:19:14 +01:00
Eelco Dolstra
eeda226b02
Merge branch 'master' into systemd
2013-01-15 12:11:07 +01:00
Eelco Dolstra
7fd42a8380
Get rid of the "sf" alias for "sourceforge"
2013-01-14 12:00:32 +01:00
Jack Cummings
3fe43187fb
urxvt-9.16
2013-01-11 09:28:52 -08:00
Peter Simons
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
Vladimír Čunát
5ce7642487
Lyx: a bug-fix update.
2013-01-09 00:53:51 +01:00
Peter Simons
9e9cd7b529
Merge branch 'master' into stdenv-updates.
2013-01-04 21:00:53 +01:00
Rickard Nilsson
db292a74c0
Merge remote-tracking branch 'upstream/master' into systemd
...
Conflicts:
pkgs/tools/networking/network-manager/default.nix
2013-01-03 13:44:47 +01:00
Vladimír Čunát
b794d22834
Lyx minor update to 2.0.5.
2013-01-01 16:33:56 +01:00
Lluís Batlle i Rossell
30e0edd812
Adding freicoin 0.0.1
2012-12-29 10:46:54 +01:00
Lluís Batlle i Rossell
b58780c43d
Merge remote-tracking branch 'eelco/master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
84779a6f7d
Remove unnecessary parentheses around if conditions
...
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
99f7c4e324
Merge branch 'master' into systemd
2012-12-27 01:28:25 +01:00
Peter Simons
03f42614e8
ikiwiki: update to version 3.20121212
2012-12-23 12:43:41 +01:00
