cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
160691 commits 1 branch 0 tags 3.7 GiB
Commit graph

913 commits

Author SHA1 Message Date
Orivej Desh
6ea9e0d0d9 Merge pull request #29679 from mimadrid/update/gnuplot-5.2.0 
gnuplot: 5.0.6 -> 5.2.0
 2017-10-01 09:39:27 +00:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Michael Raskin
8d001911db asymptote: do not install sty-files, let texlive care of it 
TeXLive version is effectively identical anyway, and it caused an
unneccessary file name collision.

Fixes: #29671
 2017-09-23 19:28:09 +02:00
mimadrid
a6c5031197
gnuplot: 5.0.6 -> 5.2.0 2017-09-23 00:34:41 +02:00
Daiderd Jordan
570c0b3a72
transfig: cleanup and fix darwin clang 2017-09-22 00:25:22 +02:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 
Only acts on one-line dependency lists.
 2017-09-21 15:49:53 -04:00
Michael Weiss
a127f91f28 fim: Add X11 support and "USE flags" 2017-09-21 18:00:48 +02:00
Michael Weiss
e0ef28c12d fim: init at 0.5rc3 2017-09-21 16:08:32 +02:00
Eelco Dolstra
79c9adce65
nifskope: Fix build 
https://hydra.nixos.org/build/60608938
 2017-09-10 10:56:35 +02:00
Michael Raskin
491f5be49b Trying a less disruptive patch for Cuneiform 2017-09-02 18:53:06 +02:00
Samuel Leathers
917a0e3e77 glmark2: 2016-05-11 -> 2017-09-01 2017-09-01 22:01:24 -04:00
Jörg Thalheim
d881b024d4 lprof: fix build 2017-08-29 12:58:37 +01:00
Michael Raskin
14699ac91d cuneiform: maintain 2017-08-28 23:13:57 +02:00
Michael Raskin
48a941e29f cuneiform: use the branch with fresh fixes to fix the build 2017-08-28 23:13:57 +02:00
Matthew Justin Bauer
2eacddf0dc treewide: homepage URL fixes (#28475) 
* pgadmin: use https homepage

* msn-pecan: move homepage to github

google code is now unavailable

* pidgin-latex: use https for homepage

* pidgin-opensteamworks: use github for homepage

google code is unavailable

* putty: use https for homepage

* ponylang: use https for homepage

* picolisp: use https for homepage

* phonon: use https for homepage

* pugixml: use https for homepage

* pioneer: use https for homepage

* packer: use https for homepage

* pokerth: usee https for homepage

* procps-ng: use https for homepage

* pycaml: use https for homepage

* proot: move homepage to .github.io

* pius: use https for homepage

* pdfread: use https for homepage

* postgresql: use https for homepage

* ponysay: move homepage to new site

* prometheus: use https for homepage

* powerdns: use https for homepage

* pm-utils: use https for homepage

* patchelf: move homepage to https

* tesseract: move homepage to github

* quodlibet: move homepage from google code

* jbrout: move homepage from google code

* eiskaltdcpp: move homepage to github

* nodejs: use https to homepage

* nix: use https for homepage

* pdf2djvu: move homepage from google code

* game-music-emu: move homepage from google code

* vacuum: move homepae from google code
 2017-08-22 20:50:04 +02:00
Frederik Rietdijk
8f2ea38f8f Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-17 18:34:17 +02:00
Michael Weiss
bc24294ea5 maim: 5.4.67 -> 5.4.68 2017-08-16 10:37:35 +02:00
Moritz Ulrich
9fab349ef5
optipng: Workaround for issue 28106. 2017-08-16 10:25:02 +02:00
Frederik Rietdijk
62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https 
Update homepage attributes: http -> https
 2017-08-13 21:53:20 +02:00
Vladimír Čunát
34946256a0
Merge #27424: stdenv: Don't put man pages into $doc 2017-08-13 19:32:51 +02:00
Robin Gloster
c1b3dc3308
povray: 3.7 -> 3.7.0.3 2017-08-12 21:38:19 +02:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc) 
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
 2017-08-11 21:32:54 +03:00
Michael Weiss
3cbc3ddf31 maim: 5.4.66 -> 5.4.67 2017-08-11 12:38:50 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https 
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
 2017-08-03 11:56:15 +02:00
Michael Weiss
4472928a1d maim: 5.4.65 -> 5.4.66 2017-08-02 01:52:04 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Frederik Rietdijk
6c8c4f5182 Merge pull request #27852 from mimadrid/update/gnuplot-5.0.6 
gnuplot: 5.0.3 -> 5.0.6
 2017-08-01 21:50:12 +02:00
