Commit graph

38 commits

Author SHA1 Message Date
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
Ryan Burns 036ef044fd p11-kit: fix tests when non-root 2020-10-02 22:56:47 -07:00
Christian Kampka ca48f0cfa4
p11-kit: Add libtasn1 to nativeBuildInputs
For cross platform builds, p11-kit, libtasn1 in nativeBuildInputs
provides the asn1Parser binary on the hostPlatform needed for building.
At the same time, libtasn1 in buildInputs provides the libasn1 library
to link against for the target platform.
Hence, libtasn1 is required in both native and build inputs.
2020-09-01 08:36:26 +02:00
R. RyanTM f85263a97f p11-kit: 0.23.20 -> 0.23.21 2020-08-24 11:56:43 +02:00
worldofpeace 4c40b43a7c p11-kit: add trust paths
Fixes  #82422
2020-04-25 12:27:34 -04:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Tor Hedin Brønner bbbb49c450 p11-kit: 0.23.19 -> 0.23.20
Small bug fix release. Fixes a bunch of flatpak issues (eg. no playback
on spotify).

news: https://github.com/p11-glue/p11-kit/releases/tag/0.23.20
2020-02-21 09:00:45 +01:00
R. RyanTM 6fbba7bc23 p11-kit: 0.23.18.1 -> 0.23.19 2020-02-06 20:10:15 +01:00
Frederik Rietdijk f799388550 p11-kit: 0.23.16.1 -> 0.23.18.1 2019-11-13 13:58:27 +01:00
Will Dietz 3ef530a9ba p11-kit: 0.23.15 -> 0.23.16.1 2019-06-09 12:36:10 +02:00
Matthew Bauer 2b040c57dd p11-kit: disable tests on darwin
These probably never passed. The test suite was enabled in
c739b09d85, but fails on macOS/darwin.

Fixes #62614
2019-06-03 20:21:56 -04:00
R. RyanTM c739b09d85 p11-kit: 0.23.14 -> 0.23.15 (#54750)
* p11-kit: 0.23.14 -> 0.23.15
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/p11-kit/versions

* p11-kit: refactor 0.23.14 -> 0.23.15
+ add upstream patch to avoid breaking Chromium
+ add upstream patch to fix JKS tests
+ refresh meta (homepage, descriptions, license)
2019-05-13 23:28:31 +02:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
R. RyanTM 977a05cc3b p11-kit: 0.23.13 -> 0.23.14 (#46220)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
p11-kit
2018-09-27 21:03:16 +02:00
R. RyanTM 86a6c4218e p11-kit: 0.23.12 -> 0.23.13
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/p11-kit/versions.
2018-08-16 20:13:12 -07:00
Orivej Desh 5bedf23514 p11-kit: 0.23.11 -> 0.23.12
0.23.11 breaks gnutls: https://github.com/p11-glue/p11-kit/issues/159
2018-06-02 03:36:49 +00:00
R. RyanTM cf152c2791 p11-kit: 0.23.10 -> 0.23.11 (#41271)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.23.11 with grep in /nix/store/9whclrmrld36nawkkdshhj636jlh1cdm-p11-kit-0.23.11
- directory tree listing: https://gist.github.com/be74c2d2f6d0b1ee2fb5e2b0e30fb945
- du listing: https://gist.github.com/470d2f00cd777773ea45ea6ea280a07a
2018-06-01 22:04:34 +02:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Ryan Mulligan 55ff6caf5e p11-kit: 0.23.9 -> 0.23.10
Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.23.10 with grep in /nix/store/ghdcsrmkzpszvhi5dvfcwmm8ysjhsmrq-p11-kit-0.23.10
- found 0.23.10 in filename of file in /nix/store/ghdcsrmkzpszvhi5dvfcwmm8ysjhsmrq-p11-kit-0.23.10
2018-03-11 22:24:41 +01:00
adisbladis 800e744869
p11_kit: 0.23.7 -> 0.23.9 2018-01-28 09:17:53 +08:00
Franz Pletz 0a2c39e205
p11_kit: don't build documentation
This depends ultimately on texlive which is a big build and depends on
lots of libraries which often get security updates. This triggers
mass rebuilds because systemd depends on gnutls which depends on
p11_kit.

This was introduced with 93d80f1951.
2017-09-19 22:24:36 +02:00
Robin Gloster 93d80f1951
p11_kit: fix docs 2017-08-01 18:22:57 +02:00
Franz Pletz 6ddbe2e34c
p11_kit: 0.23.2 -> 0.23.7 2017-08-01 02:29:45 +02:00
Vladimír Čunát 96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Eelco Dolstra 8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Michiel Leenaars 440ea1b893 p11-kit: 0.23.1 -> 0.23.2 2016-05-07 23:06:56 +02:00
Vladimír Čunát 787f322540 $docdev fixups: mostly to avoid empty output
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
2015-10-28 18:58:06 +01:00
Vladimír Čunát 6acaeb3726 p11-kit: split "dev" and "doc" outputs
Referrers all seem so well behaved again.
2015-10-13 20:18:53 +02:00
Luca Bruno 42f44e9e58 p11-kit: fix license 2015-04-22 10:49:22 +02:00
William A. Kennington III ffdd51cd12 p11-kit: 0.20.2 -> 0.23.1 2015-04-20 21:34:48 -07:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Vladimír Čunát b772f53acb p11-kit: do not use libiconv where not needed
Building libiconv even fails on Linux due to missing gets.
2014-10-23 10:39:09 +02:00
Evgeny Egorochkin fb448ba4a1 p11_kit: update from 0.20.1 to 0.20.2 2014-02-27 18:56:09 +02:00
Domen Kožar ed57d5d1de p11-kit: 0.7 -> 0.20.1 2014-01-10 01:45:37 +01:00
Eelco Dolstra b8153a3ac5 * Fix typo in meta.platforms.
svn path=/nixpkgs/trunk/; revision=30298
2011-11-07 17:31:10 +00:00
Yury G. Kudryashov a1745052e0 p11-kit
svn path=/nixpkgs/trunk/; revision=30292
2011-11-07 16:48:14 +00:00