1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 11:02:05 +00:00
Commit graph

8 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
Dan Peebles e26a3fd2de
xar: fix to work on openssl 1.1.x 2019-07-29 21:25:12 +02:00
Daiderd Jordan fa82915e01
xar: add explicit lzma input
lzma is part of the stdenv but not during bootstrapping?
2019-02-24 11:32:01 +01:00
Matthew Bauer e99322507e treewide: get rid of musl stuff 2018-05-31 12:36:45 -04:00
Will Dietz 69ca33057e xar, libselinux: use musl-fts on musl, fix 2018-03-26 14:00:11 -05:00
Franz Pletz a160f34823
xar: 1.5.2 -> 1.6.1 2017-08-28 00:54:42 +02:00
Daniel Peebles 3182cf00ff Add xar 2014-08-30 22:52:46 +01:00