Commit graph

7 commits

Author SHA1 Message Date
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02: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
Robin Gloster bb7c98c162
xml-security-c: 1.6.3 -> 3.0.4 2019-07-30 00:05:21 +02:00
jammerful 4414b1b0a7 xml-tooling-c: 1.6.0 -> 1.6.3
Resolves #33875
2018-01-19 22:33:30 +00:00
J M 03d190d54f shibboleth: Add Myself as a Maintainer (#25817) 2017-05-16 10:11:55 +01:00
Dan Peebles 61f0c5e05e xml-tooling-c: minor fixes to meta fields 2017-04-27 14:06:11 -04:00
jammerful 7267ae5e1d xml-tooling-c: init at 1.6.0
Required by the Shibboleth Service Provider
2017-04-26 22:10:15 -04:00