Commit graph

25 commits

Author SHA1 Message Date
Ben Siraphob 66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
TredwellGit b02b2aa59e libwebp: 1.0.3 -> 1.1.0
https://github.com/webmproject/libwebp/releases/tag/v1.1.0
2020-10-13 22:35:39 -04:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
adisbladis c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
R. RyanTM d01362bba9 libwebp: 1.0.2 -> 1.0.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libwebp/versions
2019-07-17 09:44:19 +02:00
Orivej Desh af1fca07e0 libwebp: enable parallel building 2019-06-13 08:42:39 +00:00
Will Dietz 540ba74376 libwebp: 1.0.1 -> 1.0.2
https://github.com/webmproject/libwebp/releases/tag/v1.0.2
2019-01-20 01:58:15 -06:00
Will Dietz d250c9fc4c libwebp: 1.0.0 -> 1.0.1
https://github.com/webmproject/libwebp/releases/tag/v1.0.1

Also:

https://groups.google.com/a/webmproject.org/d/msg/webp-discuss/gXMAt-IYpiQ/AuPEJGq6AQAJ

(that post announces -rc2, next post after explains this is now 1.0.1)
2018-12-02 00:03:22 -06:00
R. RyanTM bc26105522 libwebp: 0.6.1 -> 1.0.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libwebp/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/dwebp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/cwebp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/gif2webp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/img2webp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/img2webp --help’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/webpmux -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/webpinfo -h’ got 0 exit code
- found 1.0.0 with grep in /nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0
- directory tree listing: https://gist.github.com/a09e2cd5f3d318ac588ecdf308cc9898
2018-04-24 12:32:19 -07:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Franz Pletz b20284ddd8
libwebp: 0.6.0 -> 0.6.1 2018-01-28 18:21:33 +01:00
Franz Pletz 8c73028fc6
libwebp: 0.4.3 -> 0.6.0 2017-07-10 09:36:04 +02:00
Eelco Dolstra 5d8fe045b6 Revert "Refactor mkFlag out of old packages"
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
2015-06-04 14:54:50 +02:00
William A. Kennington III 3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
William A. Kennington III 8071107881 libwebp: 0.4.2 -> 0.4.3 2015-03-26 12:36:04 -07:00
codyopel 67f82fe49c libwebp: refactor & 0.4.1 -> 0.4.2 2015-02-17 06:05:40 -05:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Aristid Breitkreuz 5af769fd4e update libwebp to fix giflib incompatibility 2014-09-30 21:37:56 +02:00
aszlig 5e95ae5e88
libwebp: Enable (de)mux and decoder.
This is required to build Chromium. Making it a non-optional dependency
as it shouldn't really hurt other packages using it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:40 +02:00
aszlig 7f47785d67
libwebp: Build with support for GIF and TIFF.
Not sure whether those are really needed for Chromium, but I suppose it
doesn't hurt to have support for conversion.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:39 +02:00
aszlig a01f279d2e
libwebp: Update to new upstream version 0.4.0.
Now the version should be recent enough to be built against Chromium,
see: https://code.google.com/p/webp/issues/detail?id=122#c6

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:38 +02:00
Lluís Batlle i Rossell 3782f740a0 Adding libwebp
svn path=/nixpkgs/trunk/; revision=32146
2012-02-08 21:37:20 +00:00