MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
84960 commits 251 branches 124 tags 6.1 GiB
Commit graph

523 commits

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