3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

688 commits

Author SHA1 Message Date
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