1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Commit graph

1119 commits

Author SHA1 Message Date
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
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
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
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
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
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
taku0 9a6d8dd4f4 synfigstudio: fixed build error 2016-05-13 23:36:36 +09:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Vladimír Čunát 292fb98d96 imagemagick: fix evaluation on mingw
I made a mistake during conflict resolution in 7a005601d.
2016-05-10 18:22:34 +02:00
Tobias Geerinckx-Rice 0ee4238026
sane-backends-git -> 2016-05-09 2016-05-10 01:22:53 +02:00
Thomas Tuegel 3a62eab2c9 antimony: mark broken 2016-05-09 10:01:46 -05:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Arseniy Seroka 25c1ff925f Merge pull request #15288 from hrdinka/update/hugin
hugin: 2015.0.0 -> 2016.0.0
2016-05-08 13:46:17 +03:00
Arseniy Seroka e33e50ac60 Merge pull request #15285 from hrdinka/update/darktable
darktable: 2.0.2 -> 2.0.4
2016-05-08 13:45:50 +03:00
Tobias Geerinckx-Rice 3785515c4b
sane-backends-git -> 2016-05-07
Color scanning for Samsung models which support JPEG Lossy compression.
2016-05-08 00:45:10 +02:00
Christoph Hrdinka 72306b762d hugin: 2015.0.0 -> 2016.0.0
This updates hugin to its latest version and cleanes the derivation.

Release notes:

http://hugin.sourceforge.net/releases/2016.0.0/en.shtml
2016-05-07 16:50:06 +02:00
Christoph Hrdinka f2ac136ec1 darktable: 2.0.2 -> 2.0.4
Release notes for 2.0.3 and 2.0.4 bugfix releases:

https://www.darktable.org/2016/03/darktable-2-0-3-released
https://www.darktable.org/2016/05/darktable-2-0-4-released
2016-05-07 12:59:24 +02:00
Vladimír Čunát 1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00