Commit Graph

594 Commits

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