Commit graph

9 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 9b750c2474
shibboleth-sp: 2.6.1 -> 3.0.4.1 2019-07-30 00:06:12 +02:00
jammerful a42aef3bdc shibboleth-sp: 2.6.0 -> 2.6.1
Resolves #33875
2018-01-19 22:33:50 +00:00
John Ericson f8a18cd4cf misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
2017-09-21 15:49:54 -04:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
J M 03d190d54f shibboleth: Add Myself as a Maintainer (#25817) 2017-05-16 10:11:55 +01:00
Dan Peebles 7c2419df76 shibboleth-sp: minor fixes 2017-04-27 14:06:41 -04:00
jammerful dfcc8dd48c shibboleth-sp: init at 2.6.0 2017-04-27 10:49:30 -04:00