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