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
Christoph Hrdinka
75518f748f
hugin: update to version 2013.0.0
2014-07-12 13:18:22 +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
Domen Kožar
d7bd83d0ae
shotwell: 0.15.1 -> 0.18
2014-03-21 18:02:15 +01:00
Vladimír Čunát
5bb0803254
fix evaluation (shotwell license)
2014-03-19 21:10:43 +01:00
Domen Kozar
902b059967
Add shotwell 1.15.1
2014-03-18 18:23:13 +01:00
Bjørn Forsman
562f937d21
openscad: bump 2013.06 -> 2014.03
...
openscad now depends on glib, and it needs pkgconfig to find glib.
2014-03-14 22:21:15 +01:00
Cillian de Róiste
fcfbe753e7
Add synfig: A 2D animation program
2014-03-13 01:14:05 +01:00
James Cook
5d14048867
ImageMagick: update to 6.8.8-7
...
Fixes CVE-2014-{1947,1958,2030}.
2014-03-08 10:35:05 +01:00
Peter Simons
db2776ee8a
feh: update from 2.9.3 to 2.10
2014-03-03 11:10:27 +01:00
Domen Kožar
40b8b3206e
fix remaining broken python packages due to refactoring
2014-02-21 23:27:06 +01:00
Cillian de Róiste
30fb0365df
openimageio: update from 1.1.12 to 1.3.12
2014-02-19 22:49:21 +01:00
Sergey Mironov
a629aaee72
viewnior: version bump (1.4) ( close #1781 )
2014-02-19 20:44:30 +01:00
Jaka Hudoklin
d34f77fd1f
feh: add jpeg image manipulation support
2014-02-16 14:11:32 +01:00
Cillian de Róiste
e2151230ab
darktable: update from 1.2.3 to 1.4.1
2014-02-15 18:49:18 +01:00
Petr Rockai
d2758ce017
freecad: Fix build with current cmake.
2014-02-15 10:27:39 +01:00
Vladimír Čunát
32cd198d8f
gimp: remove 2.6, because it's old and vulnerable
...
CVE-2012-2763 and three others. If we really need to resurrect it,
I think I saw debian could have patches for these somewhere.
Also add linux platforms for 2.8.
2014-02-06 19:56:28 +01:00
Song Wenwu
1c83b079d2
gimp: wrap plugins with PYTHONPATH, fix #223
2014-01-31 14:05:53 +08:00
Rickard Nilsson
e28c0da32e
sane-backends: Add extra source url
...
It seems alioth.debian.org has some problem (login needed for download), so
I've added a pkgs.fedoraproject.org url.
2014-01-30 12:26:11 +01:00
Petr Rockai
6f5be260b4
Adopt packages.
2014-01-28 17:31:17 +01:00
Petr Rockai
cf7ee03377
photivo: Fix paths.
2014-01-25 18:08:47 +01:00
Petr Rockai
2953c39409
photivo: Update.
2014-01-25 18:08:47 +01:00
Peter Simons
4e983788cd
feh: update from 2.8 to 2.9.3
2014-01-21 20:19:21 +01:00
Vladimír Čunát
ac6761c908
Merge master into stdenv-updates
...
Conflicts:
pkgs/applications/version-management/gource/default.nix
pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Peter Simons
b4e1774272
haskell-hoodle: re-generate with cabal2nix
2014-01-20 18:04:59 +01:00
Ian-Woo Kim
7b51e24de9
add hoodle (pen notetaking program written in haskell) to nixpkgs
2014-01-20 15:18:04 +00:00
Vladimír Čunát
0a58b512cb
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/compilers/gcc/4.8/default.nix
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/gmp/5.1.3.nix
pkgs/development/libraries/gmp/5.1.x.nix
pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons
2d1c8d6f60
gocr: update to version 0.50
2014-01-13 17:05:45 +01:00
Eelco Dolstra
6fb27abf33
Merge branch 'java'
2014-01-13 13:16:17 +01:00
Eelco Dolstra
16e626a80d
Replace lib/java -> share/java
2014-01-09 13:01:38 +01:00
Vladimír Čunát
d91e03d422
k3d: fix build with newer gcc versions (-fpermissive)
2014-01-05 13:09:41 +01:00
Vladimír Čunát
9443129b08
Merge master into stdenv-updates
...
Conflicts:
pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Peter Simons
72629aa7da
sane-backends-git: update to version 1.0.24.73-g6c4f6bc (i.e. current Git HEAD)
2014-01-03 12:42:48 +01:00
Bjørn Forsman
4d6605e882
Whitespace fixes in package expressions I maintain
2014-01-02 17:58:08 +01:00
Ricardo M. Correia
dd93ce3378
saneBackends: Update to 1.0.24
2014-01-02 15:53:07 +01:00
Vladimír Čunát
506a304181
fftw: minor update and major refactoring
...
- Unify the "single" and "float" variants, which are the same thing.
- Enable threads and openmp wrapper by default (they are very small).
- Don't use sse on i686, as I'm quite sure we have no warrant for that.
Cf. http://en.wikipedia.org/wiki/Pentium_Pro
- Disable static libs (big, no indication we need them).
- I tested most builds using fftw (they build OK).
2014-01-01 13:05:56 +01:00
Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát
cb639302df
Merge glibc-2.18 branch into stdenv-updates
...
It's to separate from other changes coming from master.
Conflicts:
pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
pkgs/development/libraries/ncurses/5_4.nix (deleted)
2013-12-28 18:51:23 +01:00
Vladimír Čunát
50ac037864
Merge master into x-updates
2013-12-23 19:27:14 +01:00
Mathijs Kwik
a508d30c53
openimageio: hash change
2013-12-23 10:25:15 +01:00
Vladimír Čunát
2b24f1349a
Merge master into x-updates
2013-12-21 10:20:55 +01:00
Evgeny Egorochkin
c4c10e8826
ufraw: add missing lensfun dependency
2013-12-21 02:28:27 +02:00
Nixpkgs Monitor
d0e950867c
ufraw: update from 0.18 to 0.19.2
2013-12-21 02:28:27 +02:00
Nixpkgs Monitor
102a88e469
xsane: update from 0.998 to 0.999
2013-12-21 02:28:26 +02:00
Vladimír Čunát
4c5a71f777
Merge master into x-updates
...
Conflicts:
pkgs/desktops/gnome-2/desktop/gvfs/default.nix
pkgs/development/libraries/cogl/default.nix
pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Nixpkgs Monitor
20f3c4de3d
gimp: update from 2.8.8 to 2.8.10
2013-12-18 18:18:28 +02:00
Nixpkgs Monitor
6fb71755b8
cinepaint: update from 1.0 to 1.1
2013-12-18 18:18:22 +02:00
Sander van der Burg
010273bf1e
Fix imagemagick compilation on darwin, because it still includes ghostscript which should not be the case
2013-12-17 11:45:07 +01:00
Peter Simons
45e8de9a7d
Merge branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor
6112fc7fff
xaos: update from 3.5 to 3.6
2013-12-16 01:36:18 +02:00
Nixpkgs Monitor
b92620f680
kde4.digikam: update from 3.2.0 to 3.5.0, potentially fixes CVE-2012-4514, CVE-2012-4514
2013-12-15 23:32:32 +02:00
Bjørn Forsman
4353a1a873
freecad: add matplotlib and pycollada dependencies
...
When FreeCAD is started it prints that it's missing matplotlib and
pycollada:
$ FreeCAD
[...]
matplotlib not found, Plot module will be disabled
pycollada not found, collada support will be disabled.
The closure size of freecad is currently at 1.9 GiB. Adding these two
deps increase it to 2.0 GiB.
Reflow the expression function argument list.
2013-12-14 13:00:46 +01:00
Petr Rockai
8f583cced9
photivo: Add photivo photo processor / RAW development laboratory.
2013-12-13 20:56:35 +02:00
Nixpkgs Monitor
1cedd2647f
autopanosiftc: update from 2.5.0 to 2.5.1
2013-12-12 03:26:11 +02:00
Vladimír Čunát
db426d4601
k3d: fix changed URL/patch
2013-12-11 12:01:46 +01:00
Peter Simons
486e7736df
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Vladimír Čunát
6690c97569
Merge branch 'master' into x-updates
...
Conflicts (just different styles, same semantics):
pkgs/development/libraries/libusb1/default.nix
2013-12-07 14:17:16 +01:00
Nixpkgs Monitor
1beca24707
sxiv: update from 1.1 to 1.1.1
2013-12-07 14:39:52 +02:00
Peter Simons
c32bf83301
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/interpreters/perl/5.16/default.nix
pkgs/tools/networking/curl/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-python.nix
pkgs/top-level/release-small.nix
pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Nixpkgs Monitor
99bf1945d1
graphicsmagick: update from 1.3.13 to 1.3.18, potentially fixes CVE-2013-4589
2013-12-04 05:44:15 +02:00
Vladimír Čunát
d09b722f77
Merge master into x-updates
2013-12-02 21:41:16 +01:00
Michael Raskin
e8246aa3ee
Merge pull request #1307 from bjornfor/pencil
...
pencil: new package
2013-12-01 05:32:59 -08:00