1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-09 05:53:50 +00:00
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
Andreas Rammhold 4543ae95a3
globalplatform: stick with openssl 1.0.2
While upstream has patches in tree that support newer versions of
OpenSSL those haven't been released and picking them doesn't seem to be
trivial without risking breakage that I can not test. After talking to
the previous maintainer of the package this also seems like the sanest
approach for the time being.
2019-07-29 21:25:15 +02:00
Daiderd Jordan 3642e1c581
globalplatform: mark linux only 2018-04-05 20:05:22 +02: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
Marius Bakke 82e2e6e92d
gppcscconnectionplugin: init at 1.1.0 2016-08-11 00:11:12 +01:00
Marius Bakke 67b16f0f85
globalplatform: init at 6.0.0 2016-08-11 00:11:01 +01:00