Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618
Mark a bunch of packages as broken or not supported on Darwin
2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Christoph Hrdinka
83f78fa82d
mcomix: add sqlite3 dependency
2014-08-07 08:57:02 +02:00
NOTtheMessiah
682f215084
Update default.nix
2014-08-07 01:17:01 +02:00
NOTtheMessiah
9e9e628417
Added gcolor2
2014-08-07 01:17:01 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Bjørn Forsman
5fc4ab1dfe
freecad: small cleanup
...
* FreeCAD v0.14 switched from pyqt4 to pyside, remove unneeded pyqt4 dependency
* cmake.patch is not used anymore, remove it
* License is now only LGPLv2+ (since v0.14)
* Homepage moved to http://www.freecadweb.org/
Ref. http://www.freecadweb.org/wiki/index.php?title=Release_notes_014
2014-08-03 13:26:14 +02:00
Vladimír Čunát
6295a3ca36
Merge recent master into x-updates
...
Hydra: ?compare=1142825
Conflicts (easy):
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Lluís Batlle i Rossell
5e35fef0eb
freecad: updating to 0.14
...
I had to update all the pyside programs, or freecad failed to build. I picked
the versions advertised in http://qt-project.org/wiki/PySideDownloads . The
rest I took for github latest releases.
2014-08-01 16:56:27 +02:00
Peter Simons
d0ca8c237e
Fix broken license references.
2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
Vladimír Čunát
b9045a7d96
Merge branch 'x-updates' into staging
...
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Eelco Dolstra
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Vladimír Čunát
9b02635faa
Merge recent master into x-updates
...
Hydra: ?compare=1138350
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
Two imports were added independently on the same line.
I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Cillian de Róiste
bc8fe732d0
Add gimpPlugins.focusblur
2014-07-20 21:28:50 +02:00
Vladimír Čunát
df99ec18dc
inkscape: enableParallelBuilding, doCheck, add meta
2014-07-18 11:56:47 +02:00
Vladimír Čunát
7e9a0b8ec2
inkscape: maintenance update
...
Needed to fix build with poppler-0.26.
2014-07-18 11:56:44 +02:00
Vladimír Čunát
16e35532e4
Merge recent master into x-updates
2014-07-17 19:30:56 +02:00
Peter Simons
f0de2bd4a1
Re-generate Haskell expressions with cabal2nix.
2014-07-16 12:10:10 +02:00
Ian-Woo Kim
02d6445409
update hoodle-types 0.2.2 -> 0.3, hoodle-builder 0.2.2.0 -> 0.3, hoodle-parser 0.2.2 -> 0.3, hoodle-render 0.3.2 -> 0.4, hoodle-core 0.13.0.0 -> 0.14, and hoodle 0.2.2.1 -> 0.3
2014-07-16 12:10:10 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
Peter Simons
d2e731e111
Add "please don't edit" comment at the top of every auto-generated Haskell file.
2014-07-14 13:21:41 +02:00
Vladimír Čunát
4b263946dd
qt3, graphicsmagick137, fox, neverball: fix build
...
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
2014-07-09 21:52:04 +02:00
Eelco Dolstra
06fc1ec34d
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
.
2014-06-30 14:56:10 +02:00
Benno Fünfstück
e10001042d
fetchbzr, fetchdarcs, fetchhg: use rev
attr
...
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Bjørn Forsman
a14365b568
alchemy: add meta.longDescription
2014-06-22 21:46:34 +02:00
Michael Raskin
566ef0e31a
Adding an auto-updater script for qiv and updating it to 2.3.1
2014-06-13 13:37:12 +04:00
Michael Raskin
ed7b509fbf
Oops. Fix the permissions on initialized persistence file for Dia
2014-06-13 01:33:18 +04:00
Michael Raskin
6b35f37005
Fix dia when run not from $PATH
2014-06-13 01:22:56 +04:00
Michael Raskin
80b701ca94
Put a correct Dia persistence file in ~/.dia unless such a file exists. Fixes #1691 .
2014-06-12 15:02:49 +04:00
John Wiegley
0085a1aae3
potrace: allow building on any unix
2014-06-10 08:57:41 +00:00
Michael Raskin
26c8490ea1
Install libpotrace
2014-06-10 11:24:43 +04:00
Pascal Wittmann
b40ce8a1f1
Update feh from 2.11 to 2.12.
...
The relevant source code of giblib was imported into feh,
therefore giblib is no longer a dependency.
2014-06-07 15:22:20 +02:00
Pascal Wittmann
91b2021782
feh: Set the default theme explicitly to 'feh'
...
feh uses argv[0] to set the default theme, because
feh is wrapped this will be .feh-wrapper. This makes
it hard to use the configuration on multiple systems
and can be confusion. Therefore the theme is explicity
set to 'feh'.
2014-06-07 15:18:09 +02:00
Eelco Dolstra
36f5ede37a
geeqie: Fix incorrect longDescription formatting
...
Note that longDescription should not be formatted as:
longDescription =
'' Bla bla
bla bla
'';
because this will cause the second line to have more preceding
whitespace. It should be:
longDescription =
''
Bla bla
bla bla
'';
2014-06-03 11:47:39 +02:00
Michael Raskin
80cc011f77
Merge pull request #2617 from ttuegel/hplip
...
hplip: update and fix scanning
2014-05-27 02:31:27 -07:00
Eelco Dolstra
1e6c82825a
gimp: Fix download URL
2014-05-22 12:11:52 +02:00
Vladimír Čunát
8e9ead8656
berlios.de probably shut down, replace it
...
The shutdown was announced years ago, only now it stopped working.
2014-05-18 13:30:27 +02:00
Thomas Tuegel
b4c8981064
sane: add mkSaneConfig
2014-05-11 14:01:07 -05:00
cillianderoiste
885a2d9c53
Merge pull request #2410 from pSub/potrace
...
Add potrace-1.11, a tool for tracing bitmaps
2014-05-11 14:46:12 +02:00
Pascal Wittmann
8b0d0e3601
Add potrace-1.11, a tool for tracing bitmaps
2014-05-09 14:23:00 +02:00
Eelco Dolstra
46b77d3bb4
fetchurl_gnome -> fetchurlGnome
2014-05-08 15:30:17 +02:00
Benjamin Podszun
313900d819
nixpkgs: Bump feh to 2.11
2014-05-08 13:15:09 +02:00
Cillian de Róiste
849f6788ac
darktable: update from 1.4.1 to 1.4.2
2014-05-03 15:16:12 +02:00
Jaka Hudoklin
b12b180fc2
meshlab: fix build
...
Patches are from the Arch Linux package.
2014-04-21 11:24:26 +02:00
ambrop7@gmail.com
3bab2f2fc4
FreeCAD: Fix build.
2014-04-20 16:45:00 +02:00
James Cook
ee79d43e40
ImageMagick: update to 6.8.9-0
2014-04-19 11:25:01 +01:00
Luca Bruno
35ccaa2e52
Fix gsettings schemas usage for several packages due to #1901
...
Also add icons to epiphany
2014-04-06 11:02:21 +02:00