Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Michael Raskin
d53213677d
Merge pull request #11248 from joachifm/more-trivial-builderDefs
...
More trivial builderDefs translations
2015-11-24 17:15:45 +03:00
Michael Alan Dorman
1c331d0c33
shotwell: fix failure to configure
...
Without this change, shotwell would fail even to configure, for lack of
gudev; I infer that libgudev was recently split off of udev, since this
was working fine until a couple of weeks ago.
2015-11-24 08:52:48 -05:00
Joachim Fasting
ddb9c3b701
xaos: reimplement using mkDerivation
2015-11-24 14:45:15 +01:00
Tobias Geerinckx-Rice
ef0265e3dc
simple-scan 3.19.1 -> 3.19.2
2015-11-24 01:40:41 +01:00
Pascal Wittmann
9877cfb600
phototonic: init at 1.7
2015-11-22 13:00:57 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Lluís Batlle i Rossell
bec459a94e
Updating freecad to 0.15
...
(cherry picked from commit 8a18bc8722dc1739b5b2109d556032ca9a068bbd)
Conflicts:
pkgs/top-level/all-packages.nix
2015-11-18 17:21:01 +01:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
.
This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
rnhmjoj
994753322c
imv: add version in the package name
2015-11-14 10:11:12 +01:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Arseniy Seroka
7ee9959984
Merge pull request #10990 from rnhmjoj/imv
...
imv: init at 1.0.0
2015-11-13 17:41:42 +03:00
rnhmjoj
03121cd5ac
imv: init at 1.0.0
2015-11-12 19:40:00 +01:00
William A. Kennington III
a26c8e9b83
Merge branch 'master.upstream' into staging.upstream
2015-11-07 15:51:51 -08:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Demin Dmitriy
0d12bbe574
pinta: Add installation of manpages and .desktop, locale and icon files
2015-10-30 06:39:09 +03:00
Demin Dmitriy
0ec62e0759
pinta: 1.4 -> 1.6
2015-10-29 21:51:41 +03:00
Vladimír Čunát
6c75f4c9aa
imagemagick, soxr, fftw, libraw: remove explicit gcc.lib
...
It is no longer needed after cc-wrapper fixes.
2015-10-28 10:17:07 +01:00
Tobias Geerinckx-Rice
86805242ac
simple-scan: remove PackageKit dependency
...
It has now been made properly optional.
2015-10-27 03:17:17 +01:00
Tobias Geerinckx-Rice
4b27f54db7
simple-scan 3.18.1 -> 3.19.1
2015-10-27 03:17:16 +01:00
Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Pavan Rikhi
01a903335c
pencil: v2.0.13 -> v2.0.14
2015-10-15 11:40:37 -04:00
Nikolay Amiantov
2a117cda41
yed: 3.14.3 -> 3.14.4
2015-10-15 17:06:23 +03:00
Vladimír Čunát
e25da7e5c8
xorg: split outputs of various libs
2015-10-14 14:27:07 +02:00
Vladimír Čunát
14332a282c
feh: fix with multiple outputs and split docs
2015-10-13 20:18:59 +02:00
Vladimír Čunát
cba6641623
cairo, pango: fix some string references
2015-10-13 20:18:51 +02:00
Vladimír Čunát
a6e4c87391
gtk3: split into multiple outputs
...
All references OK, hopefully. Seems surprisingly smooth.
2015-10-13 20:18:45 +02:00
Tobias Geerinckx-Rice
8222eeca6e
simple-scan 3.18.0 -> 3.18.1
2015-10-13 20:07:18 +02:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539
, reversing
changes made to a27ca029ee
.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
William A. Kennington III
d9813ed4ac
feh: 2.13.1 -> 2.14
2015-10-05 11:05:40 -07:00
Gabriel Ebner
ff308d06e9
viewnior: 1.4 -> 1.5
2015-10-04 11:56:32 +02:00
Vladimír Čunát
f361938b21
Merge staging into closure-size
...
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Tobias Geerinckx-Rice
4a92863fd5
enblend-enfuse: rename to actual package name
...
Retain old and unreadable "enblendenfuse" alias for compatibility.
2015-10-02 05:34:34 +02:00
Thomas Tuegel
2e0589b4ca
kde414: build with kdelibs-4.14.12
...
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Vladimír Čunát
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Tobias Geerinckx-Rice
19dd43ba32
simple-scan: 3.17.92 -> 3.18.0
2015-09-22 03:44:48 +02:00
Vladimír Čunát
a4d721efd7
djview: update 4.8 -> 4.10.3
...
Also kill tabs, remove unneeded (and failing) patch.
No qt5 yet, unfortunately.
2015-09-20 08:44:24 +02:00
Vladimír Čunát
88c9f8b574
xlibs: replace occurrences by xorg
...
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a
x11: replace its usage by xlibsWrapper directly
...
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Mathnerd314
eb7404d97a
all-packages: Use callPackage where possible
2015-09-14 22:27:19 -06:00
Tobias Geerinckx-Rice
49abb378e3
simple-scan: 3.17.91 -> 3.17.92
2015-09-14 10:20:38 +02:00
Cillian de Róiste
a3a522286d
synfigstudio: upgrade 0.64.3 -> 1.0.1
2015-09-13 20:58:22 +02:00
Arseniy Seroka
0948ead400
Merge pull request #9761 from eduarrrd/photoqt
...
Photoqt bump
2015-09-10 22:20:02 +03:00
Eduard Bachmakov
09bf6c95c6
photoqt: 1.2 -> 1.3
2015-09-09 19:00:51 -04:00
Eduard Bachmakov
f040a1443e
graphicsmagick: 1.3.18 -> 1.3.21
2015-09-09 19:00:37 -04:00
Tobias Geerinckx-Rice
fb61a48ebf
simple-scan: 3.17.90 -> 3.17.91
2015-09-05 04:20:23 +02:00
Luca Bruno
5c014feb0a
imagemagick: fix ghostscript reference in .la files
2015-09-03 12:21:33 +02:00
Domen Kožar
0dfdb8938b
meshlab: broken on i686
2015-09-02 20:26:02 +02:00