Commit graph

1254 commits

Author SHA1 Message Date
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
Robin Gloster c0e42fe741
imv: add fontconfig dependency 2016-08-27 21:53:27 +00:00
rnhmjoj f0daeb575a
imv: fix failing build 2016-08-27 06:42:44 +02:00
Robin Gloster e0deed0110
ghc: add comment to relocation patch 2016-08-26 15:19:37 +00:00
Vincent Laporte 42701ee33e inkscape: fix on darwin 2016-08-25 15:39:53 +02:00
obadz 78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles 3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen 8a06db38df treewide: Fix output references to libusb 2016-08-23 04:53:19 +03:00
Tuomas Tynkkynen 2eb09319eb treewide: Make explicit that 'dev' output of exiv2 is used 2016-08-23 03:52:05 +03:00
Tuomas Tynkkynen 298b479c22 sane: Reference correct output of libjpeg 2016-08-23 03:20:21 +03:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
obadz ba50fd7170 Merge branch 'master' into staging 2016-08-22 01:18:11 +01:00
Ram Kromberg 402e4882c1 simple-scan: vala -> vala_0_23 2016-08-21 20:02:07 +03:00
Ram Kromberg 22492ffa3e giv: vala -> vala_0_23 2016-08-21 20:02:07 +03:00
Ram Kromberg 2acfb62caa shotwell: vala -> vala_0_28 2016-08-21 20:02:04 +03:00
obadz 68936edfb3 Merge branch 'master' into staging 2016-08-21 12:03:41 +01:00
Michael Raskin a28ca06298 ao: init at 0.0pre20160820 2016-08-21 00:55:49 +02:00
Nikolay Amiantov edb9416228 Merge pull request #17819 from abbradar/printing-updates
Printing and PDF-related updates
2016-08-20 01:41:55 +04:00
Miguel Madrid 1b69ef935e shotwell: 0.23.4 -> 0.23.5 (#17827) 2016-08-19 13:33:06 +02:00
Miguel Madrid 20c0fe4900 gthumb: init at 3.4.3 (#17826) 2016-08-19 13:32:27 +02:00
Nikolay Amiantov 1bde33074e poppler_data: embed into poppler, make an option
Previously we relied on an environment variable POPPLER_DATADIR which
practically noone used and everyone was expected to set. This is a good
candidate for a feature option because noone really _noticed_ that this data is
not available. Disabled by default because of this and size of the data (22M).
2016-08-18 16:09:34 +03:00
Matthew Bauer 9610fc55ef gpicview: fix darwin build 2016-08-16 19:25:39 +00:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov 8f62339911 yed: 3.15.0.2 -> 3.16.1 2016-08-14 22:37:06 +03:00
Frederik Rietdijk e4b47de694 Remove top-level pycrypto
See #11567.
2016-08-14 14:28:26 +02:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Mica Semrick 852cdd0759 geeqie: 1.2.3 -> 1.3 2016-08-07 14:35:23 -07:00
Mica f9dfe0d843 darktable 2.0.4 -> 2.0.5 (#17568) 2016-08-07 04:20:14 +02:00
Tuomas Tynkkynen 9deb6cfff1 xaos: Broken on i686
http://hydra.nixos.org/build/38238044
2016-08-06 17:06:45 +03:00
Robin Gloster e2844fcfc3 fontmatrix: disable fortify hardening 2016-08-04 07:48:24 +00: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
Robin Gloster cbc8fc239a zgv: disable format hardening 2016-08-02 15:40:37 +00:00
Robin Gloster f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Miguel Madrid 8816df20f3 shotwell: 0.23.2 -> 0.23.4 (#17190) 2016-07-23 00:32:23 +02:00
Julien Dehos d6ff1ce2a0 exrtools: init at 0.4 2016-07-21 17:09:27 +02:00
Robin Gloster 1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Franz Pletz ddf59093ee Merge pull request #16051 from hrdinka/add/osm-gps-map
darktable: readd map/geotagging feature
2016-07-19 13:03:16 +02:00
Robin Gloster 203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Franz Pletz b1ff7f83ef imagemagick: fix hashes
See #16958.
2016-07-18 06:19:52 +02:00
Ram Kromberg 9ff51cc3c4 imagemagick: 6.9.3-9 -> 6.9.5-2 (#16958) 2016-07-18 06:12:17 +02:00
Vladimír Čunát 540f4a8eab gimp: security 2.8.16 -> 2.8.18
Fixes CVE-2016-4994 and some bugs:
http://www.gimp.org/news/2016/07/14/gimp-2-8-18-released/
2016-07-17 21:53:47 +02:00
Luca Bruno e04019d690 Merge pull request #16989 from mimadrid/update/shotwell-0.23.2
shotwell: 0.22.0 -> 0.23.2
2016-07-16 09:55:58 +01:00
Bjørn Forsman 5b6e3a3ed1 pencil: mark as broken
Currently pencil won't start, due to incompatible firefox version:

  $ pencil
  Error: Platform version '47.0.1' is not compatible with
  minVersion >= 36.0

See https://github.com/prikhi/pencil/issues/840.
2016-07-16 00:38:33 +02:00
mimadrid 8d4fc3c375
shotwell: 0.22.0 -> 0.23.2 2016-07-15 17:01:41 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Tim Steinbach f7ab48a401 feh: 2.15.4 -> 2.16.1 2016-07-11 23:15:51 +00:00
Franz Pletz 22c1416192 graphicsmagick: 1.3.23 -> 1.3.24 (security)
Fixes CVE-2016-3716, CVE-2016-3717, CVE-2016-2317, CVE-2016-2318,
CVE-2016-5118, CVE-2016-3714, CVE-2016-3715, CVE-2016-3718.
2016-07-10 10:48:10 +02:00
Nikolay Amiantov cb26996af3 Merge pull request #16814 from womfoo/fix-bump/antimony-0.9.2
antimony: fix build and 0.8.0b -> 0.9.2
2016-07-09 21:11:58 +04:00
Kranium Gikos Mendoza a2a2b334d9 antimony: 0.8.0b -> 0.9.2 2016-07-10 00:40:29 +08:00
Rickard Nilsson 51c6c98529 freecad: 0.15 -> 0.16 2016-07-07 09:24:49 +02:00
Ram Kromberg 28159315b7 jpegrescan: init at 2016-06-01 2016-07-06 12:42:58 +02:00
Vladimír Čunát 07139b8c3f Merge #16488: rawtherapee: 4.0 -> 4.2 2016-07-05 15:30:22 +02:00
Joachim Fasting e30580a44b Merge pull request #16602 from vrthra/zgv
zgv: init at 5.9
2016-07-04 01:11:16 +02:00
Rahul Gopinath eef98f3e51 zgv: init at 5.9 2016-07-03 14:06:57 -07:00
Matthias Herrmann 392448b5d3 rawtherapee: 4.0 -> 4.2 2016-06-25 09:16:12 +02:00
Vladimír Čunát 6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
2016-06-23 12:09:03 +02:00
Vladimír Čunát aa9a04883e Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
2016-06-23 09:25:10 +02:00
Vladimír Čunát c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02: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
Gabriel Ebner 112729b6ff viewnior: 1.5 -> 1.6 2016-06-19 18:47:14 +02:00
Vladimír Čunát e757404555 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
2016-06-19 12:33:04 +02:00
Vladimír Čunát 97c484a10f treewide: fix #include errors after gcc-5.4
They were mostly missing <cmath> or <math.h>.
2016-06-19 10:18:30 +02:00
Tobias Geerinckx-Rice 6558f0add3
sane-backends-git: fix corrupted hash 2016-06-12 00:28:55 +02:00
Tobias Geerinckx-Rice 6b2cdf8cd1
sane-backends-git: 2016-05-09 -> 2016-06-11
fujitsu backend v131:
- hide compression-arg option when jpeg disabled
- add Send/SC/GHS macros for recent scanners
- add initial support for fi-74x0
- add initial support for fi-7030
- set has_MS_lamp=0 for fi-71x0
- add I18N macros to all option titles and descriptions
- add usb ids for many newer scanners
2016-06-12 00:28:55 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Nikolay Amiantov 69e97f8a45 Merge pull request #15891 from abbradar/krita
krita: init at 3.0
2016-06-09 23:34:07 +04:00
obadz ab70ae2edf Merge pull request #15647 from layus/auctex
ktikz: init at 0.10
2016-06-08 17:17:50 +01:00
Christoph Hrdinka dadd9a7150 darktable: add map feature
We lost darktables map (geo coordinates) feature in one of its pervious
updates. This readds it.
2016-06-07 20:07:16 +02:00
Damien Cassou 9afd1161e7 inkscape: fix due to glibmm update 2016-06-06 13:59:31 +02:00
Guillaume Maudoux 6035e80137 ktikz: init at 0.10 2016-06-05 18:46:42 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Bjørn Forsman 2c62305228 shutter: fix runtime error (missing imagemagick)
Fixes this:

  $ shutter
  ERROR: imagemagick is missing --> aborting!

Due to 73f1f5eb39
("imagemagick: split dev output to fix #9604") which was committed in
the same period as shutter was added to nixpkgs.
2016-06-02 21:10:58 +02:00
Nikolay Amiantov 32ff5bbc30 krita: init at 3.0 2016-06-01 12:35:28 +03:00
vbgl 15c9a0054c Merge pull request #15859 from mbakke/feh-2.15.4
feh: 2.15.2 -> 2.15.4
2016-05-31 14:46:58 +02:00
Bjørn Forsman 27899df2f5 pinta: unbreak after multiple-outputs change
Missing ".out" on the gtk attribute.
2016-05-31 14:27:02 +02:00
Marius Bakke b50dd8e85f feh: 2.15.2 -> 2.15.4 2016-05-31 12:48:40 +01:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Franz Pletz 769dce0e27 graphicsmagick: 1.3.21 -> 1.3.23, disable popen (security)
http://permalink.gmane.org/gmane.comp.security.oss.general/19669
2016-05-30 10:48:50 +02:00
Franz Pletz 57e4cd680a graphicsmagick137: remove, not referenced anymore 2016-05-30 10:48:42 +02:00
rnhmjoj 8c489cdd6e
imv: 2.0.0 -> 2.1.2 2016-05-28 15:00:32 +02:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Bjørn Forsman 0b3b45c5a7 shutter: init at 0.93.1
Screenshot and annotation tool.

The application may complain about missing GConf dbus service[1], but it
still works (and remembers its settings, AFAICT).

[1]: The error message is (line wrapped):
  GConf Error: Failed to contact configuration server; the most
  common cause is a missing or misconfigured D-Bus session bus daemon. See
  http://projects.gnome.org/gconf/ for information. (Details -  1: GetIOR
  failed: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name
  org.gnome.GConf was not provided by any .service files)
2016-05-26 10:31:27 +02:00
Bjørn Forsman 41fa133548 qscreenshot: init at 1.0
Create and edit screenshots.
2016-05-25 19:00:50 +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
Julien Dehos 1b76cf4b23 openexr-viewers: 1.0.1 -> 2.2.0 2016-05-22 22:55:47 +02:00
Vladimír Čunát 73f1f5eb39 imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Julien Dehos 294a776511 pbrt: init at 2016-05-19 2016-05-22 11:36:41 +02:00
Tuomas Tynkkynen 9d5ba6ba68 treewide: Make explicit that 'dev' output of libusb1 is used 2016-05-19 10:00:47 +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 f81af4e6f0 treewide: Make explicit that 'dev' output of glib is used 2016-05-19 10:00:35 +02:00
Tuomas Tynkkynen b51b458aed treewide: Make explicit that 'dev' output of fftwSinglePrec is used 2016-05-19 10:00:33 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Joachim Fasting f8177f71bd Merge pull request #15508 from jraygauthier/jrg/simple_scan_fix_missing_icon
simple-scan: improvements
2016-05-17 15:22:17 +02:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Raymond Gauthier e7cc2de7dd simple-scan: improvements
Fix missing icon. It was looking for a "scanner" device
icon that can be only found as part of gnome3 default theme.

Copied this device icon and renamed it as *the* simple-scan
application icon.
2016-05-17 00:49:28 -04:00