3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

859 commits

Author SHA1 Message Date
Vladimír Čunát 209730208a
Merge branch 'staging-next' 2018-08-17 20:51:31 +02:00
Peter Simons 876a40d150
Merge pull request #45273 from r-ryantm/auto-update/asymptote
asymptote: 2.46 -> 2.47
2018-08-17 18:48:12 +02:00
R. RyanTM bb34af9eeb asymptote: 2.46 -> 2.47
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/asymptote/versions.
2018-08-17 08:17:56 -07:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Silvan Mosberger 2d1316ec41
Merge pull request #44802 from r-ryantm/auto-update/blockhash
blockhash: 0.3 -> 0.3.1
2018-08-14 17:15:36 +02:00
Daiderd Jordan e55eec5208
Merge pull request #44912 from thefloweringash/dcraw-darwin
dcraw: fix build on Darwin
2018-08-14 01:06:41 +02:00
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Samuel Dionne-Riel 9e9417eefd
Merge pull request #44683 from r-ryantm/auto-update/vips
vips: 8.6.4 -> 8.6.5
2018-08-12 20:26:52 -04:00
Danilo Salvio 7c66a902ce pywal: 2.0.5 -> 3.1.0 (#44924) 2018-08-12 20:11:46 +02:00
Andrew Childs 85c43675d0 dcraw: fix build on Darwin 2018-08-12 19:48:37 +09:00
Vladimír Čunát 00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Frederik Rietdijk d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Pascal Wittmann af8cd3c74e
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2018-08-09 13:10:27 +02:00
Michael Raskin a4a4550500
Merge pull request #44806 from r-ryantm/auto-update/asymptote
asymptote: 2.44 -> 2.46
2018-08-09 05:13:09 +00:00
R. RyanTM 38ba8e9d78 asymptote: 2.44 -> 2.46
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/asymptote/versions.
2018-08-08 20:24:53 -07:00
R. RyanTM 927b22589f blockhash: 0.3 -> 0.3.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/blockhash/versions.
2018-08-08 20:02:56 -07:00
R. RyanTM 42c56458eb vips: 8.6.4 -> 8.6.5
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vips/versions.
2018-08-08 01:03:06 -07:00
Pascal Wittmann f7be21f4c9
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus
2018-08-06 12:04:52 +02:00
Vladyslav M 9f9e5d4371 oxipng: 1.0.1 -> 2.1.0 (#44488) 2018-08-05 16:20:38 +02:00
Jan Tojnar 544f1d471a
Merge pull request #44471 from worldofpeace/elementary-requesites
Various elementary necessaries
2018-08-05 00:49:47 +02:00
worldofpeace 5d95f474d8 scour: init at 0.37 2018-08-04 18:19:25 -04:00
Pascal Wittmann 3cea40adb3
scrot: add license
see issue #43716
2018-08-04 18:46:28 +02:00
Tuomas Tynkkynen 008fd5fcf5 Merge remote-tracking branch 'upstream/master' into staging 2018-08-04 15:17:42 +03:00
John Ericson db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
Robert Schütz bf256564f9 pdf-redact-tools: explicitly use python2Packages
Python2-only syntax, e.g. print without paratheses, is used in the pdf-redact-tools script.
2018-08-03 15:42:39 +02:00
R. RyanTM 39566d31d5 argyllcms: 2.0.0 -> 2.0.1 (#43790)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/argyllcms/versions.
2018-07-31 23:33:59 +02:00
Jörg Thalheim 585ded7329
Merge pull request #44179 from gnidorah/maintainers
twilight, kde2-decoration: add myself to maintainers
2018-07-28 23:17:29 +01:00
Lluís Batlle i Rossell f54b387b63 Merge remote-tracking branch 'central/master' into viric_clean 2018-07-28 19:25:14 +02:00
gnidorah b6d92b89e3 twilight, kde2-decoration: add myself to maintainers 2018-07-28 17:45:45 +03:00
Sage 49ae194b23 yaxg: init at 2018-07-20
* yaxg: init at 2018-07-20

* yaxg: replaced makeWrapper with wrapProgram

* yaxg: Fixed version number and some formatting
2018-07-25 07:14:14 -07:00
Frederik Rietdijk 6275a31f33
Merge pull request #43859 from Hodapp87/appleseed_190b_fix_python
appleseed: Fix non-executable items and Python bindings
2018-07-24 21:54:02 +02:00
Lluís Batlle i Rossell 66d7126255 Take me (viric) out of most maintenance
Since years I'm not maintaining anything of the list below other
than some updates when I needed them for some reason. Other people
is doing that maintenance on my behalf so I better take me out but
for very few packages. Finally!
2018-07-22 21:50:19 +02:00
Pascal Wittmann 828bb68c20
barcode: add license
see issue #43716
2018-07-22 17:38:28 +02:00
Frederik Rietdijk ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Chris Hodapp 88fe696f43 appleseed: Fix non-executable items and Python bindings 2018-07-20 21:42:53 -04:00
volth 6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Pascal Wittmann c4cca95bf2
yafaray-core: adhere to version convention
see issue #43717
2018-07-19 21:38:27 +02:00
Frederik Rietdijk 8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Frederik Rietdijk 12949bf84a Merge master into staging 2018-07-17 10:05:50 +02:00
Frederik Rietdijk 1ae2f10642 Merge staging-next into master 2018-07-17 10:04:59 +02:00
Tuomas Tynkkynen 8258f5bda4 ibniz: init at 1.18 2018-07-17 02:51:41 +03:00
xeji 0ef2389327
Merge pull request #43315 from ryantm/cpan
treewide: replace search.cpan.org with metacpan.org
2018-07-15 11:51:58 +02:00
Ryan Mulligan 220618ef9c perlPackages: remove search.cpan.org; add metacpan.org default homepage
https://www.perl.com/article/saying-goodbye-to-search-cpan-org/

maybe one operation less

..with unifying recursiveUpdate and first //

although not tested

fix whitespace
2018-07-14 18:49:00 -07:00
Vladimír Čunát 0f01215203
Merge branch 'master' into staging-next
Hydra: ?compare=1468896
2018-07-14 18:15:30 +02:00
Frederik Rietdijk 3e31d23d99 Merge master into staging 2018-07-13 19:34:19 +02:00
markuskowa bceb0ee098 pstoedit: patch to ensure gs-9.22 compatibilty (#43280) 2018-07-11 00:58:06 +02:00
Matthew Bauer 6eb508a3e8 Merge remote-tracking branch 'upstream/master' into staging 2018-07-09 11:58:38 -04:00