mimadrid
2a00ff4a1c
gnuplot: 5.0.3 -> 5.0.6 2017-08-01 20:58:48 +02:00
Frederik Rietdijk
20b8e4b4cf Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-30 08:09:11 +02:00
Michael Weiss
bc8b634072 maim: 5.4.64 -> 5.4.65 2017-07-30 00:59:08 +02:00
Robert Helgesson
9d4d62923a
fgallery: add support for facedetect 2017-07-29 17:01:54 +02:00
Robert Helgesson
138dd4f9f1
fgallery: 1.8 -> 1.8.2 2017-07-29 17:01:53 +02:00
Robert Helgesson
a444b34b52
facedetect: init at 0.1 2017-07-29 15:07:19 +02:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Robert Helgesson
fc75595236
gmic: remove myself as maintainer 2017-07-27 22:54:53 +02:00
Frederik Rietdijk
29f91c107f Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00
Thomas Tuegel
101e0998e1
argyllcms: unset AR 
Commit 093cc00cdd sets the AR environment variable
by default, but this causes the argyllcms Makefile to use the wrong command.
 2017-07-22 19:54:57 -05:00
Michael Weiss
90afb0c10f maim: 5.4.63 -> 5.4.64 2017-07-21 02:10:20 +02:00
Benno Fünfstück
3ab280808c pstoedit: fix pkgconfig file 2017-06-30 16:36:51 +02:00
John Ericson
895c361480 WIP: optipng: cc-wrapper can be relied on to export these env vars 2017-06-28 18:31:37 -04:00
Michael Weiss
a7450098d4 maim: 3.4.47 -> 5.4.63 2017-06-08 01:51:34 +02:00
Vincent Laporte
a987943fdf ditaa: more general platform 2017-05-30 06:55:46 +00:00
Peter Hoeg
d5861fa537 wkhtmltopdf: 0.12.3.2 -> 0.12.4 2017-05-11 13:16:06 +08:00
Volth
a51663f9da pngquant: restored 'patchShebangs' because build failed on Hydra 2017-05-08 16:08:37 +03:00
Volth
76b5d53067 pngquant: 2.6.0 -> 2.9.1 2017-05-05 10:54:21 +00:00
Daiderd Jordan
80828429d7 Merge pull request #25066 from matthewbauer/less-darwin-eval-errors 
Add Darwin as platform to various "broken" packages that actually build
 2017-04-24 08:14:21 +02:00
