Michael Raskin
8e5dc9b5df
Fix K3D gtlglext handling
2013-03-21 13:45:12 +04:00
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
Sergey Mironov
c52bd0c8d8
viewnior: Add viewnior, GTK image viewer program
2013-03-12 23:45:50 +04: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
Vladimír Čunát
cf3ff172cd
panotools: disabling tests due to strange failures
2013-03-09 13:16:41 +01:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Cillian de Róiste
43e8e7763b
Add MyPaint: A graphics application for digital painters
2013-03-06 23:08:30 +01: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
Lluís Batlle i Rossell
bcbf9472ea
Merge remote-tracking branch 'central/master' into x-updates
2013-02-18 13:49:11 +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
0d6bb2b51a
meshlab: fix forgotten qt47
2013-02-14 14:38:23 +01:00
Vladimír Čunát
e976bcffca
inkscape: bugfix update
2013-02-14 14:34:20 +01:00
Vladimír Čunát
4c4e3f0ada
meshlab: fix forgotten qt47
2013-02-13 17:45:27 +01:00
Vladimír Čunát
9adcb15b9d
inkscape: bugfix update
2013-02-12 23:28:32 +01:00
Vladimír Čunát
684f215b4f
fix the problem of missing expat in a few packages
2013-02-11 18:34:40 +01:00
Rickard Nilsson
b3cfae1acf
darktable: Update to 1.1.2
2013-02-06 01:26:24 +01:00
Peter Simons
6950cf3bc4
xfig: update download location of the Debian patch files
2013-01-28 19:40:02 +01:00
Eelco Dolstra
0a47a28f1d
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-22 23:23:53 +01:00
Lluís Batlle i Rossell
d6a18fe4ae
feh: update to 2.8
...
it hanged displaying a bmp i have, but this new 2.8 hangs too.
2013-01-22 15:08:01 +01:00
Petar Bogdanovic
f5fc28837b
qiv: $(PREFIX)/man -> $(PREFIX)/share/man
2013-01-21 14:06:03 -05:00
Eelco Dolstra
5bb548d2e4
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-17 14:19:14 +01:00
Eelco Dolstra
f286cc65b1
Fix bad URLs lacking a scheme
2013-01-14 18:26:46 +01:00
Petar Bogdanovic
5d1296b03f
qiv: add version 2.2.4
2013-01-12 09:51:54 -05:00
Sander van der Burg
2dd59fc4cf
imagemagick: disable ghostscript on darwin, to make it work
2013-01-11 18:32:45 +01:00
Peter Simons
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
Vladimír Čunát
afc0784322
Merge pull request #242 from vcunat/vlada/ipe-notg
...
Add the ipe editor.
2013-01-08 03:32:51 -08:00
Eelco Dolstra
1e9e2cb2bb
samba, imagemagick: Add missing meta info
2013-01-06 22:31:16 +01:00
Vladimír Čunát
3c2091276e
vlada/ipe
...
Adding the ipe editor.
Signed-off-by: Vladimír Čunát <vcunat@gmail.com>
2013-01-03 16:13:55 +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
Rickard Nilsson
59c9f406fd
darktable: Update to 1.1.1
2012-12-17 17:27:13 +01:00
Lluís Batlle i Rossell
adb2fabf8d
freecad: removing a patch not needed anymore
2012-12-13 15:18:40 +01:00
Michael Raskin
a0ed4d2295
Updating OpenSCAD to use Eigen3
2012-12-13 16:24:05 +04:00
Lluís Batlle i Rossell
465f4f4e3e
freecad: updating to git master
2012-12-13 12:38:19 +01:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Baptist BENOIST
82bdf7c8d9
opera|dia|geany: remove the obsolete share/icons/hicolor/icon-theme.cache file
...
This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
It have no reasons to exist in a redistribuable package
2012-11-28 00:21:34 +01:00
Rickard Nilsson
e6bd4b6865
darktable: Upgrade to 1.1
2012-11-27 14:32:22 +01:00
Peter Simons
a814d0bc90
SANE: switch snapshot version of the backends to git (and general cleanup)
2012-11-26 16:18:05 +01:00
Peter Simons
0a6914a1ff
gocr: fix path to 'wish' in gocr.tcl
2012-11-23 22:22:52 +01:00
Peter Simons
6287f78dcf
gocr: update to version 0.49
2012-11-23 22:18:36 +01:00
Michael Raskin
070f38d48d
Update pqiv
2012-10-18 00:34:09 +04:00
Peter Simons
6ff829f19d
Merge branch 'master' into x-updates
2012-10-10 18:46:48 +02:00
Rickard Nilsson
5dbe17f315
darktable: Update to version 1.0.5
2012-10-09 22:53:38 +02:00
Eelco Dolstra
54aea93a84
inkscape: Update to 0.48.3.1
...
http://hydra.nixos.org/build/3151653
2012-10-09 12:10:45 -04:00
Eelco Dolstra
d5758c99a3
Merge remote-tracking branch 'origin/master' into x-updates
...
Conflicts:
pkgs/misc/maven/maven-1.0.nix
pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Lluís Batlle i Rossell
cd1a5cd784
gimp: updating from 2.8.0 to 2.8.2
2012-09-21 18:02:45 +02:00
Eelco Dolstra
75ec7a07c2
geeqie: Update to 1.1
2012-09-13 17:15:58 -04:00
Michael Raskin
3f887534be
Meshlib: update to 1.3.2, it now builds and runs
2012-08-30 10:18:24 +04:00
Michael Raskin
098b0c6a1d
Rapcad: add
...
Rapcad is a tool similar to OpenSCAD but with a richer language.
2012-08-27 15:41:49 +04:00