Matthew Bauer
fe9b9e7f38
icoutils: already supports darwin 2017-04-23 18:08:38 -05:00
Vincent Laporte
a76841e399 asymptote: 2.40 -> 2.41 2017-04-20 19:56:14 +00:00
Armijn Hemel
b6f88093a2 icoutils: update to 0.31.3 2017-04-14 17:21:54 +02:00
Alastair Pharo
f0ebcc6444 epstool: add package 2017-04-09 14:35:06 +10:00
Dmitry Marakasov
938cf02a20 flam3: wrap maintainers attribute in a list (#24629) 2017-04-04 17:48:00 +02:00
Robin Gloster
ce953d0bc9
panomatic: remove 2017-03-30 16:23:33 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud 
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
 2017-03-27 19:52:29 +02:00
Robin Gloster
ed59de18b5
fast-neural-doodle: mark as broken 2017-03-20 15:08:10 +01:00
Michael Raskin
1c8c795a20 asymptote: 2.39 -> 2.40 2017-03-09 18:47:37 +01:00
Vladimír Čunát
64d4bfd139
ploticus: fixup a manual-page symlink 
With new man compression this caused a build error.
 2017-03-01 08:42:35 +01:00
Michael Raskin
1d9fa60df0 wavefunctioncollapse: 0.0pre20160930 -> 0.0pre20170130 2017-02-26 18:10:36 +01:00
Matt McHenry
1f4940368a bins: fix permissions issue regenerating albums 
since the template files in the nix store are read-only, they can't be
overwritten the second time the album is generated.  using cp's '-f'
option works around this.
 2017-02-21 06:37:07 +01:00
Graham Christensen
f308722a00
netpbm: 10.70.00 -> 10.77.02 for numerous fixes 
more: https://sourceforge.net/p/netpbm/code/2883/tree/advanced/doc/HISTORY
 2017-02-17 22:17:34 -05:00
Michael Raskin
c731738ecc graphviz_2_0: hide inside monotoneViz 
The old Graphviz version is vulnerable, but monotone-viz will never feed
it bad input.
 2017-02-15 15:10:00 +01:00
Langston Barrett
b9d6a6cbd0
enblend-enfuse: migrate from (broken) tetex to texlive 
related: #21770
 2017-02-11 17:59:54 +01:00
Robert Helgesson
922413c043
gmic: 1.7.8 -> 1.7.9 2017-02-11 00:30:08 +01:00
Pascal Wittmann
04a128540d Merge pull request #22285 from nand0p/electricsheep 
electricsheep: 2.6.8 -> 2.7b33
 2017-02-07 10:20:20 +01:00
Jake Waksbaum
651d5019bc pstoedit,plotutils: fix for darwin and mark not broken (#22196) 
pstoedit,plotutils: fix for darwin
 2017-02-07 09:01:33 +01:00
Fernando J Pando
17d74c4912 electricsheep: 2.6.8 -> 2.7b33 
- Updates and fixes currently broken package.
- Provides Flam3 and GLee dependencies.
- Tested on Nixos Unstable.
 2017-02-06 18:05:38 -05:00
Vincent Laporte
82c1d98e94 asymptote: fix build on darwin 2017-02-06 19:05:55 +00:00
Michael Raskin
0a756a4216 asymptote: 2.38 -> 2.39 2017-02-02 11:12:16 +01:00
Vladimír Čunát
40003aa2ed
Merge branch 'master' into staging 2017-01-18 15:54:04 +01:00
Frederik Rietdijk
472c25cfa2 zbar: use python2 2017-01-11 18:25:10 +01:00
Michael Raskin
a00f1c99b8 icoutils: 0.31.0 -> 0.31.1 2017-01-11 15:17:22 +01:00
Daiderd Jordan
6bdecbf1ba
graphviz: add darwin frameworks 2017-01-10 22:20:25 +01:00
Peter Hoeg
24aae1effe qrcode: 2014-01-01 -> 2016-08-04 2017-01-07 22:58:45 +08:00
Michael Raskin
f38f46ee41 graphviz: 2.38.0 -> 2.40.1 2017-01-02 20:18:48 +01:00
Jeremy Shaw
e243ec43f3 netbpm: tell config.mk where to find JPEGLIB and JPEGHDR_DIR or jpegtopnm and friends will not be built. 2016-12-28 13:48:50 -05:00
Paul Liu
1b6e2b9a19 Fix netpbm installation for OS X (#21194) 
* Update meta.platform to linux ++ darwin for netpbm
 2016-12-16 09:30:50 +00:00
Frederik Rietdijk
c8eae2597e Merge pull request #20486 from pjones/pkg/gromit-mpx 
gromit-mpx: init at 1.2
 2016-12-10 14:51:14 +01:00
Travis Whitaker
528d353b65 graphviz: Make derivations pure on non-NixOS systems. 2016-11-24 14:45:45 +01:00
Peter Jones
6c9cc6339f
gromit-mpx: init at 1.2 2016-11-16 16:32:13 -07:00
Robert Helgesson
38de6ed18e
gmic: 1.7.7 -> 1.7.8 2016-11-17 00:06:41 +01:00
Vincent Laporte
3cb65da139 asymptote: fix build on Darwin 
No GLUT and no OSMesa
 2016-10-03 19:09:56 +02:00
Tuomas Tynkkynen
eda2dd3d2f treewide: Fix more 'lib.optional' misuses 2016-10-02 00:44:10 +03:00
Michael Raskin
3c25685ff7 wavefunctioncollapse: init at 0.0pre20160930 2016-10-01 13:47:11 +02:00
Michael Raskin
6546f56e71 syntex: init at 0.0pre20160915 2016-10-01 13:47:11 +02:00
Michael Raskin
3995f280ad convchain: init at 0.0pre20160901 2016-10-01 13:47:11 +02:00
Eelco Dolstra
9354e0e518 glxinfo: Drop dependency on mesa-noglu.dev and glu.dev 2016-09-29 13:05:29 +02:00
Frederik Rietdijk
ee510f201d zbar: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Mica Semrick
e6633ad504 gmic: 1.7.4 -> 1.7.7 2016-09-23 12:17:02 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Michael Raskin
9d1d0dd546 neural-style: restrict to 64-bit Linux because it wants too much RAM 2016-09-06 18:18:00 +02:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master 
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
 2016-09-01 13:27:27 +03:00
Michael Raskin
61fe09d670 fast-neural-doodle: fix script name 2016-08-31 19:49:18 +02:00
Michael Raskin
1280b110cb fast-neural-doodle: init at 0.0pre2016-07-01 2016-08-31 19:45:28 +02:00
Michael Raskin
e2f48282d3 neural-style: symlink models so they can be shared easily 2016-08-31 19:45:28 +02:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging 
https://github.com/NixOS/nixpkgs/pull/14766
 2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Robin Gloster
56158004b5
lprof: add hardeningDisable to environment during build 2016-08-29 01:58:16 +00:00
Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
Kranium Gikos Mendoza
4e13a71895 logstalgia: fix build (#18065) 2016-08-28 23:20:22 +00:00
obadz
3de6e5be50 Merge branch 'master' into staging 
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
 2016-08-27 23:54:54 +01:00
Michael Raskin
2a210e3430 neural-style: init at 0.0pre2016.08.15 2016-08-27 15:41:58 +02:00
Michael Raskin
a0aa333aa9 quirc: 2014-11-01 -> 2016-08-16, fix includes for SDL_gfx 2016-08-26 15:08:10 +02:00
Franz Pletz
075e33a682 plotutils: disable failing test on i686 
Cherry-picked from staging to facilitate merging.

See f29214caed vs.
fd6a4d23c9.
 2016-08-24 22:12:49 +02:00
Joachim F
875e6c68de Merge pull request #17910 from womfoo/fix/plotutils-disable-i686-tests 
plotutils: disable i686 tests
 2016-08-24 22:03:44 +02:00
Franz Pletz
f29214caed plotutils: disable failing test on i686 2016-08-24 21:31:02 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Kranium Gikos Mendoza
fd6a4d23c9 plotutils: disable i686 tests 2016-08-22 19:59:46 +08:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov
c60deb0266 quote homepages for better clickability 
Done while I was traversing packages which I maintain to save extra clicks on
urxvt (it captures semicolon as a part of URL).
 2016-08-14 22:37:10 +03:00
Franz Pletz
d1b2c34750 qrcode: enable fortify hardening, disable warning 2016-08-12 18:10:47 +02:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Mica Semrick
43da8b14a0
gmic: 1.6.5 -> 1.7.4 2016-08-08 08:20:26 +02:00
Franz Pletz
1f1637f6a0 lprof: disable format hardening 2016-08-04 11:12:20 +02:00
Franz Pletz
8b7dc1a3d6 ploticus: disable format hardening 2016-08-04 11:09:43 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta 
Build-tested on x86_64 Linux and on Darwin.
 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms 
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
 2016-08-02 21:17:44 +03:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Julien Dehos
d49902e03a
pfstools: 1.8.5 -> 2.0.5 2016-07-25 05:00:23 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Franz Pletz
7f49fbb0ef Merge pull request #16574 from womfoo/update/nip2 
vips: 8.2.2 -> 8.3.1 and dependency nip2: 8.0 -> 8.3.0
 2016-07-19 11:12:02 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Ram Kromberg
781cd33f3b glmark2: 2014.03 -> 2015-06-11 (#16812) 2016-07-09 14:50:24 +02:00
Tuomas Tynkkynen
3d5a41fc75 Merge pull request #16732 from RamKromberg/fix/icoutils-issue-15894 
icoutils: perl dependencies added #15894
 2016-07-06 13:17:20 +03:00
Ram Kromberg
3d316da103 icoutils: perl dependencies added #15894 2016-07-06 06:48:51 +03:00
Tuomas Tynkkynen
e12f789cef sng: 1.0.6 -> 1.1.0 2016-07-06 01:18:46 +03:00
Kranium Gikos Mendoza
59ee0c747a nip2: 8.0 -> 8.3.0 2016-06-28 19:46:40 +08:00
Kranium Gikos Mendoza
db2fc7a503 vips: 8.2.2 -> 8.3.1 2016-06-28 19:46:30 +08:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
Maarten Hoogendoorn
4601254c73 scanbd: add missing jpeg dependency 2016-06-17 23:56:47 +02:00
Benno Fünfstück
96066935f2 fix build of pngcheck 2016-06-13 01:21:14 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Matthew Bauer
2b7b6047a5 exif: use libintl on darwin 
fixes #16034
 2016-06-08 20:11:03 -05:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Joachim Fasting
c82b6c6116
pstoedit: 3.62 -> 3.70 
Note that kde4.calligra, the only reverse dependency, fails to build,
but I have confirmed that it fails also with the previous pstoedit
version so the failure appears unrelated (nor does the error really
indicate that pstoedit is at fault ...).

Also
- Change meta.homepage; the original domain didn't work properly for me
- Split dev output; may want to split out bin/lib as well, for some
  decent saving
- Build with imagemagick for a slight size increase
 2016-06-02 00:22:07 +02:00
mingchuan
f2b5694abc
pstoedit: depend on libwebp to fix linker failure 
This fixes the linker failure saying "cannot find -lwebp"

Closes #15888
 2016-06-02 00:21:16 +02:00
Bjørn Forsman
65ccda5b96 zbar: fix camera support (enables 'zbarcam' tool) 
Add Debian patches (with fetchpatch) to make things work. Among other
things, the patches port the application from V4L to V4L2.

This increases the closure size from 729 MiB to 730 MiB.
 2016-05-31 09:31:41 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Michael Raskin
f345d01974 graphviz_2_0: dependency reasons now make libwebp needed 2016-05-30 12:13:34 +02:00
Bjørn Forsman
972c438c03 mscgen: add 'libwebp' to unbreak build 
Fixes broken build since commit 7d580b8339
("gd: 2.1.1 -> 2.2.1"):

  $ nix-build -A mscgen
  [...]
  gcc  -g -O2   -o mscgen mscgen-adraw.o mscgen-cmdparse.o mscgen-main.o
  mscgen-svg_out.o mscgen-language.o mscgen-msc.o mscgen-ps_out.o
  mscgen-utf8.o mscgen-gd_out.o mscgen-safe.o mscgen-lexer.o
  mscgen-null_out.o mscgen-usage.o -lm -lgd -lm
  -L/nix/store/HASH-zlib-1.2.8/lib -lz
  -L/nix/store/HASH-libpng-apng-1.6.21/lib
  -lpng16 -L/nix/store/HASH-freetype-2.6.2/lib
  -lfreetype
  -L/nix/store/HASH-fontconfig-2.11.1-lib/lib
  -L/nix/store/HASH-freetype-2.6.2/lib
  -lfontconfig -lfreetype -ljpeg -lwebp -lgd -lm
  /nix/store/HASH-binutils-2.26/bin/ld: cannot find -lwebp
  collect2: error: ld returned 1 exit status
 2016-05-30 10:10:21 +02:00
Matt McHenry
7fe0c342a3 bins: init at 1.1.29 2016-05-29 21:48:28 +02:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging 
That's to get mesa rebuild from master, as it's nontrivial.
 2016-05-23 09:02:10 +02:00
Robert Helgesson
f820c78f37 unpaper: add platforms field 2016-05-22 14:34:33 +02:00
Tuomas Tynkkynen
ad1a47061e treewide: Make explicit that 'dev' output of libtiff is used 2016-05-19 10:00:46 +02:00
Tuomas Tynkkynen
309b2644ac treewide: Make explicit that 'dev' output of libpng is used 2016-05-19 10:00:44 +02:00
Tuomas Tynkkynen
be00816cab treewide: Make explicit that 'dev' output of libjpeg is used 2016-05-19 10:00:42 +02:00
Tuomas Tynkkynen
8bbc3fe801 treewide: Make explicit that 'dev' output of expat is used 2016-05-19 10:00:30 +02:00
Tuomas Tynkkynen
825bd69b38 treewide: Make explicit that 'dev' output of boehmgc is used 2016-05-19 10:00:27 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
William Casarin
cac460f6c4 wkhtmltopdf: fix openssl bug (#15443) 2016-05-17 01:35:15 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Michael Raskin
29acc7e0df asymptote: 2.37 -> 2.38 2016-05-15 23:49:44 +02:00
Joachim Fasting
94286527ac
mscgen: add libjpeg to build inputs 
Possibly jpeg used to be propagated from gd but is no longer after
f8bdd7969d.
 2016-05-14 07:42:58 +02:00
Joachim Fasting
a371094f1f
pstoedit: explicit dependency on jpeg 
Possibly jpeg used to be propagated from gd but is no longer after
f8bdd7969d.
 2016-05-14 07:41:42 +02:00
Thomas Tuegel
6def68f548 kst: mark broken 2016-05-09 10:01:09 -05:00
Franz Pletz
d5dd5e05f1 glxinfo: 8.1.0 -> 8.3.0 2016-05-03 16:15:20 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Nikolay Amiantov
b63edea44c imgurbash2: 1.0 -> 2.1 2016-04-30 03:12:34 +03:00
Marius Bakke
e74289decc maim: 3.4.46 -> 3.4.47 2016-04-24 18:11:37 +01:00
Peter Simons
33d9233921 Merge pull request #14884 from micxjo/update-gnuplot 
gnuplot: 5.0.0 -> 5.0.3
 2016-04-22 17:07:03 +02:00
Micxjo Funkcio
390abc547b
gnuplot: 5.0.0 -> 5.0.3 2016-04-21 20:31:58 -07:00
Nikolay Amiantov
5a4cccd7e7 nifskope: move to qmake4Hook 2016-04-20 18:55:55 +03:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Nikolay Amiantov
3f9cfba02c Merge commit 'refs/pull/14677/head' of git://github.com/NixOS/nixpkgs 2016-04-14 05:14:58 +03:00
Sergey Sofeychuk
9a11aafb91 imgur-screenshot: 1.5.4 -> 1.7.1 
Updated imgur-screenshot i guess

Wrong hash in previous commit, it's fixed now.
 2016-04-14 05:12:56 +03:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Michael Raskin
530fdc5362 asymptote: 2.36 -> 2.37 2016-04-13 14:47:04 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Micxjo Funkcio
f299e112bc
pngcrush: 1.7.92 -> 1.8.1 2016-04-11 20:18:38 -07:00
Nikolay Amiantov
59bed14119 imgurbash2: init at 1.0; also drop imgurbash 2016-04-12 04:07:36 +03:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Micxjo Funkcio
eda65083e8
optipng: 0.7.5 -> 0.7.6 (CVE-2016-2191) 2016-04-07 23:47:53 -07:00
Anthony Cowley
9b0890cfa5 graphviz: build with pango even without xorg 
The pango dependency enables outputting PDF files, and is somewhat
independent of the larger xorg dependencies.
 2016-04-07 18:19:01 -04:00
Robin Gloster
3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Wout Mertens
c3f181f2c9 Merge pull request #14520 from jb55/bump/wkhtmltopdf 
wkhtmltopdf: 0.12.2.4 -> 0.12.3.2
 2016-04-07 21:40:53 +02:00
William Casarin
2968a8ce0a wkhtmltopdf: 0.12.2.4 -> 0.12.3.2 2016-04-07 10:24:07 -07:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size 
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
 2016-04-07 14:40:51 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Tobias Geerinckx-Rice
caa395a560 enblend-enfuse: 4.1.5 -> 4.2; maintain 
Removed dependency on libxmi (unneeded since 4.1.5).
Added new (since 4.2) dependency on tetex (for `pdflatex`).

Changes: http://hg.code.sf.net/p/enblend/code/file/a7a247e1e64b/NEWS
 2016-03-30 14:56:04 +02:00
Robin Gloster
b8e0cb3fe7 jbig2enc: fix merge 2016-03-28 23:09:19 +00:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Tobias Geerinckx-Rice
9dc6db5cc5 enblend-enfuse: 4.1.4 -> 4.1.5 2016-03-25 03:31:04 +01:00
Pascal Wittmann
73967e0eca jbig2enc: fix build 2016-03-24 20:21:40 +01:00
Eelco Dolstra
da390a48db pngquant: 2.0.1 -> 2.6.0 
Also remove meta.broken.
 2016-03-18 22:13:57 +01:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Nikolay Amiantov
e81c487ba2 argyllcms: 1.8.2 -> 1.8.3 2016-03-11 01:26:56 +03:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Eelco Dolstra
abd3c246a4 netpbm: Disable parallel building 
Looks like the "partlist" file is constructed in an unsound way.

http://hydra.nixos.org/build/32430147
 2016-02-28 12:59:17 +01:00
zimbatm
17348dc094 Remove all dots at end of descriptions 
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
 2016-02-27 17:30:29 +00:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Robin Gloster
4447e42f02 zbar: disable fortify hardening 2016-02-24 15:17:41 +00:00
Robin Gloster
4bf29b83f8 graphviz_2_0: disable format/fortify hardening 2016-02-23 15:03:14 +00:00
Allan Espinosa
2dd51275eb dpic: init at 2016.01.12 2016-02-22 07:42:53 -06:00
Robin Gloster
00903f4820 jbig2enc: add upstream patch to fix build 2016-02-21 23:56:49 +00:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Rok Garbas
6b1a91e04f scrot: adding garbas as maintainer 2016-02-15 15:46:51 +01:00
Nathan Zadoks
2d3940bd66 scrot: 0.8 -> 0.8-17 (Debian patches), fixes #12954 2016-02-15 15:34:04 +01:00
Michael Raskin
4f1822bfb5 asymptote: 2.35 -> 2.36 2016-02-14 21:17:07 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster
969ed1610a qrcode: turn off fortify hardening 2016-02-12 15:22:56 +00:00
Robin Gloster
200dedf2cd nifskope: turn off format hardening 2016-02-12 13:27:00 +00:00
Robin Gloster
72a9d9a4a7 plotutils: turn off format hardening 2016-02-12 02:48:09 +00:00
Robin Gloster
071bdd4639 graphviz: turn off fortify hardening 2016-02-12 01:25:17 +00:00
Robin Gloster
83e069908e ggobi: turn off format hardening 2016-02-11 00:44:25 +00:00
Robin Gloster
e339a9a20e barcode: turn off format hardening 2016-02-10 23:27:37 +00:00
Robin Gloster
3e8a2e73a6 editres: turn off format hardening 2016-02-09 01:55:15 +00:00
Robin Gloster
7eb16a4eb8 pngcheck: turn off format hardening 2016-02-08 00:41:02 +00:00
Robin Gloster
9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Vladimír Čunát
b8d488ab93 asymptote: fix tarball by asserting isLinux 
We have no osmesa on darwin, which caused an evaluation error.
 2016-02-05 19:22:22 +01:00
Peter Simons
770ba80479 Merge pull request #12767 from abbradar/asymptote-fixes 
Asymptote fixes
 2016-02-04 22:16:40 +01:00
Vladimír Čunát
54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings 
... to refer to correct outputs
 2016-02-03 17:25:22 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Nikolay Amiantov
3ab8f97201 asymptote: enforce no bundled libraries, install tex files, offscreen rendering support 2016-02-02 17:34:57 +03:00
Nikolay Amiantov
4222b8c20c asymptote: enable parallel building 2016-02-02 17:27:26 +03:00
Domen Kožar
0b3becb269 Merge pull request #12701 from mayflower/builder-def-cleanup 
builderDefsPackage cleanup
 2016-02-01 21:09:34 +00:00
Tuomas Tynkkynen
0eb84e882b treewide: Mass replace 'libjpeg}/bin' to refer the 'bin' output 2016-02-01 20:46:10 +02:00
Luca Bruno
3101275527 vips: 8.1.1 -> 8.2.2 
cc @kovirobi
 2016-01-31 17:44:46 +01:00
Robin Gloster
5e189bd207 welkin: use mkDerivation and fix build 2016-01-30 20:31:05 +00:00
Robin Gloster
c48824ba38 cuneiform: use mkDerivation 2016-01-30 20:31:03 +00:00
Robin Gloster
8f7ffe9ba3 netpbm: 10.66.00 -> 10.70.00 2016-01-30 16:36:57 +00:00
Robin Gloster
acb408646e remove local pic flags, now set by hardened stdenv 2016-01-30 16:36:57 +00:00
Robin Gloster
c10ca363c6 graphviz: no fortify hardening 2016-01-30 16:36:57 +00:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Tobias Geerinckx-Rice
626c09bb46 scanbd: init at 1.4.4 2016-01-25 03:43:19 +01:00
Tuomas Tynkkynen
ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen
3916cf476b treewide: Mass replace 'libtiff}/lib' to refer the 'out' output 2016-01-24 10:03:36 +02:00
Tuomas Tynkkynen
377e942f71 treewide: Mass replace 'libpng}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Tuomas Tynkkynen
493349f82a treewide: Mass replace 'libjpeg}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Tuomas Tynkkynen
f9bf203837 treewide: Mass replace 'expat}/lib' to refer the 'out' output 2016-01-24 10:03:34 +02:00
Rodney Lorrimar
a8aecdcc20 xcftools: init at 1.0.7 2016-01-22 19:45:48 +00:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Svein Ove Aas
0dc1bc4aee fgallery: 1.7 -> 1.8 2016-01-17 11:28:50 +01:00
lethalman
b1d3c8b64f Merge pull request #12266 from zimbatm/pngcrush-1.7.92 
Pngcrush updates
 2016-01-13 14:48:36 +01:00
Andreas Herrmann
79e145a970 gnuplot: Improve startup performance 
Before executing the gnuplot executable the environment variable `GDFONTPATH`
is populated with a list of font directories, which is obtained from `fc-list`.
In that process we iterated over each line and called `dirname` on it, which
introduces a performance hit for loading and executing the external executable
`dirname` every time.

The new version avoids the loop.

The author of this patch measured a 42 fold performance improvement:

old version:

    $ time ./gnuplot_old/bin/gnuplot -e ''
    real    0m3.828s
    user    0m0.392s
    sys     0m0.465s

new version:

    $ time ./gnuplot_new2/bin/gnuplot -e ''
    real    0m0.091s
    user    0m0.112s
    sys     0m0.014s

The correctness of the value of `GDFONTPATH` was confirmed with the following
command and comparing its output between versions:

    $ gnuplot -e 'print system("echo $GDFONTPATH")'
 2016-01-11 15:37:07 +01:00
zimbatm
93ddfbacd4 pngcrush: fixes compilation on darwin 2016-01-11 00:52:24 +00:00
zimbatm
e1873ade38 pngcrush: 1.7.85 -> 1.7.92 
also fixes a compilation issue on OSX
 2016-01-09 16:38:06 +00:00
Robert Helgesson
f54ed09096 jhead: add libjpeg as dependency 
The `jpegtran` tool from libjpeg is required for the `-autorot` command.
 2016-01-06 20:38:20 +01:00
Tobias Geerinckx-Rice
eed2fa3de4 qrdecode: remove dead package 
Never maintained, no updates since 2010, and broken since 2013. Bye.
 2016-01-06 03:10:56 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Robert Helgesson
3af583d976 pdf2svg: add autoreconf hook (close #11888) 
This fixes builds that may fail due to all files in the archive having
the same timestamp.
 2015-12-23 07:36:25 +01:00
Thomas Tuegel
97f7eb1e64 kst: Qt 5 infrastructure update 2015-12-20 07:56:50 -06:00
Arseniy Seroka
05d08e400c Merge pull request #11823 from rycee/bump/jhead 
jhead: 2.87 -> 3.00
 2015-12-19 19:05:51 +03:00
Robert Helgesson
1b3930ca04 pdf2svg: 0.2.2 -> 0.2.3 
Also minor style changes and upstream source is now on GitHub.
 2015-12-19 00:50:46 +01:00
Robert Helgesson
8296346207 jhead: 2.87 -> 3.00 
Also clean up the package quite a bit and add myself as maintainer.
 2015-12-19 00:29:32 +01:00
Eric Sagnes
f22aefbba0 vips: 8.0.2 -> 8.1.1 2015-12-15 03:46:35 +09:00
Thomas Tuegel
269ae2e29d gnuplot: use texlive-new 2015-12-12 10:47:03 -06:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Frederik Rietdijk
4bcfa14480 pdfread: use pillow instead of pil 2015-12-08 15:15:40 +01:00
Frederik Rietdijk
47dc242b9d pdfread: broken, not found 2015-12-08 15:14:45 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Pascal Wittmann
6d25c0f1b3 Remove unneeded 'with's from meta.platforms 2015-11-25 23:06:09 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Joachim Fasting
8aa63b34da qrdecode: reimplement using mkDerivation 
Also mark as broken; I have verified that the build fails with
the original build recipe.
 2015-11-24 14:45:15 +01:00
Joachim Fasting
34fda4cbe2 cfdg: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
b0e5edae35 zbar: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
2889b153c5 barcode: reimplement using mkDerivation 2015-11-24 14:45:15 +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
zimbatm
2273bd5b30 gifsicle: 1.87 -> 1.88 
+ fix for gifview flag
+ tests
 2015-11-15 11:50:20 +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
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
Pascal Wittmann
f5d1642a22 Merge pull request #10659 from jb55/wkhtmltopdf-bump 
wkhtmltopdf: 0.12.1 -> 0.12.2.4
 2015-11-09 13:32:32 +01:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Sergey Sofeychuk
998934bf89 imgur-screenshot: init at 1.5.4 2015-11-06 23:48:32 +03:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Jude Taylor
4318329714 link graphviz with libc++ instead of nothing on darwin 2015-10-28 16:09:51 -07:00
John Wiegley
ef8c8a3b7c Merge pull request #10568 from datakurre/datakurre-graphviz 
darwin: graphviz: remove -lstdc++ on darwin
 2015-10-28 15:46:47 -07:00
Vladimír Čunát
f9e9c7242a djvulibre: split dev and bin outputs 2015-10-28 19:36:40 +01:00
Vladimír Čunát
74d4fc7959 graphviz: simplify and add a missing X library 2015-10-28 10:15:52 +01:00
William Casarin
feb1e8f046 wkhtmltopdf: add myself as maintainer 2015-10-27 17:20:26 -07:00
William Casarin
9838265ab3 wkhtmltopdf: 0.12.1 -> 0.12.2.4 2015-10-27 17:15:40 -07:00
Pascal Wittmann
2c190bedd2 logstalgia: 1.0.6 -> 1.0.7 2015-10-26 14:45:13 +01:00
Cillian de Róiste
1ee8280543 dcraw: update from 9.22 to 9.26.0 2015-10-25 19:06:58 +01:00
Tuomas Tynkkynen
ebb060c351 sng: init at 1.0.6 2015-10-25 16:17:44 +02:00
Asko Soukka
d8cb19b22e darwin: graphviz: remove -lstdc++ on darwin 2015-10-24 03:40:37 +03:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Brian McKenna
d0de36ba7a leela: init at 12.fe7a35a 2015-10-16 21:59:49 +11:00
Vladimír Čunát
9da12a6713 SDL: split the dev output and fix referrers 2015-10-13 20:18:56 +02:00
Vladimír Čunát
cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +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
Vladimír Čunát
f8c211fd2b fontconfig: split into multiple outputs 
Fixed all 'fontconfig}' references as well, hopefully, ugh!
 2015-10-05 12:23:56 +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
8c45057764 enblend-enfuse: 4.1.3 -> 4.1.4 2015-10-02 05:34:33 +02: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
Matthias Beyer
8bb71e992c maim: 3.3.41 -> 3.4.46 2015-09-22 01:57:58 +02:00
William A. Kennington III
fc2b0e9d10 argyllcms: gcc5 compat 2015-09-16 21:58:53 -07:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream 
This is a partial merge of staging where we have up to date binaries for
all packages.
 2015-09-15 12:16:49 -07: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
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove 
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
 2015-09-15 11:59:33 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Samuel Rivas
7cc66a1c95 Update to 1.8.2 and make curl look like mozilla 
This commit is supposed to be squashed, keeping it just for traceability during
the pull request.
 2015-09-13 22:08:40 +02:00